sqlobject-cvs Mailing List for SQLObject (Page 3)
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
(9) |
Apr
(74) |
May
(29) |
Jun
(16) |
Jul
(28) |
Aug
(10) |
Sep
(57) |
Oct
(9) |
Nov
(29) |
Dec
(12) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(7) |
Feb
(14) |
Mar
(6) |
Apr
(3) |
May
(12) |
Jun
(34) |
Jul
(9) |
Aug
(29) |
Sep
(22) |
Oct
(2) |
Nov
(15) |
Dec
(52) |
2005 |
Jan
(47) |
Feb
(78) |
Mar
(14) |
Apr
(35) |
May
(33) |
Jun
(16) |
Jul
(26) |
Aug
(63) |
Sep
(40) |
Oct
(96) |
Nov
(96) |
Dec
(123) |
2006 |
Jan
(159) |
Feb
(144) |
Mar
(64) |
Apr
(31) |
May
(88) |
Jun
(48) |
Jul
(16) |
Aug
(64) |
Sep
(87) |
Oct
(92) |
Nov
(56) |
Dec
(76) |
2007 |
Jan
(94) |
Feb
(103) |
Mar
(126) |
Apr
(123) |
May
(85) |
Jun
(11) |
Jul
(130) |
Aug
(47) |
Sep
(65) |
Oct
(70) |
Nov
(12) |
Dec
(11) |
2008 |
Jan
(30) |
Feb
(55) |
Mar
(88) |
Apr
(20) |
May
(50) |
Jun
|
Jul
(38) |
Aug
(1) |
Sep
(9) |
Oct
(5) |
Nov
(6) |
Dec
(39) |
2009 |
Jan
(8) |
Feb
(16) |
Mar
(3) |
Apr
(33) |
May
(44) |
Jun
(1) |
Jul
(10) |
Aug
(33) |
Sep
(74) |
Oct
(22) |
Nov
|
Dec
(15) |
2010 |
Jan
(28) |
Feb
(22) |
Mar
(46) |
Apr
(29) |
May
(1) |
Jun
(1) |
Jul
(27) |
Aug
(8) |
Sep
(5) |
Oct
(33) |
Nov
(24) |
Dec
(41) |
2011 |
Jan
(4) |
Feb
(12) |
Mar
(35) |
Apr
(29) |
May
(19) |
Jun
(16) |
Jul
(32) |
Aug
(25) |
Sep
(5) |
Oct
(11) |
Nov
(21) |
Dec
(12) |
2012 |
Jan
(3) |
Feb
(4) |
Mar
(20) |
Apr
(4) |
May
(25) |
Jun
(13) |
Jul
|
Aug
|
Sep
(2) |
Oct
(25) |
Nov
(9) |
Dec
(1) |
2013 |
Jan
(6) |
Feb
(8) |
Mar
|
Apr
(10) |
May
(31) |
Jun
(7) |
Jul
(18) |
Aug
(33) |
Sep
(4) |
Oct
(16) |
Nov
|
Dec
(27) |
2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
(11) |
May
(39) |
Jun
(8) |
Jul
(11) |
Aug
(4) |
Sep
|
Oct
(27) |
Nov
|
Dec
(71) |
2015 |
Jan
(17) |
Feb
(47) |
Mar
(33) |
Apr
|
May
|
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
2016 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
|
May
(12) |
Jun
(7) |
Jul
(9) |
Aug
(31) |
Sep
(8) |
Oct
(3) |
Nov
(15) |
Dec
(1) |
2017 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(8) |
May
(10) |
Jun
(4) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(8) |
Nov
(4) |
Dec
(5) |
2018 |
Jan
(2) |
Feb
(8) |
Mar
|
Apr
(4) |
May
|
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
2019 |
Jan
(1) |
Feb
(16) |
Mar
(1) |
Apr
(3) |
May
(5) |
Jun
(1) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
(3) |
2020 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(2) |
Nov
|
Dec
(2) |
2021 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(3) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
|
2024 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(9) |
2025 |
Jan
|
Feb
(4) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Oleg B. <no...@so...> - 2020-10-01 15:22:19
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 270dd73d1d0a6db0abc453bf74743189151d8a08 (commit) via cb7575ab2050260311e6ace0226917dfdeb3dfbc (commit) from baaffa71a790c3e65378ca7da53c28808471bd65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/270dd73d1d0a6db0abc453bf74743189151d8a08 commit 270dd73d1d0a6db0abc453bf74743189151d8a08 Author: Oleg Broytman <ph...@ph...> Date: Thu Oct 1 18:19:49 2020 +0300 Prepare for the next release diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 5cfb518..9beb8c9 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,29 +1,25 @@ Hello! -I'm pleased to announce version 3.8.1, the first bugfix release of branch -3.8 of SQLObject. - - -What's new in SQLObject -======================= +I'm pleased to announce version 3.8.1a1, the first alpha of the upcoming +release of branch 3.8 of SQLObject. -The contributor for this release is Neil Muller. +I'm pleased to announce version 3.8.1a2, the second alpha of the upcoming +release of branch 3.8 of SQLObject. -Documentation -------------- +I'm pleased to announce version 3.8.1b1, the first beta of the upcoming +release of branch 3.8 of SQLObject. -* Use conf.py options to exclude sqlmeta options. +I'm pleased to announce version 3.8.1rc1, the first release candidate +of the upcoming release of branch 3.8 of SQLObject. -Tests ------ - -* Fix ``PyGreSQL`` version for Python 3.4. +I'm pleased to announce version 3.8.2, the first bugfix release of branch +3.8 of SQLObject. -CI --- -* Run tests with Python 3.8 at AppVeyor. +What's new in SQLObject +======================= +Contributors for this release are For a more complete list, please see the news: http://sqlobject.org/News.html @@ -55,7 +51,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.1 +https://pypi.org/project/SQLObject/3.8.2a0.dev20201001/ News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 88ecfac..a0f632d 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -SQLObject 3.8.1 -=============== +SQLObject 3.8.2a0 +================= Thanks for looking at SQLObject. SQLObject is an object-relational mapper, i.e., a library that will wrap your database tables in Python diff --git a/docs/News.rst b/docs/News.rst index 291954f..dc57777 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,6 +5,9 @@ News .. contents:: Contents: :backlinks: none +SQLObject (master) +================== + SQLObject 3.8.1 =============== http://sourceforge.net/p/sqlobject/sqlobject/ci/cb7575ab2050260311e6ace0226917dfdeb3dfbc commit cb7575ab2050260311e6ace0226917dfdeb3dfbc Author: Oleg Broytman <ph...@ph...> Date: Thu Oct 1 18:00:14 2020 +0300 Release 3.8.1 diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 3844404..5cfb518 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,28 +1,29 @@ Hello! -I'm pleased to announce version 3.8.1a1, the first alpha of the upcoming -release of branch 3.8 of SQLObject. +I'm pleased to announce version 3.8.1, the first bugfix release of branch +3.8 of SQLObject. -I'm pleased to announce version 3.8.1a2, the second alpha of the upcoming -release of branch 3.8 of SQLObject. -I'm pleased to announce version 3.8.1b1, the first beta of the upcoming -release of branch 3.8 of SQLObject. +What's new in SQLObject +======================= -I'm pleased to announce version 3.8.1rc1, the first release candidate -of the upcoming release of branch 3.8 of SQLObject. +The contributor for this release is Neil Muller. -I'm pleased to announce version 3.8.0, the first stable release of branch -3.8 of SQLObject. +Documentation +------------- -I'm pleased to announce version 3.8.1, the first bugfix release of branch -3.8 of SQLObject. +* Use conf.py options to exclude sqlmeta options. +Tests +----- -What's new in SQLObject -======================= +* Fix ``PyGreSQL`` version for Python 3.4. + +CI +-- + +* Run tests with Python 3.8 at AppVeyor. -Contributors for this release are For a more complete list, please see the news: http://sqlobject.org/News.html @@ -54,7 +55,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.1a0.dev20191208/ +https://pypi.org/project/SQLObject/3.8.1 News and changes: http://sqlobject.org/News.html diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs index 349c6ed..4eab620 100755 --- a/devscripts/build-all-docs +++ b/devscripts/build-all-docs @@ -10,7 +10,7 @@ cd "`dirname \"$0\"`" && PROG_DIR="`pwd`" && cd .. && -build_docs 3.8.0 && +build_docs 3.8.1 && build_docs master devel && rm -rf docs/html && diff --git a/docs/News.rst b/docs/News.rst index 374899c..291954f 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,14 +5,26 @@ News .. contents:: Contents: :backlinks: none -SQLObject (master) -================== +SQLObject 3.8.1 +=============== + +Released 2020 Oct 01. + +Documentation +------------- + +* Use conf.py options to exclude sqlmeta options. Tests ----- * Fix ``PyGreSQL`` version for Python 3.4. +CI +-- + +* Run tests with Python 3.8 at AppVeyor. + SQLObject 3.8.0 =============== diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py index 763a4a4..579bdd6 100644 --- a/sqlobject/__version__.py +++ b/sqlobject/__version__.py @@ -1,8 +1,8 @@ -version = '3.8.0' +version = '3.8.1' major = 3 minor = 8 -micro = 0 +micro = 1 release_level = 'final' serial = 0 version_info = (major, minor, micro, release_level, serial) ----------------------------------------------------------------------- Summary of changes: ANNOUNCE.rst | 7 ++----- README.rst | 4 ++-- devscripts/build-all-docs | 2 +- docs/News.rst | 15 +++++++++++++++ sqlobject/__version__.py | 4 ++-- 5 files changed, 22 insertions(+), 10 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2020-08-22 12:17:35
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via baaffa71a790c3e65378ca7da53c28808471bd65 (commit) via a2d90177d185c9c1f6ed6b2425e35262fa70ad18 (commit) via 7b85a599c0989780aed68feed24c2ebef8d5c9f9 (commit) via 551063155c71b177345fc5cfb8bcbd238aa17eac (commit) via dfedb4e3f88f71b17b96559cb89080e4c1c967bb (commit) via f25602178eab6e148be25cdf87ba4bd5744d0838 (commit) via 7b2279dec80985a485976f6a0a264bd0d021e06e (commit) via 51d38936203e9f1881d60efe63cee694216ff0f7 (commit) from eb00dff007fb8e16d4ebebae6860f305ae4cf54b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/baaffa71a790c3e65378ca7da53c28808471bd65 commit baaffa71a790c3e65378ca7da53c28808471bd65 Merge: 5510631 a2d9017 Author: Oleg Broytman <ph...@ph...> Date: Sat Aug 22 15:15:24 2020 +0300 Merge pull request #158 from drnlm/feature/explicit_exclude_option Move excluding sqlmeta columns to conf.py options http://sourceforge.net/p/sqlobject/sqlobject/ci/a2d90177d185c9c1f6ed6b2425e35262fa70ad18 commit a2d90177d185c9c1f6ed6b2425e35262fa70ad18 Author: Neil <drn...@gm...> Date: Sat Aug 22 08:41:31 2020 +0200 Rerun genapidocs and new & updated files diff --git a/docs/api/sqlobject.tests.rst b/docs/api/sqlobject.tests.rst index 6cf2f13..fcab4e8 100644 --- a/docs/api/sqlobject.tests.rst +++ b/docs/api/sqlobject.tests.rst @@ -13,6 +13,7 @@ Submodules sqlobject.tests.dbtest sqlobject.tests.test_ForeignKey + sqlobject.tests.test_ForeignKey_cascade sqlobject.tests.test_NoneValuedResultItem sqlobject.tests.test_SQLMultipleJoin sqlobject.tests.test_SQLRelatedJoin diff --git a/docs/api/sqlobject.tests.test_ForeignKey_cascade.rst b/docs/api/sqlobject.tests.test_ForeignKey_cascade.rst new file mode 100644 index 0000000..cbe1c44 --- /dev/null +++ b/docs/api/sqlobject.tests.test_ForeignKey_cascade.rst @@ -0,0 +1,7 @@ +sqlobject.tests.test\_ForeignKey\_cascade module +================================================ + +.. automodule:: sqlobject.tests.test_ForeignKey_cascade + :members: + :undoc-members: + :show-inheritance: http://sourceforge.net/p/sqlobject/sqlobject/ci/7b85a599c0989780aed68feed24c2ebef8d5c9f9 commit 7b85a599c0989780aed68feed24c2ebef8d5c9f9 Author: Neil <drn...@gm...> Date: Fri Aug 21 13:42:15 2020 +0200 Use conf.py options to exclude sqlmeta options This aims to fix the same issue as in #147, but fixing the problem that genapi docs will override the rst files and lose the exclusions. diff --git a/docs/conf.py b/docs/conf.py index f8272ab..b6e460e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -35,6 +35,11 @@ extensions = [ 'sphinx.ext.viewcode', ] +# Exclude uninformative members from the api docs +autodoc_default_options = { + 'exclude-members': 'columnDefinitions,columnList,columns,indexDefinitions' +} + # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] http://sourceforge.net/p/sqlobject/sqlobject/ci/551063155c71b177345fc5cfb8bcbd238aa17eac commit 551063155c71b177345fc5cfb8bcbd238aa17eac Author: Oleg Broytman <ph...@ph...> Date: Mon Jun 22 23:08:26 2020 +0300 CI(AppVeyor): Ignore errors with `PyGreSQL` diff --git a/tox.ini b/tox.ini index 1a21ebb..51855a5 100644 --- a/tox.ini +++ b/tox.ini @@ -836,7 +836,7 @@ commands = {[testenv]commands} -dropdb -U postgres -w sqlobject_test createdb -U postgres -w sqlobject_test - pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pygresql&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test + -pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pygresql&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-pygresql-noauto-w32] http://sourceforge.net/p/sqlobject/sqlobject/ci/dfedb4e3f88f71b17b96559cb89080e4c1c967bb commit dfedb4e3f88f71b17b96559cb89080e4c1c967bb Author: Oleg Broytman <ph...@ph...> Date: Mon Jun 22 18:53:06 2020 +0300 Style: Fix `flake8` warnings E124 closing bracket does not match visual indentation E128 continuation line under-indented for visual indent diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py index 0b9fd02..e3de62e 100644 --- a/sqlobject/dbconnection.py +++ b/sqlobject/dbconnection.py @@ -1071,9 +1071,9 @@ class ConnectionURIOpener(object): def registerConnectionInstance(self, inst): if inst.name: assert (inst.name not in self.instanceNames - or self.instanceNames[inst.name] is cls # noqa - ), ("A instance has already been registered " - "with the name %s" % inst.name) + or self.instanceNames[inst.name] is cls # noqa + ), ("A instance has already been registered " + "with the name %s" % inst.name) assert inst.name.find(':') == -1, \ "You cannot include ':' " \ "in your class names (%r)" % cls.name # noqa http://sourceforge.net/p/sqlobject/sqlobject/ci/f25602178eab6e148be25cdf87ba4bd5744d0838 commit f25602178eab6e148be25cdf87ba4bd5744d0838 Author: Oleg Broytman <ph...@ph...> Date: Mon Jun 22 18:51:22 2020 +0300 Style: Fix `flake8` E741 ambiguous variable name 'l' diff --git a/sqlobject/constraints.py b/sqlobject/constraints.py index 9241579..1b8bd0f 100644 --- a/sqlobject/constraints.py +++ b/sqlobject/constraints.py @@ -51,8 +51,8 @@ def isBool(obj, col, value): class InList: - def __init__(self, l): - self.list = l + def __init__(self, _l): + self.list = _l def __call__(self, obj, col, value): if value not in self.list: diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py index e9891d9..fc8db83 100755 --- a/sqlobject/manager/command.py +++ b/sqlobject/manager/command.py @@ -1095,8 +1095,8 @@ class CommandRecord(Command): connection=conn) def strip_comments(self, sql): - lines = [l for l in sql.splitlines() - if not l.strip().startswith('--')] + lines = [_l for _l in sql.splitlines() + if not _l.strip().startswith('--')] return '\n'.join(lines) def base_dir(self): http://sourceforge.net/p/sqlobject/sqlobject/ci/7b2279dec80985a485976f6a0a264bd0d021e06e commit 7b2279dec80985a485976f6a0a264bd0d021e06e Author: Oleg Broytman <ph...@ph...> Date: Mon Jun 22 18:48:59 2020 +0300 Fix `PyGreSQL` version for Python 3.4 diff --git a/devscripts/requirements/requirements_pygresql.txt b/devscripts/requirements/requirements_pygresql.txt new file mode 100644 index 0000000..ea4052c --- /dev/null +++ b/devscripts/requirements/requirements_pygresql.txt @@ -0,0 +1,2 @@ +pygresql<5.2; python_version == '3.4' +pygresql; python_version != '3.4' diff --git a/docs/News.rst b/docs/News.rst index 089f671..374899c 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -8,6 +8,11 @@ News SQLObject (master) ================== +Tests +----- + +* Fix ``PyGreSQL`` version for Python 3.4. + SQLObject 3.8.0 =============== diff --git a/tox.ini b/tox.ini index 7de2551..1a21ebb 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ deps = mysql-oursql3: git+https://github.com/sqlobject/oursql.git@py3k#egg=oursql pymysql: pymysql postgres-psycopg: psycopg2-binary - postgres-pygresql: pygresql + pygresql: -rdevscripts/requirements/requirements_pygresql.txt pypostgresql: git+https://github.com/sqlobject/py-postgresql.git@fix_w32#egg=pypostgresql postgres-pg8000: git+https://github.com/sqlobject/pg8000.git@getuser#egg=pg8000 pyodbc: pyodbc http://sourceforge.net/p/sqlobject/sqlobject/ci/51d38936203e9f1881d60efe63cee694216ff0f7 commit 51d38936203e9f1881d60efe63cee694216ff0f7 Author: Oleg Broytman <ph...@ph...> Date: Mon Jun 22 03:31:51 2020 +0300 Fix(col.TimeValidator): Remove debug print diff --git a/sqlobject/col.py b/sqlobject/col.py index be8571c..9bbde2a 100644 --- a/sqlobject/col.py +++ b/sqlobject/col.py @@ -1510,7 +1510,6 @@ class TimeValidator(DateTimeValidator): raise validators.Invalid( "the value for the TimeCol '%s' must has days=0, " "it has days=%d" % (self.name, value.days), value, state) - print("[DEBUG1]:", value.microseconds) return datetime.time( *time.gmtime(value.seconds)[3:6], microsecond=value.microseconds ----------------------------------------------------------------------- Summary of changes: devscripts/requirements/requirements_pygresql.txt | 2 ++ docs/News.rst | 5 +++++ docs/api/sqlobject.tests.rst | 1 + ...test_indexes.rst => sqlobject.tests.test_ForeignKey_cascade.rst} | 4 ++-- docs/conf.py | 5 +++++ sqlobject/col.py | 1 - sqlobject/constraints.py | 4 ++-- sqlobject/dbconnection.py | 6 +++--- sqlobject/manager/command.py | 4 ++-- tox.ini | 4 ++-- 10 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 devscripts/requirements/requirements_pygresql.txt copy docs/api/{sqlobject.inheritance.tests.test_indexes.rst => sqlobject.tests.test_ForeignKey_cascade.rst} (50%) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2020-05-06 21:56:53
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via eb00dff007fb8e16d4ebebae6860f305ae4cf54b (commit) via 0266ac96332b82b768afd8344f8a6a2ea8fe1ef2 (commit) via 7b0bab102f7c80333ade797341846c177020adb7 (commit) from 04f9060c15c0ca1fcf0d82ce03d10e458958ed11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/eb00dff007fb8e16d4ebebae6860f305ae4cf54b commit eb00dff007fb8e16d4ebebae6860f305ae4cf54b Author: Oleg Broytman <ph...@ph...> Date: Wed May 6 23:22:39 2020 +0300 CI: pip<21 for Python 2.7 diff --git a/.travis.yml b/.travis.yml index 1e4feb5..e176035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ before_install: sudo chmod 644 /var/lib/firebird/create_test_db; fi -install: travis_retry pip install --upgrade "pip<19.1" "setuptools<44" tox coveralls codecov ppu +install: travis_retry pip install --upgrade "pip<21" "setuptools<44" tox coveralls codecov ppu script: devscripts/tox-select-envs $TESTS diff --git a/appveyor.yml b/appveyor.yml index 778e9f5..e5f00a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -91,7 +91,7 @@ install: - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe" - "python --version" - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - "python -m pip install --upgrade \"pip<19.1\" \"setuptools<44\"" + - "python -m pip install --upgrade \"pip<21\" \"setuptools<44\"" - "pip install --upgrade \"tox<3.1\" ppu" - "pip --version" # List ODBC drivers http://sourceforge.net/p/sqlobject/sqlobject/ci/0266ac96332b82b768afd8344f8a6a2ea8fe1ef2 commit 0266ac96332b82b768afd8344f8a6a2ea8fe1ef2 Author: Oleg Broytman <ph...@ph...> Date: Mon May 4 21:38:06 2020 +0300 Tests: Add `test-sqlobject.cmd` diff --git a/devscripts/test-sqlobject.cmd b/devscripts/test-sqlobject.cmd new file mode 100644 index 0000000..53b7cab --- /dev/null +++ b/devscripts/test-sqlobject.cmd @@ -0,0 +1,16 @@ +@echo off + +SetLocal EnableDelayedExpansion +set SavePATH=%PATH% + +for %%V in (27 34 35 36 37 38) do ( + for %%s in (32 64) do ( + set PATH=C:\Python%%V-%%s;C:\Python%%V-%%s\Scripts;!SavePATH! + set TOXPYTHON=C:\Python%%V-%%s\python.exe + !TOXPYTHON! -m tox -e "py%%V-sqlite{-memory,}-w32" + if !ERRORLEVEL! EQU 0 (echo Ok) else (echo Error && goto Quit) + ) +) + +:Quit +set PATH=%SavePATH% http://sourceforge.net/p/sqlobject/sqlobject/ci/7b0bab102f7c80333ade797341846c177020adb7 commit 7b0bab102f7c80333ade797341846c177020adb7 Author: Oleg Broytman <ph...@ph...> Date: Mon May 4 21:36:48 2020 +0300 Tests(tox): Delete SQLite database under w32 diff --git a/tox.ini b/tox.ini index 41619f2..7de2551 100644 --- a/tox.ini +++ b/tox.ini @@ -1021,6 +1021,7 @@ platform = win32 commands = {[testenv]commands} pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb?debug=1 + cmd /c "del C:\projects\sqlobject\sqlobject_test.sqdb" [testenv:py27-sqlite-w32] platform = win32 ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- appveyor.yml | 2 +- devscripts/test-sqlobject.cmd | 16 ++++++++++++++++ tox.ini | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 devscripts/test-sqlobject.cmd hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2020-04-01 17:07:43
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 04f9060c15c0ca1fcf0d82ce03d10e458958ed11 (commit) via ab6bfb9b2246bff936a2ec6e3efa746c499f0824 (commit) via 0252ba226b81eedbaba6d1d169d1c692632f17fe (commit) via df601fd23785c2be0d36492d6b8710f66c24cc58 (commit) via a92401156915a9b82553c7202566cc11d647cb0f (commit) from 0783e77bcfe6511483f864ebb152d306d858758f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/04f9060c15c0ca1fcf0d82ce03d10e458958ed11 commit 04f9060c15c0ca1fcf0d82ce03d10e458958ed11 Author: Oleg Broytman <ph...@ph...> Date: Fri Feb 28 15:10:33 2020 +0300 Limit `setuptools<44` for Python 2.7 diff --git a/.travis.yml b/.travis.yml index 1d54f6b..1e4feb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ before_install: sudo chmod 644 /var/lib/firebird/create_test_db; fi -install: travis_retry pip install --upgrade "pip < 19.1" setuptools tox coveralls codecov ppu +install: travis_retry pip install --upgrade "pip<19.1" "setuptools<44" tox coveralls codecov ppu script: devscripts/tox-select-envs $TESTS diff --git a/appveyor.yml b/appveyor.yml index 4d2f86b..778e9f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -91,8 +91,8 @@ install: - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe" - "python --version" - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - "python -m pip install --upgrade \"pip < 19.1\" setuptools" - - "pip install --upgrade \"tox < 3.1\" ppu" + - "python -m pip install --upgrade \"pip<19.1\" \"setuptools<44\"" + - "pip install --upgrade \"tox<3.1\" ppu" - "pip --version" # List ODBC drivers - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name http://sourceforge.net/p/sqlobject/sqlobject/ci/ab6bfb9b2246bff936a2ec6e3efa746c499f0824 commit ab6bfb9b2246bff936a2ec6e3efa746c499f0824 Author: Oleg Broytman <ph...@ph...> Date: Wed Feb 26 00:37:49 2020 +0300 Tests(tox): Refactor the list of environments diff --git a/tox.ini b/tox.ini index 9be1d8b..41619f2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py{27,34,35,36,37,38}-sqlite{,-memory},py{27,38}-flake8 +envlist = py27,py3{4,5,6,7,8}-sqlite{,-memory},py{27,38}-flake8 # Base test environment settings [testenv] http://sourceforge.net/p/sqlobject/sqlobject/ci/0252ba226b81eedbaba6d1d169d1c692632f17fe commit 0252ba226b81eedbaba6d1d169d1c692632f17fe Author: Oleg Broytman <ph...@ph...> Date: Wed Feb 26 00:37:29 2020 +0300 CI(AppVeyor): Run tests with Python 3.8 diff --git a/appveyor.yml b/appveyor.yml index 0bd3576..4d2f86b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,6 +40,11 @@ environment: PYTHON_VERSION: "3.7" PYTHON_HOME: "C:\\Python37-x64" db: mysql + - TESTS: "py38-mysql" + PYTHON_ARCH: "64" + PYTHON_VERSION: "3.8" + PYTHON_HOME: "C:\\Python38-x64" + db: mysql - TESTS: "py27-postgres" PYTHON_ARCH: "32" PYTHON_VERSION: "2.7" @@ -55,6 +60,11 @@ environment: PYTHON_VERSION: "3.7" PYTHON_HOME: "C:\\Python37-x64" db: postgresql + - TESTS: "py38-postgres" + PYTHON_ARCH: "64" + PYTHON_VERSION: "3.8" + PYTHON_HOME: "C:\\Python38-x64" + db: postgresql - TESTS: "py27-sqlite" PYTHON_ARCH: "32" PYTHON_VERSION: "2.7" @@ -67,6 +77,10 @@ environment: PYTHON_ARCH: "64" PYTHON_VERSION: "3.7" PYTHON_HOME: "C:\\Python37-x64" + - TESTS: "py38-sqlite" + PYTHON_ARCH: "64" + PYTHON_VERSION: "3.8" + PYTHON_HOME: "C:\\Python38-x64" matrix: fast_finish: true http://sourceforge.net/p/sqlobject/sqlobject/ci/df601fd23785c2be0d36492d6b8710f66c24cc58 commit df601fd23785c2be0d36492d6b8710f66c24cc58 Author: Oleg Broytman <ph...@ph...> Date: Wed Feb 26 00:36:46 2020 +0300 CI(Travis): Remove duplicate Firebird tests diff --git a/.travis.yml b/.travis.yml index 7a6a950..1d54f6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,16 +69,10 @@ matrix: env: TESTS=py27-firebird - python: "3.6" env: TESTS=py36-firebird - - python: "2.7" - env: TESTS=py27-firebird - - python: "3.6" - env: TESTS=py36-firebird allow_failures: - env: TESTS=py27-firebird - env: TESTS=py36-firebird - - env: TESTS=py27-firebird - - env: TESTS=py36-firebird fast_finish: true http://sourceforge.net/p/sqlobject/sqlobject/ci/a92401156915a9b82553c7202566cc11d647cb0f commit a92401156915a9b82553c7202566cc11d647cb0f Author: Oleg Broytman <ph...@ph...> Date: Tue Feb 25 23:20:18 2020 +0300 CI(Travis): Set default OS to `linux`, dist to `xenial` Default dist is `xenial` anyway. diff --git a/.travis.yml b/.travis.yml index a674f2d..7a6a950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +os: linux + +dist: xenial + language: python python: @@ -30,10 +34,8 @@ matrix: - python: "3.6" env: TESTS=py36-mysql - python: "3.7" - dist: xenial env: TESTS=py37-mysql - python: "3.8" - dist: xenial env: TESTS=py38-mysql - python: "2.7" env: TESTS=py27-postgres @@ -44,10 +46,8 @@ matrix: - python: "3.6" env: TESTS=py36-postgres - python: "3.7" - dist: xenial env: TESTS=py37-postgres - python: "3.8" - dist: xenial env: TESTS=py38-postgres - python: "2.7" env: TESTS=py27-sqlite @@ -58,15 +58,12 @@ matrix: - python: "3.6" env: TESTS=py36-sqlite - python: "3.7" - dist: xenial env: TESTS=py37-sqlite - python: "3.8" - dist: xenial env: TESTS=py38-sqlite - python: "2.7" env: TESTS=py27-flake8 - python: "3.8" - dist: xenial env: TESTS=py38-flake8 - python: "2.7" env: TESTS=py27-firebird ----------------------------------------------------------------------- Summary of changes: .travis.yml | 19 +++++-------------- appveyor.yml | 18 ++++++++++++++++-- tox.ini | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-12-07 18:09:24
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 0783e77bcfe6511483f864ebb152d306d858758f (commit) from b0b1c9c3610f9b52ea80c815a93cf49241081497 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/0783e77bcfe6511483f864ebb152d306d858758f commit 0783e77bcfe6511483f864ebb152d306d858758f Author: Oleg Broytman <ph...@ph...> Date: Sat Dec 7 20:41:37 2019 +0300 Prepare for the next release [skip ci] diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index fe822ef..3844404 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,41 +1,28 @@ Hello! -I'm pleased to announce version 3.8.0, the first stable release of branch -3.8 of SQLObject. - - -What's new in SQLObject -======================= - -Features --------- +I'm pleased to announce version 3.8.1a1, the first alpha of the upcoming +release of branch 3.8 of SQLObject. -* Add driver ``supersqlite``. Not all tests are passing - so the driver isn't added to the list of default drivers. +I'm pleased to announce version 3.8.1a2, the second alpha of the upcoming +release of branch 3.8 of SQLObject. -Minor features --------------- +I'm pleased to announce version 3.8.1b1, the first beta of the upcoming +release of branch 3.8 of SQLObject. -* Improve sqlrepr'ing ``ALL/ANY/SOME()``: always put the expression - at the right side of the comparison operation. +I'm pleased to announce version 3.8.1rc1, the first release candidate +of the upcoming release of branch 3.8 of SQLObject. -Bug fixes ---------- - -* Fixed a bug in cascade deletion/nullification. - -* Fixed a bug in ``PostgresConnection.columnsFromSchema``: - PostgreSQL 12 removed outdated catalog attribute - ``pg_catalog.pg_attrdef.adsrc``. +I'm pleased to announce version 3.8.0, the first stable release of branch +3.8 of SQLObject. -* Fixed a bug working with microseconds in Time columns. +I'm pleased to announce version 3.8.1, the first bugfix release of branch +3.8 of SQLObject. -CI --- -* Run tests with Python 3.8 at Travis CI. +What's new in SQLObject +======================= -Contributors for this release are Andrew Trusty, Marco Sirabella and darix. +Contributors for this release are For a more complete list, please see the news: http://sqlobject.org/News.html @@ -67,7 +54,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.0 +https://pypi.org/project/SQLObject/3.8.1a0.dev20191208/ News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 92962cf..88ecfac 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -SQLObject 3.8.0 +SQLObject 3.8.1 =============== Thanks for looking at SQLObject. SQLObject is an object-relational diff --git a/docs/News.rst b/docs/News.rst index 9012621..089f671 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,6 +5,9 @@ News .. contents:: Contents: :backlinks: none +SQLObject (master) +================== + SQLObject 3.8.0 =============== ----------------------------------------------------------------------- Summary of changes: ANNOUNCE.rst | 45 ++++++++++++++++----------------------------- README.rst | 2 +- docs/News.rst | 3 +++ 3 files changed, 20 insertions(+), 30 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-12-07 17:39:17
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The annotated tag, 3.8.0 has been created at 87e251565d38ac3d6b20578e83f05e11b25ee657 (tag) tagging b0b1c9c3610f9b52ea80c815a93cf49241081497 (commit) replaces 3.7.3 tagged by Oleg Broytman on Sat Dec 7 20:34:10 2019 +0300 - Log ----------------------------------------------------------------- Release 3.8.0 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEAXmp+v5763cG/OMobggLcLYoewMFAl3r4pIACgkQbggLcLYo ewOE3g/+I0ve0dlOIU6H7AoyuZH86Jfg2Zqn25P9g/MOwiShbYr/ghO9IdSvChlq uNXlkX1nA2tA7AQ5/uoAzFCqXiqNHFT6NBpEGf3FLv2MimziQYwehkqtIqmZR8jH SBnU96Rym4p8jK8wfO4bHEgo4IVov1xhDpzeLu/sBx81If5aQ5epH8hMntlqC1zz 1ibPzMbCmBZ/QXpzPXOb/k1PtyKJBf2dJrSEDCgr8M5L7iqZYr6x0GjGfP0Y8tLw PDJxkDA9uN9ioZS6900S1e6gY+I7P9hO2s6DvT+n/IqsFz0J8kC0b0PH7bpe8Z7c 3/uTTcvLdRq0RQkynvW9TN6QhxdzQrvgaYa7I8RHI4+5skqYfyJjXLQBRWa1VDI1 URyLzsAw98A8Bo4Y2nRQVYJ8BmaQXRIn4T83cl53tG8RrTJkY+dOuOkfk3ipOEtH 3kXwttLIpwaP9QlwZWiSswfW1qNftPkVz4tJIIquNFg07Wzd5uwma8SAbHoqDXvp oHGewdLMKzg9uy+TjkwreTCk/ye8X215tGXD4LWdLeRwc51oJlAR5IJf7mope11G fsFlQ3tR3ul9uY1IwlBK94v0Sa5Xfor6AdD7BIvGGp5fbeiCiySNgrtKwMFeICd5 8uAQwGT6RL6/U/RqTBGOIGnbU+7Ji8Z4EyrxvHQpH4QShwlD9ZM= =F7l1 -----END PGP SIGNATURE----- Oleg Broytman (10): Prepare for the next release Fix a bug working with microseconds in `Time` columns Tests: Allow to run `flake8` under any Python version Feat(sqlite): Add driver `supersqlite` Fix a bug in cascade deletion/nullification Feat(sqlbuilder): Improve sqlrepr'ing `ALL/ANY/SOME()` CI: Run tests with Python 3.8 at Travis CI Fix(postgres): Fix a bug in `PostgresConnection.columnsFromSchema` Tests(tox-select-envs.cmd): Exit the batch with an error Release 3.8.0 ----------------------------------------------------------------------- hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-12-07 17:39:14
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via b0b1c9c3610f9b52ea80c815a93cf49241081497 (commit) via 0e6ca33cc343ac7910bee9c34a0a33d0d9d3a192 (commit) via 83fd61d2d8ef1231291fee1aa650af6f58098342 (commit) from cdf61fad45dc594f28ebb2b56ae0adc931f615f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/b0b1c9c3610f9b52ea80c815a93cf49241081497 commit b0b1c9c3610f9b52ea80c815a93cf49241081497 Author: Oleg Broytman <ph...@ph...> Date: Sat Dec 7 20:27:56 2019 +0300 Release 3.8.0 diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 5cb2886..fe822ef 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,28 +1,41 @@ Hello! -I'm pleased to announce version 3.8.0a1, the first alpha of the upcoming -release of branch 3.8 of SQLObject. +I'm pleased to announce version 3.8.0, the first stable release of branch +3.8 of SQLObject. -I'm pleased to announce version 3.8.0a2, the second alpha of the upcoming -release of branch 3.8 of SQLObject. -I'm pleased to announce version 3.8.0b1, the first beta of the upcoming -release of branch 3.8 of SQLObject. +What's new in SQLObject +======================= -I'm pleased to announce version 3.8.0rc1, the first release candidate -of the upcoming release of branch 3.8 of SQLObject. +Features +-------- -I'm pleased to announce version 3.8.0, the first stable release of branch -3.8 of SQLObject. +* Add driver ``supersqlite``. Not all tests are passing + so the driver isn't added to the list of default drivers. -I'm pleased to announce version 3.8.1, the first bugfix release of branch -3.8 of SQLObject. +Minor features +-------------- +* Improve sqlrepr'ing ``ALL/ANY/SOME()``: always put the expression + at the right side of the comparison operation. -What's new in SQLObject -======================= +Bug fixes +--------- + +* Fixed a bug in cascade deletion/nullification. + +* Fixed a bug in ``PostgresConnection.columnsFromSchema``: + PostgreSQL 12 removed outdated catalog attribute + ``pg_catalog.pg_attrdef.adsrc``. + +* Fixed a bug working with microseconds in Time columns. + +CI +-- + +* Run tests with Python 3.8 at Travis CI. -Contributors for this release are +Contributors for this release are Andrew Trusty, Marco Sirabella and darix. For a more complete list, please see the news: http://sqlobject.org/News.html @@ -54,7 +67,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.0a0.dev20190501/ +https://pypi.org/project/SQLObject/3.8.0 News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 9f09e51..92962cf 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -SQLObject 3.8.0a0 -================= +SQLObject 3.8.0 +=============== Thanks for looking at SQLObject. SQLObject is an object-relational mapper, i.e., a library that will wrap your database tables in Python diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs index 6523174..349c6ed 100755 --- a/devscripts/build-all-docs +++ b/devscripts/build-all-docs @@ -10,7 +10,7 @@ cd "`dirname \"$0\"`" && PROG_DIR="`pwd`" && cd .. && -build_docs 3.7.3 && +build_docs 3.8.0 && build_docs master devel && rm -rf docs/html && diff --git a/docs/News.rst b/docs/News.rst index a68b739..9012621 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,8 +5,10 @@ News .. contents:: Contents: :backlinks: none -SQLObject (master) -================== +SQLObject 3.8.0 +=============== + +Released 7 Dec 2019. Features -------- diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py index 0d92991..763a4a4 100644 --- a/sqlobject/__version__.py +++ b/sqlobject/__version__.py @@ -1,8 +1,8 @@ -version = '3.7.3' +version = '3.8.0' major = 3 -minor = 7 -micro = 3 +minor = 8 +micro = 0 release_level = 'final' serial = 0 version_info = (major, minor, micro, release_level, serial) http://sourceforge.net/p/sqlobject/sqlobject/ci/0e6ca33cc343ac7910bee9c34a0a33d0d9d3a192 commit 0e6ca33cc343ac7910bee9c34a0a33d0d9d3a192 Author: Oleg Broytman <ph...@ph...> Date: Thu Nov 21 15:43:25 2019 +0300 Tests(tox-select-envs.cmd): Exit the batch with an error [skip ci] diff --git a/devscripts/tox-select-envs.cmd b/devscripts/tox-select-envs.cmd index 03d8b4e..1aa1519 100644 --- a/devscripts/tox-select-envs.cmd +++ b/devscripts/tox-select-envs.cmd @@ -15,4 +15,5 @@ if not "%envs%"=="" ( tox -e "%envs%" %* ) else ( echo "No environments match %pattern%" >&2 + exit /b 1 ) http://sourceforge.net/p/sqlobject/sqlobject/ci/83fd61d2d8ef1231291fee1aa650af6f58098342 commit 83fd61d2d8ef1231291fee1aa650af6f58098342 Author: Oleg Broytman <ph...@ph...> Date: Thu Nov 14 20:23:05 2019 +0300 Fix(postgres): Fix a bug in `PostgresConnection.columnsFromSchema` PostgreSQL 12 removed outdated catalog attribute `pg_catalog.pg_attrdef.adsrc`. diff --git a/docs/News.rst b/docs/News.rst index 24ad661..a68b739 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -25,6 +25,10 @@ Bug fixes * Fixed a bug in cascade deletion/nullification. +* Fixed a bug in ``PostgresConnection.columnsFromSchema``: + PostgreSQL 12 removed outdated catalog attribute + ``pg_catalog.pg_attrdef.adsrc``. + * Fixed a bug working with microseconds in Time columns. CI diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py index afe8133..85a5094 100644 --- a/sqlobject/postgres/pgconnection.py +++ b/sqlobject/postgres/pgconnection.py @@ -353,7 +353,8 @@ class PostgresConnection(DBAPI): colQuery = """ SELECT a.attname, pg_catalog.format_type(a.atttypid, a.atttypmod), a.attnotnull, - (SELECT substring(d.adsrc for 128) FROM pg_catalog.pg_attrdef d + (SELECT substring(pg_catalog.pg_get_expr(d.adbin, d.adrelid) for 128) + FROM pg_catalog.pg_attrdef d WHERE d.adrelid=a.attrelid AND d.adnum = a.attnum) FROM pg_catalog.pg_attribute a WHERE a.attrelid =%s::regclass ----------------------------------------------------------------------- Summary of changes: ANNOUNCE.rst | 45 ++++++++++++++++++++++++-------------- README.rst | 4 ++-- devscripts/build-all-docs | 2 +- devscripts/tox-select-envs.cmd | 1 + docs/News.rst | 10 +++++++-- sqlobject/__version__.py | 6 ++--- sqlobject/postgres/pgconnection.py | 3 ++- 7 files changed, 46 insertions(+), 25 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-11-01 18:11:15
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via cdf61fad45dc594f28ebb2b56ae0adc931f615f1 (commit) via 596704cd6be8970c26b200df32cfa335c0d2bf50 (commit) via 852bded59e5c7da4e118d6b54c1097f8a32fcf67 (commit) via f9822e7a2ad3558402dec8a552107b7328da938a (commit) via 701fb3c7268fc96ab54c243feed58a4f7614403c (commit) via 351ac9230a1cb13ebeeddae9ab6b7b8c1dda1191 (commit) via d53e4f7d2110daa53c86c8c78e401f590da95a5a (commit) from f31a1bc9c70cb0b1504b70d1dacd4ef18dc8cfb7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/cdf61fad45dc594f28ebb2b56ae0adc931f615f1 commit cdf61fad45dc594f28ebb2b56ae0adc931f615f1 Author: Oleg Broytman <ph...@ph...> Date: Fri Nov 1 17:51:52 2019 +0300 CI: Run tests with Python 3.8 at Travis CI Add Python 3.8 to `setup.py` and `devscripts/setup`. diff --git a/.travis.yml b/.travis.yml index 8fe81ba..a674f2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,9 @@ matrix: - python: "3.7" dist: xenial env: TESTS=py37-mysql + - python: "3.8" + dist: xenial + env: TESTS=py38-mysql - python: "2.7" env: TESTS=py27-postgres - python: "3.4" @@ -43,6 +46,9 @@ matrix: - python: "3.7" dist: xenial env: TESTS=py37-postgres + - python: "3.8" + dist: xenial + env: TESTS=py38-postgres - python: "2.7" env: TESTS=py27-sqlite - python: "3.4" @@ -54,11 +60,14 @@ matrix: - python: "3.7" dist: xenial env: TESTS=py37-sqlite + - python: "3.8" + dist: xenial + env: TESTS=py38-sqlite - python: "2.7" env: TESTS=py27-flake8 - - python: "3.7" + - python: "3.8" dist: xenial - env: TESTS=py37-flake8 + env: TESTS=py38-flake8 - python: "2.7" env: TESTS=py27-firebird - python: "3.6" diff --git a/devscripts/setup b/devscripts/setup index 04ed1b7..3c12824 100755 --- a/devscripts/setup +++ b/devscripts/setup @@ -3,7 +3,7 @@ umask 022 # -rwxr-xr-x cd "`dirname \"$0\"`"/.. && -for py_ver in 2.7 3.4 3.5 3.6 3.7; do +for py_ver in 2.7 3.4 3.5 3.6 3.7 3.8; do python$py_ver -m pip install --install-option=-O2 --upgrade . done && diff --git a/docs/News.rst b/docs/News.rst index 425aa1a..24ad661 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -27,6 +27,11 @@ Bug fixes * Fixed a bug working with microseconds in Time columns. +CI +-- + +* Run tests with Python 3.8 at Travis CI. + SQLObject 3.7.3 =============== diff --git a/setup.py b/setup.py index 0af8a29..d85791d 100755 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ and `GitHub <https://github.com/sqlobject>`_. "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Topic :: Database", "Topic :: Database :: Front-Ends", "Topic :: Software Development :: Libraries :: Python Modules", diff --git a/tox.ini b/tox.ini index 65b2147..9be1d8b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py{27,34,35,36,37}-sqlite{,-memory},py{27,37}-flake8 +envlist = py{27,34,35,36,37,38}-sqlite{,-memory},py{27,38}-flake8 # Base test environment settings [testenv] @@ -12,6 +12,7 @@ basepython = py35: {env:TOXPYTHON:python3.5} py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} + py38: {env:TOXPYTHON:python3.8} commands = {envpython} --version {envpython} -c "import struct; print(struct.calcsize('P') * 8)" @@ -75,6 +76,10 @@ deps = commands = {envpython} -c "print('MySQL-python requires Python 2.7')" deps = +[testenv:py38-mysqldb] +commands = {envpython} -c "print('MySQL-python requires Python 2.7')" +deps = + [mysqlclient] commands = {[testenv]commands} @@ -99,6 +104,9 @@ commands = {[mysqlclient]commands} [testenv:py37-mysqlclient] commands = {[mysqlclient]commands} +[testenv:py38-mysqlclient] +commands = {[mysqlclient]commands} + [mysql-connector] commands = {[testenv]commands} @@ -124,6 +132,9 @@ commands = {[mysql-connector]commands} [testenv:py37-mysql-connector] commands = {[mysql-connector]commands} +[testenv:py38-mysql-connector] +commands = {[mysql-connector]commands} + [oursql] commands = {[testenv]commands} @@ -149,6 +160,9 @@ commands = {[oursql]commands} [testenv:py37-mysql-oursql3] commands = {[oursql]commands} +[testenv:py38-mysql-oursql3] +commands = {[oursql]commands} + [pymysql] commands = {[testenv]commands} @@ -174,6 +188,9 @@ commands = {[pymysql]commands} [testenv:py37-mysql-pymysql] commands = {[pymysql]commands} +[testenv:py38-mysql-pymysql] +commands = {[pymysql]commands} + [mysql-pyodbc] commands = {[testenv]commands} @@ -200,6 +217,9 @@ commands = {[mysql-pyodbc]commands} [testenv:py37-mysql-pyodbc-noauto] commands = {[mysql-pyodbc]commands} +[testenv:py38-mysql-pyodbc-noauto] +commands = {[mysql-pyodbc]commands} + [mysql-pypyodbc] commands = {[testenv]commands} @@ -225,6 +245,9 @@ commands = {[mysql-pypyodbc]commands} [testenv:py37-mysql-pypyodbc-noauto] commands = {[mysql-pypyodbc]commands} +[testenv:py38-mysql-pypyodbc-noauto] +commands = {[mysql-pypyodbc]commands} + # PostgreSQL test environments [psycopg] commands = @@ -251,6 +274,9 @@ commands = {[psycopg]commands} [testenv:py37-postgres-psycopg] commands = {[psycopg]commands} +[testenv:py38-postgres-psycopg] +commands = {[psycopg]commands} + [pygresql] commands = {[testenv]commands} @@ -276,6 +302,9 @@ commands = {[pygresql]commands} [testenv:py37-postgres-pygresql] commands = {[pygresql]commands} +[testenv:py38-postgres-pygresql] +commands = {[pygresql]commands} + [pypostgresql] commands = {[testenv]commands} @@ -300,6 +329,9 @@ commands = {[pypostgresql]commands} [testenv:py37-postgres-pypostgresql] commands = {[pypostgresql]commands} +[testenv:py38-postgres-pypostgresql] +commands = {[pypostgresql]commands} + [pg8000] commands = {[testenv]commands} @@ -325,6 +357,9 @@ commands = {[pg8000]commands} [testenv:py37-postgres-pg8000] commands = {[pg8000]commands} +[testenv:py38-postgres-pg8000] +commands = {[pg8000]commands} + [postgres-pyodbc] commands = {[testenv]commands} @@ -351,6 +386,9 @@ commands = {[postgres-pyodbc]commands} [testenv:py37-postgres-pyodbc-noauto] commands = {[postgres-pyodbc]commands} +[testenv:py38-postgres-pyodbc-noauto] +commands = {[postgres-pyodbc]commands} + [postgres-pypyodbc] commands = {[testenv]commands} @@ -376,6 +414,9 @@ commands = {[postgres-pypyodbc]commands} [testenv:py37-postgres-pypyodbc-noauto] commands = {[postgres-pypyodbc]commands} +[testenv:py38-postgres-pypyodbc-noauto] +commands = {[postgres-pypyodbc]commands} + # SQLite test environments [sqlite] @@ -402,6 +443,9 @@ commands = {[sqlite]commands} [testenv:py37-sqlite] commands = {[sqlite]commands} +[testenv:py38-sqlite] +commands = {[sqlite]commands} + [sqlite-memory] commands = {[testenv]commands} @@ -424,6 +468,9 @@ commands = {[sqlite-memory]commands} [testenv:py37-sqlite-memory] commands = {[sqlite-memory]commands} +[testenv:py38-sqlite-memory] +commands = {[sqlite-memory]commands} + [sqlite-supersqlite] commands = {[testenv]commands} @@ -448,6 +495,9 @@ commands = {[sqlite-supersqlite]commands} [testenv:py37-sqlite-supersqlite] commands = {[sqlite-supersqlite]commands} +[testenv:py38-sqlite-supersqlite] +commands = {[sqlite-supersqlite]commands} + # Firebird database test environments [fdb] @@ -475,6 +525,9 @@ commands = {[fdb]commands} [testenv:py37-firebird-fdb] commands = {[fdb]commands} +[testenv:py38-firebird-fdb] +commands = {[fdb]commands} + [firebirdsql] commands = {[testenv]commands} @@ -500,6 +553,9 @@ commands = {[firebirdsql]commands} [testenv:py37-firebirdsql] commands = {[firebirdsql]commands} +[testenv:py38-firebirdsql] +commands = {[firebirdsql]commands} + # Special test environments [testenv:py27-flake8] changedir = ./ @@ -541,6 +597,14 @@ commands = {[testenv]commands} flake8 . +[testenv:py38-flake8] +changedir = ./ +deps = + flake8 +commands = + {[testenv]commands} + flake8 . + # Windows testing [mssql-pyodbc-w32] platform = win32 @@ -575,6 +639,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[mssql-pyodbc-w32]commands} +[testenv:py38-mssql-pyodbc-noauto-w32] +platform = win32 +commands = {[mssql-pyodbc-w32]commands} + [mysql-connector-w32] platform = win32 commands = @@ -608,6 +676,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[mysql-connector-w32]commands} +[testenv:py38-mysql-connector-w32] +platform = win32 +commands = {[mysql-connector-w32]commands} + [pymysql-w32] platform = win32 commands = @@ -641,6 +713,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[pymysql-w32]commands} +[testenv:py38-mysql-pymysql-w32] +platform = win32 +commands = {[pymysql-w32]commands} + [mysql-pyodbc-w32] platform = win32 commands = @@ -675,6 +751,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[mysql-pyodbc-w32]commands} +[testenv:py38-mysql-pyodbc-noauto-w32] +platform = win32 +commands = {[mysql-pyodbc-w32]commands} + [mysql-pypyodbc-w32] platform = win32 commands = @@ -709,6 +789,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[mysql-pypyodbc-w32]commands} +[testenv:py38-mysql-pypyodbc-noauto-w32] +platform = win32 +commands = {[mysql-pypyodbc-w32]commands} + [psycopg-w32] platform = win32 commands = @@ -742,6 +826,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[psycopg-w32]commands} +[testenv:py38-postgres-psycopg-w32] +platform = win32 +commands = {[psycopg-w32]commands} + [pygresql-w32] platform = win32 commands = @@ -775,6 +863,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[pygresql-w32]commands} +[testenv:py38-postgres-pygresql-w32] +platform = win32 +commands = {[pygresql-w32]commands} + [pypostgresql-w32] platform = win32 commands = @@ -807,6 +899,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[pypostgresql-w32]commands} +[testenv:py38-postgres-pypostgresql-w32] +platform = win32 +commands = {[pypostgresql-w32]commands} + [pg8000-w32] platform = win32 commands = @@ -840,6 +936,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[pg8000-w32]commands} +[testenv:py38-postgres-pg8000-w32] +platform = win32 +commands = {[pg8000-w32]commands} + [postgres-pyodbc-w32] platform = win32 commands = @@ -874,6 +974,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[postgres-pyodbc-w32]commands} +[testenv:py38-postgres-pyodbc-noauto-w32] +platform = win32 +commands = {[postgres-pyodbc-w32]commands} + [postgres-pypyodbc-w32] platform = win32 commands = @@ -908,6 +1012,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[postgres-pypyodbc-w32]commands} +[testenv:py38-postgres-pypyodbc-noauto-w32] +platform = win32 +commands = {[postgres-pypyodbc-w32]commands} + [sqlite-w32] platform = win32 commands = @@ -938,6 +1046,10 @@ commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[sqlite-w32]commands} +[testenv:py38-sqlite-w32] +platform = win32 +commands = {[sqlite-w32]commands} + [sqlite-memory-w32] platform = win32 commands = @@ -967,3 +1079,7 @@ platform = win32 commands = cmd /c "copy ..\\devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py" {[sqlite-memory-w32]commands} + +[testenv:py38-sqlite-memory-w32] +platform = win32 +commands = {[sqlite-memory-w32]commands} http://sourceforge.net/p/sqlobject/sqlobject/ci/596704cd6be8970c26b200df32cfa335c0d2bf50 commit 596704cd6be8970c26b200df32cfa335c0d2bf50 Author: Oleg Broytman <ph...@ph...> Date: Mon Sep 30 23:00:22 2019 +0300 Feat(sqlbuilder): Improve sqlrepr'ing `ALL/ANY/SOME()` diff --git a/docs/News.rst b/docs/News.rst index 5b63bba..425aa1a 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -14,6 +14,12 @@ Features * Add driver ``supersqlite``. Not all tests are passing so the driver isn't added to the list of default drivers. +Minor features +-------------- + +* Improve sqlrepr'ing ``ALL/ANY/SOME()``: always put the expression + at the right side of the comparison operation. + Bug fixes --------- diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py index d6c2e61..844ab9e 100644 --- a/sqlobject/sqlbuilder.py +++ b/sqlobject/sqlbuilder.py @@ -300,6 +300,8 @@ operatorMap = { class SQLOp(SQLExpression): def __init__(self, op, expr1, expr2): self.op = op.upper() + if isinstance(expr1, Subquery): + expr1, expr2 = expr2, expr1 self.expr1 = expr1 self.expr2 = expr2 ... 602 lines suppressed ... hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-09-22 13:07:23
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The annotated tag, 3.7.3 has been created at d39a6cfc14b44226565e3d78f134b043f0588492 (tag) tagging f31a1bc9c70cb0b1504b70d1dacd4ef18dc8cfb7 (commit) replaces 3.7.2 tagged by Oleg Broytman on Sun Sep 22 16:01:41 2019 +0300 - Log ----------------------------------------------------------------- Release 3.7.3 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEAXmp+v5763cG/OMobggLcLYoewMFAl2HcLUACgkQbggLcLYo ewPW9Q//Xsz3SbDqCCkwT2EhLSeTKAbjEuDI8gxNu8ONJwuo1JzTqKR4PneB3uE5 2O0lp6APwJPbMefdtEc6bRywqGE0hBJX3Lx728hzfABN3daDbsuVrJjBycv3fXGd nWKDg13yJ1bl1n1DrGFJqOoBBTV0oOejUgf2Zp2VsqbzDkx2X+GE3AEvfmPIGh+L myr3Sm+SVXoeSJY/Kw21+4ZHhpRWfch1m7rFK2ER5k3AxmDhZAYT3AqypfNXMxuf kcNp4+eWpRmePyP0lzUpjKLAKZ1VNqPaXOqpueYoy+HTr/Hjfkvca84W3Ol2VhwM B86rV4uNeVvAUeNWUYlHJ7Bk3ICnenOeIeLWEp2/x8MMNGPp0wPCNnPFDPwXEI8k BSJY7aXWzDS3sfm8jJy11oy0nfNWMz0E7suBH5Pt92t38076YN9j60jLH+H75lnW hsGcSo0blI5xWu7fNElurirhJn5K/CNpumc6YM/HWVN1IFBeCBx3RJMElArQMxdL /LO1PBEIp+xCEm0Vma1P9qe3cVfhnljrwdCNL2LomMzp6tCHXJijebLckgeRR5sn +aOaEa+IhJumsfuXX88mM2EvmvDNS8RJbzKJSwp7b/+t6JQthEg9R67zxMypa3Ro cXTRM2Gtiwh8Gi8z/dTuAT7TmlUfRtatzMH0YjjLb3Wlq0hPMxs= =UrYH -----END PGP SIGNATURE----- Oleg Broytman (17): Prepare for the next release Build(devscripts): Add `tox-select-envs.cmd` for w32 Tests(tox): Refactor `tox-select-envs.cmd` Tests(tox): Add dummy tests and unify test names CI: Reduce the number of virtual machines/containers Tests(tox): Exclude tests from the list of auto tests Build: Remove outdated `git-svn` CI(AppVeyor): Move `validators.py` -> `devscripts/CI/` Refactor: Remove excessive assignment Tests(ForeignKey_cascade): Add tests for cascade deletion Tests: Fix calls to `pytest.mark.skipif` Tests: Fix module-level calls to `pytest.mark.skip` Fix: Avoid excessive parentheses around `ALL/ANY/SOME()` Fix escape sequences `'\%'` -> `'\\%'` Fix sqlite test under Python 3.7+ at AppVeyor Docs(News): SQLObject 3.7.3 released 22 Sep 2019 Release 3.7.3 ----------------------------------------------------------------------- hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-09-22 13:07:22
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via f31a1bc9c70cb0b1504b70d1dacd4ef18dc8cfb7 (commit) via 6c54d9a0009d50a9859d2fa0b76103e2992a17de (commit) via aa0af590862607300b0e4a695fcc6516d903a926 (commit) via ff5a94f43b4e221e9ae5986eea824fb642d309c0 (commit) via a26acf96a3322dedfaf2a2b36b5eaf3d313e0901 (commit) via 477cff64f80a545db9346770e7cc4378c3413780 (commit) via b3d72cd4c4516bddf8bd39550ed8582cf7101eae (commit) via 14d47233fb0d8e0eb4f39c17f0ffce3b907e2910 (commit) via e24b9ed78e3de8016e6f9aafdfa153aa08faa732 (commit) via 26d83fb89b914940892dbecd033707fbfcc8b71e (commit) via bae4bad96fbff1fdb476ca11e200d4d1a0907083 (commit) from 9d4af66987f77054c307c417dbdd786d6bfb5012 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/f31a1bc9c70cb0b1504b70d1dacd4ef18dc8cfb7 commit f31a1bc9c70cb0b1504b70d1dacd4ef18dc8cfb7 Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 22 15:59:34 2019 +0300 Release 3.7.3 diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 5cb2886..67323a9 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,26 +1,37 @@ Hello! -I'm pleased to announce version 3.8.0a1, the first alpha of the upcoming -release of branch 3.8 of SQLObject. +I'm pleased to announce version 3.7.3, a bugfix release of branch +3.7 of SQLObject. -I'm pleased to announce version 3.8.0a2, the second alpha of the upcoming -release of branch 3.8 of SQLObject. -I'm pleased to announce version 3.8.0b1, the first beta of the upcoming -release of branch 3.8 of SQLObject. +What's new in SQLObject +======================= -I'm pleased to announce version 3.8.0rc1, the first release candidate -of the upcoming release of branch 3.8 of SQLObject. +Bug fixes +--------- -I'm pleased to announce version 3.8.0, the first stable release of branch -3.8 of SQLObject. +* Avoid excessive parentheses around ``ALL/ANY/SOME()``. -I'm pleased to announce version 3.8.1, the first bugfix release of branch -3.8 of SQLObject. +Tests +----- +* Add tests for cascade deletion. -What's new in SQLObject -======================= +* Add tests for ``sqlbuilder.ALL/ANY/SOME()``. + +* Fix calls to ``pytest.mark.skipif`` - make conditions bool instead of str. + +* Fix module-level calls to ``pytest.mark.skip`` - add reasons. + +* Fix escape sequences ``'\%'`` -> ``'\\%'``. + +CI +-- + +* Reduce the number of virtual machines/containers: + one OS, one DB, one python version, many drivers per VM. + +* Fix sqlite test under Python 3.7+ at AppVeyor. Contributors for this release are @@ -54,7 +65,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.0a0.dev20190501/ +https://pypi.org/project/SQLObject/3.7.3 News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 404d165..4348085 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -SQLObject 3.7.3a0 -================= +SQLObject 3.7.3 +=============== Thanks for looking at SQLObject. SQLObject is an object-relational mapper, i.e., a library that will wrap your database tables in Python diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs index bcb5c7c..6523174 100755 --- a/devscripts/build-all-docs +++ b/devscripts/build-all-docs @@ -10,7 +10,7 @@ cd "`dirname \"$0\"`" && PROG_DIR="`pwd`" && cd .. && -build_docs 3.7.2 && +build_docs 3.7.3 && build_docs master devel && rm -rf docs/html && diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py index 52a8048..0d92991 100644 --- a/sqlobject/__version__.py +++ b/sqlobject/__version__.py @@ -1,8 +1,8 @@ -version = '3.7.2' +version = '3.7.3' major = 3 minor = 7 -micro = 2 +micro = 3 release_level = 'final' serial = 0 version_info = (major, minor, micro, release_level, serial) http://sourceforge.net/p/sqlobject/sqlobject/ci/6c54d9a0009d50a9859d2fa0b76103e2992a17de commit 6c54d9a0009d50a9859d2fa0b76103e2992a17de Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 22 15:51:56 2019 +0300 Docs(News): SQLObject 3.7.3 released 22 Sep 2019 diff --git a/docs/News.rst b/docs/News.rst index e8d7d99..d24ad0a 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -8,6 +8,11 @@ News SQLObject (master) ================== +SQLObject 3.7.3 +=============== + +Released 22 Sep 2019. + Bug fixes --------- http://sourceforge.net/p/sqlobject/sqlobject/ci/aa0af590862607300b0e4a695fcc6516d903a926 commit aa0af590862607300b0e4a695fcc6516d903a926 Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 22 03:50:35 2019 +0300 Fix sqlite test under Python 3.7+ at AppVeyor diff --git a/docs/News.rst b/docs/News.rst index 23c6f88..e8d7d99 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -32,6 +32,8 @@ CI * Reduce the number of virtual machines/containers: one OS, one DB, one python version, many drivers per VM. +* Fix sqlite test under Python 3.7+ at AppVeyor. + SQLObject 3.7.2 =============== diff --git a/sqlobject/tests/test_sqlite.py b/sqlobject/tests/test_sqlite.py index 5fb070b..2ec1d42 100644 --- a/sqlobject/tests/test_sqlite.py +++ b/sqlobject/tests/test_sqlite.py @@ -140,7 +140,7 @@ def test_memorydb(): def test_list_databases(): - assert connection.listDatabases() == ['main'] + assert 'main' in connection.listDatabases() def test_list_tables(): http://sourceforge.net/p/sqlobject/sqlobject/ci/ff5a94f43b4e221e9ae5986eea824fb642d309c0 commit ff5a94f43b4e221e9ae5986eea824fb642d309c0 Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 22 03:47:42 2019 +0300 Fix escape sequences `'\%'` -> `'\\%'` diff --git a/docs/News.rst b/docs/News.rst index 3ca56b0..23c6f88 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -24,6 +24,8 @@ Tests * Fix module-level calls to ``pytest.mark.skip`` - add reasons. +* Fix escape sequences ``'\%'`` -> ``'\\%'``. + CI -- diff --git a/sqlobject/tests/test_converters.py b/sqlobject/tests/test_converters.py index 0468a75..a064c69 100644 --- a/sqlobject/tests/test_converters.py +++ b/sqlobject/tests/test_converters.py @@ -262,8 +262,8 @@ def test_timedelta(): def test_quote_unquote_str(): assert quote_str('test%', 'postgres') == "'test%'" assert quote_str('test%', 'sqlite') == "'test%'" - assert quote_str('test\%', 'postgres') == "E'test\\%'" - assert quote_str('test\\%', 'sqlite') == "'test\%'" + assert quote_str('test\\%', 'postgres') == "E'test\\%'" + assert quote_str('test\\%', 'sqlite') == "'test\\%'" assert unquote_str("'test%'") == 'test%' assert unquote_str("'test\\%'") == 'test\\%' assert unquote_str("E'test\\%'") == 'test\\%' http://sourceforge.net/p/sqlobject/sqlobject/ci/a26acf96a3322dedfaf2a2b36b5eaf3d313e0901 commit a26acf96a3322dedfaf2a2b36b5eaf3d313e0901 Author: Oleg Broytman <ph...@ph...> Date: Fri Sep 13 04:16:10 2019 +0300 Fix: Avoid excessive parentheses around `ALL/ANY/SOME()` diff --git a/docs/News.rst b/docs/News.rst index a216624..3ca56b0 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -8,11 +8,18 @@ News SQLObject (master) ================== +Bug fixes +--------- + +* Avoid excessive parentheses around ``ALL/ANY/SOME()``. + Tests ----- * Add tests for cascade deletion. +* Add tests for ``sqlbuilder.ALL/ANY/SOME()``. + * Fix calls to ``pytest.mark.skipif`` - make conditions bool instead of str. * Fix module-level calls to ``pytest.mark.skip`` - add reasons. diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py index cc6696b..d6c2e61 100644 --- a/sqlobject/sqlbuilder.py +++ b/sqlobject/sqlbuilder.py @@ -308,7 +308,8 @@ class SQLOp(SQLExpression): s2 = sqlrepr(self.expr2, db) if s1[0] != '(' and s1 != 'NULL': s1 = '(' + s1 + ')' - if s2[0] != '(' and s2 != 'NULL': + if s2[0] != '(' and s2 != 'NULL' and \ + not isinstance(self.expr2, Subquery): s2 = '(' + s2 + ')' return "(%s %s %s)" % (s1, self.op, s2) diff --git a/sqlobject/tests/test_mysql.py b/sqlobject/tests/test_mysql.py index 3d7b9a6..5f41bd9 100644 --- a/sqlobject/tests/test_mysql.py +++ b/sqlobject/tests/test_mysql.py @@ -1,5 +1,6 @@ import pytest -from sqlobject import SQLObject +from sqlobject import SQLObject, IntCol +from sqlobject.sqlbuilder import Select, ANY from sqlobject.tests.dbtest import getConnection, setupClass @@ -24,3 +25,16 @@ def test_list_databases(): def test_list_tables(): setupClass(SOTestSOListMySQL) assert SOTestSOListMySQL.sqlmeta.table in connection.listTables() + + +class SOTestANY(SQLObject): + value = IntCol() + + +def test_ANY(): + setupClass(SOTestANY) + SOTestANY(value=10) + SOTestANY(value=20) + SOTestANY(value=30) + assert len(list(SOTestANY.select( + SOTestANY.q.value > ANY(Select([SOTestANY.q.value]))))) == 2 diff --git a/sqlobject/tests/test_postgres.py b/sqlobject/tests/test_postgres.py index ab1f969..dbe62c0 100644 --- a/sqlobject/tests/test_postgres.py +++ b/sqlobject/tests/test_postgres.py @@ -1,6 +1,7 @@ import os import pytest -from sqlobject import SQLObject, StringCol +from sqlobject import SQLObject, StringCol, IntCol +from sqlobject.sqlbuilder import Select, SOME from sqlobject.tests.dbtest import getConnection, setupClass @@ -56,3 +57,16 @@ def test_list_databases(): def test_list_tables(): setupClass(SOTestSOList) assert SOTestSOList.sqlmeta.table in connection.listTables() + + +class SOTestSOME(SQLObject): + value = IntCol() + + +def test_SOME(): + setupClass(SOTestSOME) + SOTestSOME(value=10) + SOTestSOME(value=20) + SOTestSOME(value=30) + assert len(list(SOTestSOME.select( + SOTestSOME.q.value > SOME(Select([SOTestSOME.q.value]))))) == 2 diff --git a/sqlobject/tests/test_sqlbuilder.py b/sqlobject/tests/test_sqlbuilder.py index 1d2c850..5b9d3b4 100644 --- a/sqlobject/tests/test_sqlbuilder.py +++ b/sqlobject/tests/test_sqlbuilder.py @@ -1,7 +1,7 @@ from sqlobject import IntCol, SQLObject, StringCol from sqlobject.compat import PY2 -from sqlobject.sqlbuilder import AND, CONCAT, Delete, Insert, SQLOp, Select, \ - Union, Update, const, func, sqlrepr +from sqlobject.sqlbuilder import AND, ANY, CONCAT, Delete, Insert, \ + SQLConstant, SQLOp, Select, Union, Update, const, func, sqlrepr from sqlobject.tests.dbtest import getConnection, raises, setupClass @@ -119,3 +119,16 @@ def test_CONCAT(): if not PY2 and not isinstance(result, str): result = result.decode('ascii') assert result == "test-suffix" + + +def test_ANY(): + setupClass(SOTestSQLBuilder) + + select = Select( + [SOTestSQLBuilder.q.name], + SQLConstant("'value'") == ANY(SOTestSQLBuilder.q.so_value), + ) + + assert sqlrepr(select, 'mysql') == \ + "SELECT so_test_sql_builder.name FROM so_test_sql_builder " \ + "WHERE (('value') = ANY (so_test_sql_builder.so_value))" http://sourceforge.net/p/sqlobject/sqlobject/ci/477cff64f80a545db9346770e7cc4378c3413780 commit 477cff64f80a545db9346770e7cc4378c3413780 Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 15 17:54:31 2019 +0300 Tests: Fix module-level calls to `pytest.mark.skip` Add reasons. diff --git a/docs/News.rst b/docs/News.rst index f1fcf89..a216624 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -15,6 +15,8 @@ Tests * Fix calls to ``pytest.mark.skipif`` - make conditions bool instead of str. +* Fix module-level calls to ``pytest.mark.skip`` - add reasons. + CI -- diff --git a/sqlobject/tests/test_decimal.py b/sqlobject/tests/test_decimal.py index c7388e0..06cd2fb 100644 --- a/sqlobject/tests/test_decimal.py +++ b/sqlobject/tests/test_decimal.py @@ -16,7 +16,7 @@ except NameError: pass else: if not support_decimal_column: - pytestmark = pytest.mark.skip('') + pytestmark = pytest.mark.skip("These tests require Decimal support") class DecimalTable(SQLObject): diff --git a/sqlobject/tests/test_mysql.py b/sqlobject/tests/test_mysql.py index de4b040..3d7b9a6 100644 --- a/sqlobject/tests/test_mysql.py +++ b/sqlobject/tests/test_mysql.py @@ -10,7 +10,7 @@ except (AttributeError, NameError): pass else: if connection.dbName != "mysql": - pytestmark = pytest.mark.skip('') + pytestmark = pytest.mark.skip("These tests require MySQL") class SOTestSOListMySQL(SQLObject): diff --git a/sqlobject/tests/test_postgres.py b/sqlobject/tests/test_postgres.py index e656ce7..ab1f969 100644 --- a/sqlobject/tests/test_postgres.py +++ b/sqlobject/tests/test_postgres.py @@ -16,7 +16,7 @@ except (AttributeError, NameError): pass else: if connection.dbName != "postgres": - pytestmark = pytest.mark.skip('') + pytestmark = pytest.mark.skip("These tests require PostgreSQL") class SOTestSSLMode(SQLObject): diff --git a/sqlobject/tests/test_sqlite.py b/sqlobject/tests/test_sqlite.py index 4e9611a..5fb070b 100644 --- a/sqlobject/tests/test_sqlite.py +++ b/sqlobject/tests/test_sqlite.py @@ -16,7 +16,7 @@ except (AttributeError, NameError): pass else: if connection.dbName != "sqlite": - pytestmark = pytest.mark.skip('') + pytestmark = pytest.mark.skip("These tests require SQLite") class SQLiteFactoryTest(SQLObject): diff --git a/sqlobject/tests/test_transactions.py b/sqlobject/tests/test_transactions.py index 56ce7f8..ee66620 100644 --- a/sqlobject/tests/test_transactions.py +++ b/sqlobject/tests/test_transactions.py @@ -16,7 +16,7 @@ except NameError: pass else: if not support_transactions: - pytestmark = pytest.mark.skip('') + pytestmark = pytest.mark.skip("These tests require transactions") class SOTestSOTrans(SQLObject): http://sourceforge.net/p/sqlobject/sqlobject/ci/b3d72cd4c4516bddf8bd39550ed8582cf7101eae commit b3d72cd4c4516bddf8bd39550ed8582cf7101eae Author: Oleg Broytman <ph...@ph...> Date: Sun Sep 15 17:47:31 2019 +0300 Tests: Fix calls to `pytest.mark.skipif` Make conditions bool instead of str. diff --git a/docs/News.rst b/docs/News.rst index a8f949d..f1fcf89 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -13,6 +13,8 @@ Tests * Add tests for cascade deletion. +* Fix calls to ``pytest.mark.skipif`` - make conditions bool instead of str. + CI -- diff --git a/sqlobject/tests/test_boundattributes.py b/sqlobject/tests/test_boundattributes.py index 5ae2015..1453658 100644 --- a/sqlobject/tests/test_boundattributes.py +++ b/sqlobject/tests/test_boundattributes.py @@ -3,7 +3,9 @@ import pytest from sqlobject import boundattributes from sqlobject import declarative -pytestmark = pytest.mark.skipif('True') +pytestmark = pytest.mark.skipif( + True, + reason='The module "boundattributes" and its tests were not finished yet') class SOTestMe(object): diff --git a/sqlobject/tests/test_paste.py b/sqlobject/tests/test_paste.py index 3662309..5cd9029 100644 --- a/sqlobject/tests/test_paste.py +++ b/sqlobject/tests/test_paste.py @@ -5,7 +5,7 @@ from sqlobject import sqlhub, SQLObject, StringCol try: from sqlobject.wsgi_middleware import make_middleware except ImportError: ... 482 lines suppressed ... hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-06-30 21:34:13
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 9d4af66987f77054c307c417dbdd786d6bfb5012 (commit) via 9084e6f3a27fcf24e5fd02010319cfacf5a015dc (commit) via ed65656d57475b9cdcac7fe45a47581b95c4f375 (commit) via 37ec639c362949356a01a7fb1a8c700178b80237 (commit) via 16925142461dd707162cc23ba57add3794aa4647 (commit) from ee26d9787b276686f5be9a19229134f3256e24a3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/9d4af66987f77054c307c417dbdd786d6bfb5012 commit 9d4af66987f77054c307c417dbdd786d6bfb5012 Author: Oleg Broytman <ph...@ph...> Date: Sun Jun 30 18:27:22 2019 +0300 Tests(tox): Exclude tests from the list of auto tests Exclude ODBC tests and py27-pygresql. diff --git a/devscripts/tox-select-envs b/devscripts/tox-select-envs index 34ff4b2..f1e9a81 100755 --- a/devscripts/tox-select-envs +++ b/devscripts/tox-select-envs @@ -2,7 +2,7 @@ pattern="$1" shift -envs="`tox --listenvs-all | grep -F $pattern | sed 's/$/,/'`" +envs="`tox --listenvs-all | grep -F $pattern | grep -v 'noauto\|w32' | sed 's/$/,/'`" if [ -n "$envs" ]; then exec tox -e "$envs" "$@" diff --git a/devscripts/tox-select-envs.cmd b/devscripts/tox-select-envs.cmd index 4ea6114..03d8b4e 100644 --- a/devscripts/tox-select-envs.cmd +++ b/devscripts/tox-select-envs.cmd @@ -6,7 +6,7 @@ shift set "envs=" for /f "usebackq" %%e in ( - `tox --listenvs-all ^| find "%pattern%" ^| find "-w32"` + `tox --listenvs-all ^| find "%pattern%" ^| find "-w32" ^| find /v "noauto"` ) do ( if defined envs (set "envs=!envs!,%%e") else (set "envs=%%e") ) diff --git a/tox.ini b/tox.ini index f3f2bfc..7dac706 100644 --- a/tox.ini +++ b/tox.ini @@ -182,21 +182,21 @@ commands = pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pyodbc&odbcdrv=MySQL&charset=utf8&debug=1 mysql -uroot -e 'drop database sqlobject_test;' -[testenv:py27-mysql-pyodbc] +[testenv:py27-mysql-pyodbc-noauto] commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[mysql-pyodbc]commands} -[testenv:py34-mysql-pyodbc] +[testenv:py34-mysql-pyodbc-noauto] commands = {[mysql-pyodbc]commands} -[testenv:py35-mysql-pyodbc] +[testenv:py35-mysql-pyodbc-noauto] commands = {[mysql-pyodbc]commands} -[testenv:py36-mysql-pyodbc] +[testenv:py36-mysql-pyodbc-noauto] commands = {[mysql-pyodbc]commands} -[testenv:py37-mysql-pyodbc] +[testenv:py37-mysql-pyodbc-noauto] commands = {[mysql-pyodbc]commands} [mysql-pypyodbc] @@ -207,21 +207,21 @@ commands = pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=MySQL&charset=utf8&debug=1 mysql -uroot -e 'drop database sqlobject_test;' -[testenv:py27-mysql-pypyodbc] +[testenv:py27-mysql-pypyodbc-noauto] commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[mysql-pypyodbc]commands} -[testenv:py34-mysql-pypyodbc] +[testenv:py34-mysql-pypyodbc-noauto] commands = {[mysql-pypyodbc]commands} -[testenv:py35-mysql-pypyodbc] +[testenv:py35-mysql-pypyodbc-noauto] commands = {[mysql-pypyodbc]commands} -[testenv:py36-mysql-pypyodbc] +[testenv:py36-mysql-pypyodbc-noauto] commands = {[mysql-pypyodbc]commands} -[testenv:py37-mysql-pypyodbc] +[testenv:py37-mysql-pypyodbc-noauto] commands = {[mysql-pypyodbc]commands} # PostgreSQL test environments @@ -333,21 +333,21 @@ commands = pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pyodbc&odbcdrv=PostgreSQL%20ANSI&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test -[testenv:py27-postgres-pyodbc] +[testenv:py27-postgres-pyodbc-noauto] commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[postgres-pyodbc]commands} -[testenv:py34-postgres-pyodbc] +[testenv:py34-postgres-pyodbc-noauto] commands = {[postgres-pyodbc]commands} -[testenv:py35-postgres-pyodbc] +[testenv:py35-postgres-pyodbc-noauto] commands = {[postgres-pyodbc]commands} -[testenv:py36-postgres-pyodbc] +[testenv:py36-postgres-pyodbc-noauto] commands = {[postgres-pyodbc]commands} -[testenv:py37-postgres-pyodbc] +[testenv:py37-postgres-pyodbc-noauto] commands = {[postgres-pyodbc]commands} [postgres-pypyodbc] @@ -358,21 +358,21 @@ commands = pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=PostgreSQL%20ANSI&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test -[testenv:py27-postgres-pypyodbc] +[testenv:py27-postgres-pypyodbc-noauto] commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[postgres-pypyodbc]commands} -[testenv:py34-postgres-pypyodbc] +[testenv:py34-postgres-pypyodbc-noauto] commands = {[postgres-pypyodbc]commands} -[testenv:py35-postgres-pypyodbc] +[testenv:py35-postgres-pypyodbc-noauto] commands = {[postgres-pypyodbc]commands} -[testenv:py36-postgres-pypyodbc] +[testenv:py36-postgres-pypyodbc-noauto] commands = {[postgres-pypyodbc]commands} -[testenv:py37-postgres-pypyodbc] +[testenv:py37-postgres-pypyodbc-noauto] commands = {[postgres-pypyodbc]commands} @@ -501,25 +501,25 @@ commands = pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1" sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" -[testenv:py27-mssql-pyodbc-w32] +[testenv:py27-mssql-pyodbc-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[mssql-pyodbc-w32]commands} -[testenv:py34-mssql-pyodbc-w32] +[testenv:py34-mssql-pyodbc-noauto-w32] platform = win32 commands = {[mssql-pyodbc-w32]commands} -[testenv:py35-mssql-pyodbc-w32] +[testenv:py35-mssql-pyodbc-noauto-w32] platform = win32 commands = {[mssql-pyodbc-w32]commands} -[testenv:py36-mssql-pyodbc-w32] +[testenv:py36-mssql-pyodbc-noauto-w32] platform = win32 commands = {[mssql-pyodbc-w32]commands} -[testenv:py37-mssql-pyodbc-w32] +[testenv:py37-mssql-pyodbc-noauto-w32] platform = win32 commands = cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py" @@ -601,25 +601,25 @@ commands = pytest --cov=sqlobject -D mysql://root:Password12!@localhost/sqlobject_test?driver=pyodbc&odbcdrv=MySQL%20ODBC%205.3%20ANSI%20Driver&charset=utf8&debug=1 mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;' -[testenv:py27-mysql-pyodbc-w32] +[testenv:py27-mysql-pyodbc-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[mysql-pyodbc-w32]commands} -[testenv:py34-mysql-pyodbc-w32] +[testenv:py34-mysql-pyodbc-noauto-w32] platform = win32 commands = {[mysql-pyodbc-w32]commands} -[testenv:py35-mysql-pyodbc-w32] +[testenv:py35-mysql-pyodbc-noauto-w32] platform = win32 commands = {[mysql-pyodbc-w32]commands} -[testenv:py36-mysql-pyodbc-w32] +[testenv:py36-mysql-pyodbc-noauto-w32] platform = win32 commands = {[mysql-pyodbc-w32]commands} -[testenv:py37-mysql-pyodbc-w32] +[testenv:py37-mysql-pyodbc-noauto-w32] platform = win32 commands = cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py" @@ -635,25 +635,25 @@ commands = pytest --cov=sqlobject -D mysql://root:Password12!@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=MySQL%20ODBC%205.3%20ANSI%20Driver&charset=utf8&debug=1 mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;' -[testenv:py27-mysql-pypyodbc-w32] +[testenv:py27-mysql-pypyodbc-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[mysql-pypyodbc-w32]commands} -[testenv:py34-mysql-pypyodbc-w32] +[testenv:py34-mysql-pypyodbc-noauto-w32] platform = win32 commands = {[mysql-pypyodbc-w32]commands} -[testenv:py35-mysql-pypyodbc-w32] +[testenv:py35-mysql-pypyodbc-noauto-w32] platform = win32 commands = {[mysql-pypyodbc-w32]commands} -[testenv:py36-mysql-pypyodbc-w32] +[testenv:py36-mysql-pypyodbc-noauto-w32] platform = win32 commands = {[mysql-pypyodbc-w32]commands} -[testenv:py37-mysql-pypyodbc-w32] +[testenv:py37-mysql-pypyodbc-noauto-w32] platform = win32 commands = cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py" @@ -701,7 +701,7 @@ commands = pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pygresql&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test -[testenv:py27-postgres-pygresql-w32] +[testenv:py27-postgres-pygresql-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base @@ -800,25 +800,25 @@ commands = pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pyodbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test -[testenv:py27-postgres-pyodbc-w32] +[testenv:py27-postgres-pyodbc-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[postgres-pyodbc-w32]commands} -[testenv:py34-postgres-pyodbc-w32] +[testenv:py34-postgres-pyodbc-noauto-w32] platform = win32 commands = {[postgres-pyodbc-w32]commands} -[testenv:py35-postgres-pyodbc-w32] +[testenv:py35-postgres-pyodbc-noauto-w32] platform = win32 commands = {[postgres-pyodbc-w32]commands} -[testenv:py36-postgres-pyodbc-w32] +[testenv:py36-postgres-pyodbc-noauto-w32] platform = win32 commands = {[postgres-pyodbc-w32]commands} -[testenv:py37-postgres-pyodbc-w32] +[testenv:py37-postgres-pyodbc-noauto-w32] platform = win32 commands = cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py" @@ -834,25 +834,25 @@ commands = pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test dropdb -U postgres -w sqlobject_test -[testenv:py27-postgres-pypyodbc-w32] +[testenv:py27-postgres-pypyodbc-noauto-w32] platform = win32 commands = easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base {[postgres-pypyodbc-w32]commands} -[testenv:py34-postgres-pypyodbc-w32] +[testenv:py34-postgres-pypyodbc-noauto-w32] platform = win32 commands = {[postgres-pypyodbc-w32]commands} -[testenv:py35-postgres-pypyodbc-w32] +[testenv:py35-postgres-pypyodbc-noauto-w32] platform = win32 commands = {[postgres-pypyodbc-w32]commands} -[testenv:py36-postgres-pypyodbc-w32] +[testenv:py36-postgres-pypyodbc-noauto-w32] platform = win32 commands = {[postgres-pypyodbc-w32]commands} -[testenv:py37-postgres-pypyodbc-w32] +[testenv:py37-postgres-pypyodbc-noauto-w32] platform = win32 commands = cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py" http://sourceforge.net/p/sqlobject/sqlobject/ci/9084e6f3a27fcf24e5fd02010319cfacf5a015dc commit 9084e6f3a27fcf24e5fd02010319cfacf5a015dc Author: Oleg Broytman <ph...@ph...> Date: Sun Jun 30 17:52:29 2019 +0300 CI: Reduce the number of virtual machines/containers One OS, one DB, one python version, many drivers per VM. diff --git a/.travis.yml b/.travis.yml index acd3e87..8fe81ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,132 +22,57 @@ addons: matrix: include: - python: "2.7" - env: TOXENV=py27-mysqldb + env: TESTS=py27-mysql - python: "3.4" - env: TOXENV=py34-mysqlclient + env: TESTS=py34-mysql - python: "3.5" - env: TOXENV=py35-mysqlclient + env: TESTS=py35-mysql - python: "3.6" - env: TOXENV=py36-mysqlclient + env: TESTS=py36-mysql - python: "3.7" dist: xenial - env: TOXENV=py37-mysqlclient + env: TESTS=py37-mysql - python: "2.7" - env: TOXENV=py27-mysql-connector + env: TESTS=py27-postgres - python: "3.4" - env: TOXENV=py34-mysql-connector + env: TESTS=py34-postgres - python: "3.5" - env: TOXENV=py35-mysql-connector + env: TESTS=py35-postgres - python: "3.6" - env: TOXENV=py36-mysql-connector + env: TESTS=py36-postgres - python: "3.7" dist: xenial - env: TOXENV=py37-mysql-connector + env: TESTS=py37-postgres - python: "2.7" - env: TOXENV=py27-mysql-oursql + env: TESTS=py27-sqlite - python: "3.4" - env: TOXENV=py34-mysql-oursql3 + env: TESTS=py34-sqlite - python: "3.5" - env: TOXENV=py35-mysql-oursql3 + env: TESTS=py35-sqlite - python: "3.6" - env: TOXENV=py36-mysql-oursql3 + env: TESTS=py36-sqlite - python: "3.7" dist: xenial - env: TOXENV=py37-mysql-oursql3 + env: TESTS=py37-sqlite - python: "2.7" - env: TOXENV=py27-pymysql - - python: "3.4" - env: TOXENV=py34-pymysql - - python: "3.5" - env: TOXENV=py35-pymysql - - python: "3.6" - env: TOXENV=py36-pymysql - - python: "3.7" - dist: xenial - env: TOXENV=py37-pymysql - - python: "2.7" - env: TOXENV=py27-postgres-psycopg - - python: "3.4" - env: TOXENV=py34-postgres-psycopg - - python: "3.5" - env: TOXENV=py35-postgres-psycopg - - python: "3.6" - env: TOXENV=py36-postgres-psycopg - - python: "3.7" - dist: xenial - env: TOXENV=py37-postgres-psycopg - - python: "2.7" - env: TOXENV=py27-postgres-pygresql - - python: "3.4" - env: TOXENV=py34-postgres-pygresql - - python: "3.5" - env: TOXENV=py35-postgres-pygresql - - python: "3.6" - env: TOXENV=py36-postgres-pygresql - - python: "3.7" - dist: xenial - env: TOXENV=py37-postgres-pygresql - - python: "3.4" - env: TOXENV=py34-pypostgresql - - python: "3.5" - env: TOXENV=py35-pypostgresql - - python: "3.6" - env: TOXENV=py36-pypostgresql - - python: "3.7" - dist: xenial - env: TOXENV=py37-pypostgresql - - python: "2.7" - env: TOXENV=py27-postgres-pg8000 - - python: "3.4" - env: TOXENV=py34-postgres-pg8000 - - python: "3.5" - env: TOXENV=py35-postgres-pg8000 - - python: "3.6" - env: TOXENV=py36-postgres-pg8000 - - python: "3.7" - dist: xenial - env: TOXENV=py37-postgres-pg8000 - - python: "2.7" - env: TOXENV=py27-sqlite - - python: "3.4" - env: TOXENV=py34-sqlite - - python: "3.5" - env: TOXENV=py35-sqlite - - python: "3.6" - env: TOXENV=py36-sqlite - - python: "3.7" - dist: xenial - env: TOXENV=py37-sqlite - - python: "2.7" - env: TOXENV=py27-sqlite-memory - - python: "3.4" - env: TOXENV=py34-sqlite-memory - - python: "3.5" - env: TOXENV=py35-sqlite-memory - - python: "3.6" - env: TOXENV=py36-sqlite-memory - - python: "3.7" - dist: xenial - env: TOXENV=py37-sqlite-memory - - python: "2.7" - env: TOXENV=py27-flake8 + env: TESTS=py27-flake8 - python: "3.7" dist: xenial - env: TOXENV=py37-flake8 + env: TESTS=py37-flake8 - python: "2.7" - env: TOXENV=py27-firebird-fdb + env: TESTS=py27-firebird - python: "3.6" - env: TOXENV=py36-firebird-fdb + env: TESTS=py36-firebird - python: "2.7" - env: TOXENV=py27-firebirdsql + env: TESTS=py27-firebird - python: "3.6" - env: TOXENV=py36-firebirdsql + env: TESTS=py36-firebird allow_failures: - - env: TOXENV=py27-firebird-fdb - - env: TOXENV=py36-firebird-fdb - - env: TOXENV=py27-firebirdsql - - env: TOXENV=py36-firebirdsql + - env: TESTS=py27-firebird + - env: TESTS=py36-firebird + - env: TESTS=py27-firebird + - env: TESTS=py36-firebird fast_finish: true @@ -160,7 +85,7 @@ before_install: # to create the test database. # Copied password initializtion from ... 414 lines suppressed ... hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-05-01 16:11:08
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via ee26d9787b276686f5be9a19229134f3256e24a3 (commit) from dffe5e97678ecf0e5f9d71aa141026f34ce151cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/ee26d9787b276686f5be9a19229134f3256e24a3 commit ee26d9787b276686f5be9a19229134f3256e24a3 Author: Oleg Broytman <ph...@ph...> Date: Wed May 1 19:01:59 2019 +0300 Prepare for the next release diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 6ab1d9a..5cb2886 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,20 +1,28 @@ Hello! -I'm pleased to announce version 3.7.2, the second bugfix release of branch -3.7 of SQLObject. +I'm pleased to announce version 3.8.0a1, the first alpha of the upcoming +release of branch 3.8 of SQLObject. +I'm pleased to announce version 3.8.0a2, the second alpha of the upcoming +release of branch 3.8 of SQLObject. -What's new in SQLObject -======================= +I'm pleased to announce version 3.8.0b1, the first beta of the upcoming +release of branch 3.8 of SQLObject. + +I'm pleased to announce version 3.8.0rc1, the first release candidate +of the upcoming release of branch 3.8 of SQLObject. + +I'm pleased to announce version 3.8.0, the first stable release of branch +3.8 of SQLObject. -Minor features --------------- +I'm pleased to announce version 3.8.1, the first bugfix release of branch +3.8 of SQLObject. -* Adapt Postgres exception handling to ``psycopg2`` version ``2.8``: - in the recent ``psycopg2`` errors are in ``psycopg2.errors`` module. -* Removed RdbhostConnection: David Keeney and rdbhost seem to be unavailable - since 2017. +What's new in SQLObject +======================= + +Contributors for this release are For a more complete list, please see the news: http://sqlobject.org/News.html @@ -46,7 +54,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.7.2 +https://pypi.org/project/SQLObject/3.8.0a0.dev20190501/ News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 5221338..404d165 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -SQLObject 3.7.2 -=============== +SQLObject 3.7.3a0 +================= Thanks for looking at SQLObject. SQLObject is an object-relational mapper, i.e., a library that will wrap your database tables in Python diff --git a/docs/News.rst b/docs/News.rst index dce568e..b2da732 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,6 +5,9 @@ News .. contents:: Contents: :backlinks: none +SQLObject (master) +================== + SQLObject 3.7.2 =============== ----------------------------------------------------------------------- Summary of changes: ANNOUNCE.rst | 30 +++++++++++++++++++----------- README.rst | 4 ++-- docs/News.rst | 3 +++ 3 files changed, 24 insertions(+), 13 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-05-01 16:06:45
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The annotated tag, 3.7.2 has been created at 7669db168880db597aa16a01762cd0f4711606aa (tag) tagging dffe5e97678ecf0e5f9d71aa141026f34ce151cc (commit) replaces 3.7.1 tagged by Oleg Broytman on Wed May 1 18:54:34 2019 +0300 - Log ----------------------------------------------------------------- Release 3.7.2 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEAXmp+v5763cG/OMobggLcLYoewMFAlzJwToACgkQbggLcLYo ewO83A/+LX5zg6We2i5vgY0YAMl8uUJvQsuNeq+LHUvqKC/IV9vjMYG5Vgdl3uC0 5Y0uRgJ3D2uRfiqyfqXA07r3i7kashaI4B/tqpI+/lhAFEUYFA3PqUQ9xqtzC37u xPV4DPFqcQ1Va2bT5oGl5Lg7aQw6sRqPGQ5JApF6X2TEDmMrS1YQTcF4Hv1EQkWk VI8tpnQPNtMhlBWSlGj2VvNNDeFCLX9tPbCJNOcHnCIbWiyM/ZnCbLcNsTy+oiWJ RjXM5bXPcRFuNSqKYGD2/3uAxuv6aQcx0MxBZ2FzeIJbqOnGS9Zn6dMH2gxUQ1bd H+H8evI1GotINbuOBkQ2GFezxrHO9Q9wskqUY+xq3ga/4r/AwFfKHHY+ZS0VzUFt KcOIms8IoXOHsz2P7sYh/SfaTlZoz4HrKA6s8CmPN1ZfmwaBKyD1uFZhpij9VJYw cgx9pZdgKV8ENpmRNtJZmKzsZ/Am6KJz5Jt/7ntT3H8SWG/YSTYvLHdo5gIEG2Pw W+EY1qi8WqAQcOQ52HJ4CNiX+c6IWZT+cB0jeFsV0PFMn/77sItU/Dc3mGM45Nbl Ebe7Hw2KVZDKsFBfEdEXthlKTq02nYmDz3ZSfZi962MnpQu9XF5g9AlscwFZyJ9f hsf2YJ2/ipdN366kVAuG2BJrrBDGm1VuBGvhTrfq1ZqNUS19nQ8= =NxIg -----END PGP SIGNATURE----- Markus Elfring (1): Usage of augmented assignment statements Oleg Broytman (23): Prepare for the next release Build(release): Skip exiting files at PyPI CI: Require pip < 19.1 for Python 2.7 and 3.4 Tests: Remove devscripts/run-*; we have been using tox Build(devscripts): Run the scripts directly from devscripts/ subdir Build(setup.py): Use `importlib` instead of deprecated `imp` for Python 3.4+ CI(travis): remove deprecated `sudo` keyword Feat(compat): Use imp for Python 2, importlib for Python 3 Build(setup): Use exec[file] to get version from __version__.py Style(setup): Fix flake8 F821 undefined name `execfile` under Python 3 Docs,tests: Limit Sphinx and pytest versions for Python 2.7 and 3.4 CI: Remove branch limitations Tests(tox): Use easy_install to install mxDateTime Tests: Fix DeprecationWarning from pytest.raises(..., "code") Refactor(compat.py): Rename `stuff` to `description` CI: At Travis run tests with oursql driver updated for Python 3.7 Fix(pgconnection): Adapt Postgres exception handling to `psycopg2` 2.8 Merge pull request #150 from elfring/use_augmented_assignments_2 Build(devscripts): Remove docs/_build/html on branch change Docs(Authors): Add Markus Elfring Feat: Remove RdbhostConnection Docs(API): Regenerate API docs Release 3.7.2 ----------------------------------------------------------------------- hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-05-01 16:06:43
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, pyodbc-test has been created at c0f546208bbf28ded39b2ca4b6d88fefb506338c (commit) - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/c0f546208bbf28ded39b2ca4b6d88fefb506338c commit c0f546208bbf28ded39b2ca4b6d88fefb506338c Author: Oleg Broytman <ph...@ph...> Date: Sat Feb 17 23:53:32 2018 +0300 CI: Run only 1 MSSQL ODBC test at AppVeyor diff --git a/appveyor.yml b/appveyor.yml index 1378351..6e6e949 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ version: '{branch}-{build}' # Other branches can allow themselves. branches: only: - - master + - pyodbc-test skip_branch_with_pr: false skip_tags: true @@ -17,15 +17,7 @@ cache: # Match travis clone_depth: 50 -services: - - mysql - - postgresql - environment: - MYSQL_PWD: "Password12!" - PGUSER: "postgres" - PGPASSWORD: "Password12!" - global: # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # /E:ON and /V:ON options are not enabled in the batch script intepreter @@ -38,130 +30,6 @@ environment: PYTHON_VERSION: "2.7" PYTHON_HOME: "C:\\Python27" db: mssql2014 - - TOXENV: "py34-mssql-pyodbc-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.4" - PYTHON_HOME: "C:\\Python34-x64" - db: mssql2014 - - TOXENV: "py27-mysql-connector-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: mysql - - TOXENV: "py36-mysql-connector-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: mysql - - TOXENV: "py37-mysql-connector-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: mysql - - TOXENV: "py27-pymysql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: mysql - - TOXENV: "py36-pymysql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: mysql - - TOXENV: "py37-pymysql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: mysql - - TOXENV: "py27-postgres-psycopg-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: postgresql - - TOXENV: "py36-postgres-psycopg-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-psycopg-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27-x64" - db: postgresql - - TOXENV: "py36-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py36-pypostgresql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36" - db: postgresql - - TOXENV: "py37-pypostgresql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37" - db: postgresql - - TOXENV: "py36-pypostgresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-pypostgresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-postgres-pg8000-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: postgresql - - TOXENV: "py36-postgres-pg8000-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-pg8000-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-sqlite-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - - TOXENV: "py36-sqlite-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - - TOXENV: "py37-sqlite-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - - TOXENV: "py27-sqlite-memory-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - - TOXENV: "py36-sqlite-memory-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - - TOXENV: "py37-sqlite-memory-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" matrix: fast_finish: true diff --git a/tox.ini b/tox.ini index 0af7ecb..8169fd8 100644 --- a/tox.ini +++ b/tox.ini @@ -445,7 +445,7 @@ commands = {envpython} -c "import pyodbc; print(pyodbc.drivers())" -sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test" - pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1" + pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1" tests/test_transactions.py sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" [testenv:py27-mssql-pyodbc-w32] http://sourceforge.net/p/sqlobject/sqlobject/ci/e11cfcbc765e6af4295f68ccb96d24c4f7635b5c commit e11cfcbc765e6af4295f68ccb96d24c4f7635b5c Author: Oleg Broytman <ph...@ph...> Date: Sat Feb 17 23:50:55 2018 +0300 CI: Run MSSQL ODBC tests again This reverts commit 6b80a2d7bc86f07314fbe666abbed49b777056e2. diff --git a/appveyor.yml b/appveyor.yml index 8530db4..1378351 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,16 @@ environment: CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd" matrix: + - TOXENV: "py27-mssql-pyodbc-w32" + PYTHON_ARCH: "32" + PYTHON_VERSION: "2.7" + PYTHON_HOME: "C:\\Python27" + db: mssql2014 + - TOXENV: "py34-mssql-pyodbc-w32" + PYTHON_ARCH: "64" + PYTHON_VERSION: "3.4" + PYTHON_HOME: "C:\\Python34-x64" + db: mssql2014 - TOXENV: "py27-mysql-connector-w32" PYTHON_ARCH: "32" PYTHON_VERSION: "2.7" @@ -168,6 +178,21 @@ install: # List ODBC drivers - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name + # Enable TCP for mssql + - ps: | + [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null + [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null + $serverName = $env:COMPUTERNAME + $instanceName = 'SQL2014' + $smo = 'Microsoft.SqlServer.Management.Smo.' + $wmi = new-object ($smo + 'Wmi.ManagedComputer') + $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']" + $Tcp = $wmi.GetSmoObject($uri) + $Tcp.IsEnabled = $true + $TCP.alter() + Set-Service SQLBrowser -StartupType Manual + Start-Service SQLBrowser + Start-Service "MSSQL`$$instanceName" # Not a C project, so no build step build: false ----------------------------------------------------------------------- hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-05-01 16:06:42
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, pymssql-test has been created at af41b34dd079e3c7dcd2e69188de209a0677e844 (commit) - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/af41b34dd079e3c7dcd2e69188de209a0677e844 commit af41b34dd079e3c7dcd2e69188de209a0677e844 Author: Oleg Broytman <ph...@ph...> Date: Sun Feb 11 21:25:30 2018 +0300 CI: Run only pymssql tests diff --git a/appveyor.yml b/appveyor.yml index 29bc9b3..ae682be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ version: '{branch}-{build}' # Other branches can allow themselves. branches: only: - - master + - pymssql-test skip_branch_with_pr: false skip_tags: true @@ -17,15 +17,7 @@ cache: # Match travis clone_depth: 50 -services: - - mysql - - postgresql - environment: - MYSQL_PWD: "Password12!" - PGUSER: "postgres" - PGPASSWORD: "Password12!" - global: # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # /E:ON and /V:ON options are not enabled in the batch script intepreter @@ -39,130 +31,6 @@ environment: PYTHON_VERSION: "2.7" PYTHON_HOME: "C:\\Python27" db: mssql2014 - - TOX_ENV: "py36-pymssql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: mssql2014 - - TOXENV: "py27-mysql-connector-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: mysql - - TOXENV: "py36-mysql-connector-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: mysql - - TOXENV: "py37-mysql-connector-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: mysql - - TOXENV: "py27-pymysql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: mysql - - TOXENV: "py36-pymysql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: mysql - - TOXENV: "py37-pymysql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: mysql - - TOXENV: "py27-postgres-psycopg-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: postgresql - - TOXENV: "py36-postgres-psycopg-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-psycopg-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27-x64" - db: postgresql - - TOXENV: "py36-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-pygresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py36-pypostgresql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36" - db: postgresql - - TOXENV: "py37-pypostgresql-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37" - db: postgresql - - TOXENV: "py36-pypostgresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-pypostgresql-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-postgres-pg8000-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - db: postgresql - - TOXENV: "py36-postgres-pg8000-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - db: postgresql - - TOXENV: "py37-postgres-pg8000-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - db: postgresql - - TOXENV: "py27-sqlite-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - - TOXENV: "py36-sqlite-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - - TOXENV: "py37-sqlite-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" - - TOXENV: "py27-sqlite-memory-w32" - PYTHON_ARCH: "32" - PYTHON_VERSION: "2.7" - PYTHON_HOME: "C:\\Python27" - - TOXENV: "py36-sqlite-memory-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.6" - PYTHON_HOME: "C:\\Python36-x64" - - TOXENV: "py37-sqlite-memory-w32" - PYTHON_ARCH: "64" - PYTHON_VERSION: "3.7" - PYTHON_HOME: "C:\\Python37-x64" matrix: fast_finish: true @@ -184,9 +52,6 @@ install: Set-Service SQLBrowser -StartupType Manual Start-Service SQLBrowser Start-Service "MSSQL`$$instanceName" - # List ODBC drivers - - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name - - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name # Ensure we use the right python version - "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin;C:\\Program Files\\PostgreSQL\\9.5\\bin;%PATH%" - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe" diff --git a/tox.ini b/tox.ini index 76c6dcd..046097e 100644 --- a/tox.ini +++ b/tox.ini @@ -446,7 +446,8 @@ commands = {[testenv]commands} -sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test" - pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&timeout=30&debug=1" + pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&timeout=30&debug=1" tests/test_transactions.py + # tests include/tests inheritance/tests versioning/test sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" [testenv:py27-pymssql-w32] http://sourceforge.net/p/sqlobject/sqlobject/ci/c2145ee1e7b26618ec4e8bef0009d6685d6813d4 commit c2145ee1e7b26618ec4e8bef0009d6685d6813d4 Author: Oleg Broytman <ph...@ph...> Date: Sun Feb 11 21:23:57 2018 +0300 CI: Run pymssql tests at AppVeyor again diff --git a/appveyor.yml b/appveyor.yml index 8530db4..29bc9b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,17 @@ environment: CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd" matrix: + # from https://www.appveyor.com/docs/installed-software/#python + - TOXENV: "py27-pymssql-w32" + PYTHON_ARCH: "32" + PYTHON_VERSION: "2.7" + PYTHON_HOME: "C:\\Python27" + db: mssql2014 + - TOX_ENV: "py36-pymssql-w32" + PYTHON_ARCH: "64" + PYTHON_VERSION: "3.6" + PYTHON_HOME: "C:\\Python36-x64" + db: mssql2014 - TOXENV: "py27-mysql-connector-w32" PYTHON_ARCH: "32" PYTHON_VERSION: "2.7" @@ -157,6 +168,25 @@ matrix: fast_finish: true install: + # Enable TCP for mssql + # (from appveyor documentation) + - ps: | + [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null + [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null + $serverName = $env:COMPUTERNAME + $instanceName = 'SQL2014' + $smo = 'Microsoft.SqlServer.Management.Smo.' + $wmi = new-object ($smo + 'Wmi.ManagedComputer') + $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']" + $Tcp = $wmi.GetSmoObject($uri) + $Tcp.IsEnabled = $true + $TCP.alter() + Set-Service SQLBrowser -StartupType Manual + Start-Service SQLBrowser + Start-Service "MSSQL`$$instanceName" + # List ODBC drivers + - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name + - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name # Ensure we use the right python version - "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin;C:\\Program Files\\PostgreSQL\\9.5\\bin;%PATH%" - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe" diff --git a/docs/News.rst b/docs/News.rst index 1b96883..ce6dd1c 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -104,6 +104,11 @@ Build * Use ``python_requires`` keyword in ``setup.py``. +CI +-- + +* Run pymssql tests at AppVeyor again. + SQLObject 3.5.0 =============== diff --git a/tox.ini b/tox.ini index 0af7ecb..76c6dcd 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,7 @@ deps = pypyodbc: pypyodbc firebird-fdb: fdb firebirdsql: firebirdsql + pymssql: pymssql passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB PGPASSWORD WINDIR # Don't fail or warn on uninstalled commands platform = linux @@ -439,6 +440,31 @@ commands = flake8 . # Windows testing +[pymssql-w32] +platform = win32 +commands = + {[testenv]commands} + -sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" + sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test" + pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&timeout=30&debug=1" + sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test" + +[testenv:py27-pymssql-w32] +platform = win32 +commands = {[pymssql-w32]commands} + +[testenv:py34-pymssql-w32] +platform = win32 +commands = {[pymssql-w32]commands} + +[testenv:py35-pymssql-w32] +platform = win32 +commands = {[pymssql-w32]commands} + +[testenv:py36-pymssql-w32] +platform = win32 +commands = {[pymssql-w32]commands} + [mssql-pyodbc-w32] platform = win32 commands = ----------------------------------------------------------------------- hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-05-01 16:06:41
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via dffe5e97678ecf0e5f9d71aa141026f34ce151cc (commit) via b2b8dcffb2123e1cdffd87602e8a533321db23e2 (commit) via c3f99e59301513e39f53b4e1b2b3c8c30e18ad78 (commit) from 113a4505fa59ef69672fc8c250fa7821151b41cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/dffe5e97678ecf0e5f9d71aa141026f34ce151cc commit dffe5e97678ecf0e5f9d71aa141026f34ce151cc Author: Oleg Broytman <ph...@ph...> Date: Wed May 1 18:50:47 2019 +0300 Release 3.7.2 diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst index 84b0dcb..6ab1d9a 100644 --- a/ANNOUNCE.rst +++ b/ANNOUNCE.rst @@ -1,28 +1,20 @@ Hello! -I'm pleased to announce version 3.8.0a1, the first alpha of the upcoming -release of branch 3.8 of SQLObject. - -I'm pleased to announce version 3.8.0a2, the second alpha of the upcoming -release of branch 3.8 of SQLObject. - -I'm pleased to announce version 3.8.0b1, the first beta of the upcoming -release of branch 3.8 of SQLObject. - -I'm pleased to announce version 3.8.0rc1, the first release candidate -of the upcoming release of branch 3.8 of SQLObject. - -I'm pleased to announce version 3.8.0, the first stable release of branch -3.8 of SQLObject. - -I'm pleased to announce version 3.8.1, the first bugfix release of branch -3.8 of SQLObject. +I'm pleased to announce version 3.7.2, the second bugfix release of branch +3.7 of SQLObject. What's new in SQLObject ======================= -Contributors for this release are +Minor features +-------------- + +* Adapt Postgres exception handling to ``psycopg2`` version ``2.8``: + in the recent ``psycopg2`` errors are in ``psycopg2.errors`` module. + +* Removed RdbhostConnection: David Keeney and rdbhost seem to be unavailable + since 2017. For a more complete list, please see the news: http://sqlobject.org/News.html @@ -54,7 +46,7 @@ Mailing list: https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss Download: -https://pypi.org/project/SQLObject/3.8.0a0.dev20190202/ +https://pypi.org/project/SQLObject/3.7.2 News and changes: http://sqlobject.org/News.html diff --git a/README.rst b/README.rst index 92962cf..5221338 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -SQLObject 3.8.0 +SQLObject 3.7.2 =============== Thanks for looking at SQLObject. SQLObject is an object-relational diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs index 746018a..bcb5c7c 100755 --- a/devscripts/build-all-docs +++ b/devscripts/build-all-docs @@ -10,7 +10,7 @@ cd "`dirname \"$0\"`" && PROG_DIR="`pwd`" && cd .. && -build_docs 3.7.1 && +build_docs 3.7.2 && build_docs master devel && rm -rf docs/html && diff --git a/docs/News.rst b/docs/News.rst index af4ce64..dce568e 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,8 +5,10 @@ News .. contents:: Contents: :backlinks: none -SQLObject (master) -================== +SQLObject 3.7.2 +=============== + +Released 1 May 2019. Minor features -------------- diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py index 6e6740f..52a8048 100644 --- a/sqlobject/__version__.py +++ b/sqlobject/__version__.py @@ -1,8 +1,8 @@ -version = '3.7.1' +version = '3.7.2' major = 3 minor = 7 -micro = 1 +micro = 2 release_level = 'final' serial = 0 version_info = (major, minor, micro, release_level, serial) http://sourceforge.net/p/sqlobject/sqlobject/ci/b2b8dcffb2123e1cdffd87602e8a533321db23e2 commit b2b8dcffb2123e1cdffd87602e8a533321db23e2 Author: Oleg Broytman <ph...@ph...> Date: Mon Apr 29 19:11:38 2019 +0300 Docs(API): Regenerate API docs [skip ci] diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst index ebc0ab5..1518f8d 100644 --- a/docs/api/sqlobject.boundattributes.rst +++ b/docs/api/sqlobject.boundattributes.rst @@ -1,5 +1,5 @@ -sqlobject\.boundattributes module -================================= +sqlobject.boundattributes module +================================ .. automodule:: sqlobject.boundattributes :members: diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst index 657e1e8..6c74d5b 100644 --- a/docs/api/sqlobject.cache.rst +++ b/docs/api/sqlobject.cache.rst @@ -1,5 +1,5 @@ -sqlobject\.cache module -======================= +sqlobject.cache module +====================== .. automodule:: sqlobject.cache :members: diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst index 80ed01a..0882491 100644 --- a/docs/api/sqlobject.classregistry.rst +++ b/docs/api/sqlobject.classregistry.rst @@ -1,5 +1,5 @@ -sqlobject\.classregistry module -=============================== +sqlobject.classregistry module +============================== .. automodule:: sqlobject.classregistry :members: diff --git a/docs/api/sqlobject.col.rst b/docs/api/sqlobject.col.rst index 4c649dc..5282fc2 100644 --- a/docs/api/sqlobject.col.rst +++ b/docs/api/sqlobject.col.rst @@ -1,5 +1,5 @@ -sqlobject\.col module -===================== +sqlobject.col module +==================== .. automodule:: sqlobject.col :members: diff --git a/docs/api/sqlobject.compat.rst b/docs/api/sqlobject.compat.rst index 4191c0c..cdb4f6d 100644 --- a/docs/api/sqlobject.compat.rst +++ b/docs/api/sqlobject.compat.rst @@ -1,5 +1,5 @@ -sqlobject\.compat module -======================== +sqlobject.compat module +======================= .. automodule:: sqlobject.compat :members: diff --git a/docs/api/sqlobject.conftest.rst b/docs/api/sqlobject.conftest.rst index e29d059..8e56428 100644 --- a/docs/api/sqlobject.conftest.rst +++ b/docs/api/sqlobject.conftest.rst @@ -1,5 +1,5 @@ -sqlobject\.conftest module -========================== +sqlobject.conftest module +========================= .. automodule:: sqlobject.conftest :members: diff --git a/docs/api/sqlobject.constraints.rst b/docs/api/sqlobject.constraints.rst index 88a736b..ad39272 100644 --- a/docs/api/sqlobject.constraints.rst +++ b/docs/api/sqlobject.constraints.rst @@ -1,5 +1,5 @@ -sqlobject\.constraints module -============================= +sqlobject.constraints module +============================ .. automodule:: sqlobject.constraints :members: diff --git a/docs/api/sqlobject.converters.rst b/docs/api/sqlobject.converters.rst index 38f7777..82b5cff 100644 --- a/docs/api/sqlobject.converters.rst +++ b/docs/api/sqlobject.converters.rst @@ -1,5 +1,5 @@ -sqlobject\.converters module -============================ +sqlobject.converters module +=========================== .. automodule:: sqlobject.converters :members: diff --git a/docs/api/sqlobject.dbconnection.rst b/docs/api/sqlobject.dbconnection.rst index 6ab39d1..6a6adc3 100644 --- a/docs/api/sqlobject.dbconnection.rst +++ b/docs/api/sqlobject.dbconnection.rst @@ -1,5 +1,5 @@ -sqlobject\.dbconnection module -============================== +sqlobject.dbconnection module +============================= .. automodule:: sqlobject.dbconnection :members: diff --git a/docs/api/sqlobject.dberrors.rst b/docs/api/sqlobject.dberrors.rst index e8be2db..3035746 100644 --- a/docs/api/sqlobject.dberrors.rst +++ b/docs/api/sqlobject.dberrors.rst @@ -1,5 +1,5 @@ -sqlobject\.dberrors module -========================== +sqlobject.dberrors module +========================= .. automodule:: sqlobject.dberrors :members: diff --git a/docs/api/sqlobject.declarative.rst b/docs/api/sqlobject.declarative.rst index f89a88b..9cc7e9b 100644 --- a/docs/api/sqlobject.declarative.rst +++ b/docs/api/sqlobject.declarative.rst @@ -1,5 +1,5 @@ -sqlobject\.declarative module -============================= +sqlobject.declarative module +============================ .. automodule:: sqlobject.declarative :members: diff --git a/docs/api/sqlobject.events.rst b/docs/api/sqlobject.events.rst index 18ddcc7..8c33239 100644 --- a/docs/api/sqlobject.events.rst +++ b/docs/api/sqlobject.events.rst @@ -1,5 +1,5 @@ -sqlobject\.events module -======================== +sqlobject.events module +======================= .. automodule:: sqlobject.events :members: diff --git a/docs/api/sqlobject.firebird.firebirdconnection.rst b/docs/api/sqlobject.firebird.firebirdconnection.rst index e517e98..6fdf26e 100644 --- a/docs/api/sqlobject.firebird.firebirdconnection.rst +++ b/docs/api/sqlobject.firebird.firebirdconnection.rst @@ -1,5 +1,5 @@ -sqlobject\.firebird\.firebirdconnection module -============================================== +sqlobject.firebird.firebirdconnection module +============================================ .. automodule:: sqlobject.firebird.firebirdconnection :members: diff --git a/docs/api/sqlobject.firebird.rst b/docs/api/sqlobject.firebird.rst index a1f5b0a..78cec9a 100644 --- a/docs/api/sqlobject.firebird.rst +++ b/docs/api/sqlobject.firebird.rst @@ -1,5 +1,5 @@ -sqlobject\.firebird package -=========================== +sqlobject.firebird package +========================== .. automodule:: sqlobject.firebird :members: diff --git a/docs/api/sqlobject.include.hashcol.rst b/docs/api/sqlobject.include.hashcol.rst index 7abe8d5..76396aa 100644 --- a/docs/api/sqlobject.include.hashcol.rst +++ b/docs/api/sqlobject.include.hashcol.rst @@ -1,5 +1,5 @@ -sqlobject\.include\.hashcol module -================================== +sqlobject.include.hashcol module +================================ .. automodule:: sqlobject.include.hashcol :members: diff --git a/docs/api/sqlobject.include.rst b/docs/api/sqlobject.include.rst index aebc9e4..62086bf 100644 --- a/docs/api/sqlobject.include.rst +++ b/docs/api/sqlobject.include.rst @@ -1,5 +1,5 @@ -sqlobject\.include package -========================== +sqlobject.include package +========================= .. automodule:: sqlobject.include :members: diff --git a/docs/api/sqlobject.include.tests.rst b/docs/api/sqlobject.include.tests.rst index 0bf1f13..e17b4de 100644 --- a/docs/api/sqlobject.include.tests.rst +++ b/docs/api/sqlobject.include.tests.rst @@ -1,5 +1,5 @@ -sqlobject\.include\.tests package -================================= +sqlobject.include.tests package +=============================== .. automodule:: sqlobject.include.tests :members: diff --git a/docs/api/sqlobject.include.tests.test_hashcol.rst b/docs/api/sqlobject.include.tests.test_hashcol.rst index 2ec9902..5289acd 100644 --- a/docs/api/sqlobject.include.tests.test_hashcol.rst +++ b/docs/api/sqlobject.include.tests.test_hashcol.rst @@ -1,8 +1,7 @@ -sqlobject\.include\.tests\.test\_hashcol module -=============================================== +sqlobject.include.tests.test\_hashcol module +============================================ .. automodule:: sqlobject.include.tests.test_hashcol :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.index.rst b/docs/api/sqlobject.index.rst index c2facd0..bc96433 100644 --- a/docs/api/sqlobject.index.rst +++ b/docs/api/sqlobject.index.rst @@ -1,5 +1,5 @@ -sqlobject\.index module -======================= +sqlobject.index module +====================== .. automodule:: sqlobject.index :members: diff --git a/docs/api/sqlobject.inheritance.iteration.rst b/docs/api/sqlobject.inheritance.iteration.rst index b631806..0e9538f 100644 --- a/docs/api/sqlobject.inheritance.iteration.rst +++ b/docs/api/sqlobject.inheritance.iteration.rst @@ -1,5 +1,5 @@ -sqlobject\.inheritance\.iteration module -======================================== +sqlobject.inheritance.iteration module +====================================== .. automodule:: sqlobject.inheritance.iteration :members: diff --git a/docs/api/sqlobject.inheritance.rst b/docs/api/sqlobject.inheritance.rst index 5d9dae4..7ab19a7 100644 --- a/docs/api/sqlobject.inheritance.rst +++ b/docs/api/sqlobject.inheritance.rst @@ -1,5 +1,5 @@ -sqlobject\.inheritance package -============================== +sqlobject.inheritance package +============================= .. automodule:: sqlobject.inheritance :members: diff --git a/docs/api/sqlobject.inheritance.tests.rst b/docs/api/sqlobject.inheritance.tests.rst index c29cbc4..994c85a 100644 --- a/docs/api/sqlobject.inheritance.tests.rst +++ b/docs/api/sqlobject.inheritance.tests.rst @@ -1,5 +1,5 @@ -sqlobject\.inheritance\.tests package -===================================== +sqlobject.inheritance.tests package +=================================== .. automodule:: sqlobject.inheritance.tests :members: diff --git a/docs/api/sqlobject.inheritance.tests.test_aggregates.rst b/docs/api/sqlobject.inheritance.tests.test_aggregates.rst index 15fa5af..58a2944 100644 --- a/docs/api/sqlobject.inheritance.tests.test_aggregates.rst +++ b/docs/api/sqlobject.inheritance.tests.test_aggregates.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_aggregates module -====================================================== +sqlobject.inheritance.tests.test\_aggregates module +=================================================== .. automodule:: sqlobject.inheritance.tests.test_aggregates :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.inheritance.tests.test_asdict.rst b/docs/api/sqlobject.inheritance.tests.test_asdict.rst index c24c511..6a33dce 100644 --- a/docs/api/sqlobject.inheritance.tests.test_asdict.rst +++ b/docs/api/sqlobject.inheritance.tests.test_asdict.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_asdict module -================================================== +sqlobject.inheritance.tests.test\_asdict module +=============================================== .. automodule:: sqlobject.inheritance.tests.test_asdict :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.inheritance.tests.test_deep_inheritance.rst b/docs/api/sqlobject.inheritance.tests.test_deep_inheritance.rst index eb1661d..5447d0b 100644 --- a/docs/api/sqlobject.inheritance.tests.test_deep_inheritance.rst +++ b/docs/api/sqlobject.inheritance.tests.test_deep_inheritance.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_deep\_inheritance module -============================================================= +sqlobject.inheritance.tests.test\_deep\_inheritance module +========================================================== .. automodule:: sqlobject.inheritance.tests.test_deep_inheritance :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst b/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst index 3504fe6..8b9b706 100644 --- a/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst +++ b/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_destroy\_cascade module -============================================================ +sqlobject.inheritance.tests.test\_destroy\_cascade module +========================================================= .. automodule:: sqlobject.inheritance.tests.test_destroy_cascade :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.inheritance.tests.test_foreignKey.rst b/docs/api/sqlobject.inheritance.tests.test_foreignKey.rst index b6e28aa..6805988 100644 --- a/docs/api/sqlobject.inheritance.tests.test_foreignKey.rst +++ b/docs/api/sqlobject.inheritance.tests.test_foreignKey.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_foreignKey module -====================================================== +sqlobject.inheritance.tests.test\_foreignKey module +=================================================== .. automodule:: sqlobject.inheritance.tests.test_foreignKey :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,columns diff --git a/docs/api/sqlobject.inheritance.tests.test_indexes.rst b/docs/api/sqlobject.inheritance.tests.test_indexes.rst index bb2e3f7..cda2016 100644 --- a/docs/api/sqlobject.inheritance.tests.test_indexes.rst +++ b/docs/api/sqlobject.inheritance.tests.test_indexes.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_indexes module -=================================================== +sqlobject.inheritance.tests.test\_indexes module +================================================ .. automodule:: sqlobject.inheritance.tests.test_indexes :members: :undoc-members: :show-inheritance: - :exclude-members: columnDefinitions,columnList,indexDefinitions diff --git a/docs/api/sqlobject.inheritance.tests.test_inheritance.rst b/docs/api/sqlobject.inheritance.tests.test_inheritance.rst index 0c186b0..7af4fc4 100644 --- a/docs/api/sqlobject.inheritance.tests.test_inheritance.rst +++ b/docs/api/sqlobject.inheritance.tests.test_inheritance.rst @@ -1,8 +1,7 @@ -sqlobject\.inheritance\.tests\.test\_inheritance module -======================================================= ... 2025 lines suppressed ... hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-04-22 17:52:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 113a4505fa59ef69672fc8c250fa7821151b41cc (commit) from bebfdf9512ca6cdf94a3724dc2625a2288246945 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/113a4505fa59ef69672fc8c250fa7821151b41cc commit 113a4505fa59ef69672fc8c250fa7821151b41cc Author: Oleg Broytman <ph...@ph...> Date: Mon Apr 22 20:51:30 2019 +0300 Docs(Authors): Add Markus Elfring [skip ci] diff --git a/docs/Authors.rst b/docs/Authors.rst index 92f936e..65834b4 100644 --- a/docs/Authors.rst +++ b/docs/Authors.rst @@ -37,6 +37,7 @@ Contributions have been made by: * Shailesh Mungikar <shailesh.mungikar at druva.com> * Michael S. Root <miker at tippett.com> * Scott Stahl <sstahl at onshift.com> +* Markus Elfring <elfring at users.sourceforge.net> * Oleg Broytman <ph...@ph...> .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10 ----------------------------------------------------------------------- Summary of changes: docs/Authors.rst | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-04-22 17:49:35
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via bebfdf9512ca6cdf94a3724dc2625a2288246945 (commit) via be3983eb4e636b5857db17371a86e7826a72a7f7 (commit) via 85bae29d1727980a682e9d59cd5254ded573add3 (commit) via 4325abbc7b9362f9edbf23fa08cafcf208c06bf9 (commit) from ed64be0ed032055b0a6613fe3051d83a74ded566 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/bebfdf9512ca6cdf94a3724dc2625a2288246945 commit bebfdf9512ca6cdf94a3724dc2625a2288246945 Author: Oleg Broytman <ph...@ph...> Date: Mon Apr 22 19:45:45 2019 +0300 Build(devscripts): Remove docs/_build/html on branch change [skip ci] diff --git a/devscripts/git-hooks/post-checkout b/devscripts/git-hooks/post-checkout index 2bd5be0..40f7bd7 100755 --- a/devscripts/git-hooks/post-checkout +++ b/devscripts/git-hooks/post-checkout @@ -13,7 +13,7 @@ if [ "$new_branch" = 1 ]; then for d in sqlobject/include/pydispatch sqlobject/include/tests; do if [ "`echo $d/*`" = "$d/*" ]; then rm -rf $d; fi done && - rm -rf docs/html + rm -rf docs/_build/html docs/html fi && python -m compileall -q -x '\.tox/.+' . && http://sourceforge.net/p/sqlobject/sqlobject/ci/be3983eb4e636b5857db17371a86e7826a72a7f7 commit be3983eb4e636b5857db17371a86e7826a72a7f7 Merge: 85bae29 4325abb Author: Oleg Broytman <ph...@ph...> Date: Mon Apr 22 20:43:47 2019 +0300 Merge pull request #150 from elfring/use_augmented_assignments_2 Use augmented assignment statements. Fix #148. http://sourceforge.net/p/sqlobject/sqlobject/ci/85bae29d1727980a682e9d59cd5254ded573add3 commit 85bae29d1727980a682e9d59cd5254ded573add3 Author: Oleg Broytman <ph...@ph...> Date: Mon Apr 22 19:35:38 2019 +0300 Fix(pgconnection): Adapt Postgres exception handling to `psycopg2` 2.8 In the recent `psycopg2` errors are in `psycopg2.errors` module. diff --git a/docs/News.rst b/docs/News.rst index 1b96883..dade2cb 100644 --- a/docs/News.rst +++ b/docs/News.rst @@ -5,8 +5,14 @@ News .. contents:: Contents: :backlinks: none -SQLObject 3.8.0 (master) -======================== +SQLObject (master) +================== + +Minor features +-------------- + +* Adapt Postgres exception handling to ``psycopg2`` version ``2.8``: + in the recent ``psycopg2`` errors are in ``psycopg2.errors`` module. SQLObject 3.7.1 =============== diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py index 8dd1db5..afe8133 100644 --- a/sqlobject/postgres/pgconnection.py +++ b/sqlobject/postgres/pgconnection.py @@ -11,7 +11,7 @@ from sqlobject.dbconnection import DBAPI class ErrorMessage(str): def __new__(cls, e, append_msg=''): obj = str.__new__(cls, e.args[0] + append_msg) - if e.__module__ == 'psycopg2': + if hasattr(e, 'pgcode'): # psycopg2 or psycopg2.errors obj.code = getattr(e, 'pgcode', None) obj.error = getattr(e, 'pgerror', None) else: http://sourceforge.net/p/sqlobject/sqlobject/ci/4325abbc7b9362f9edbf23fa08cafcf208c06bf9 commit 4325abbc7b9362f9edbf23fa08cafcf208c06bf9 Author: Markus Elfring <el...@us...> Date: Sun Apr 21 20:12:40 2019 +0200 Usage of augmented assignment statements Source code like “var = var + …” was specified at some places so far. Use augmented assignment statements instead because they are succinct and can be more efficient. https://docs.python.org/3/reference/simple_stmts.html#augmented-assignment-statements Signed-off-by: Markus Elfring <el...@us...> diff --git a/sqlobject/col.py b/sqlobject/col.py index 8119539..a22fb66 100644 --- a/sqlobject/col.py +++ b/sqlobject/col.py @@ -733,9 +733,9 @@ class SOIntCol(SOCol): if self.length and self.length >= 1: _ret = "%s(%d)" % (_ret, self.length) if self.unsigned: - _ret = _ret + " UNSIGNED" + _ret += " UNSIGNED" if self.zerofill: - _ret = _ret + " ZEROFILL" + _ret += " ZEROFILL" return _ret def _sqlType(self): @@ -1092,9 +1092,8 @@ class SOForeignKey(SOKeyCol): sql = ' '.join([fidName, self._maxdbType()]) tName = other.sqlmeta.table idName = self.refColumn or other.sqlmeta.idName - sql = sql + ',' + '\n' - sql = sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)' % (fidName, tName, - idName) + sql += ',\nFOREIGN KEY (%s) REFERENCES %s(%s)' % (fidName, tName, + idName) return sql def maxdbCreateReferenceConstraint(self): diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py index fbff457..8e09639 100644 --- a/sqlobject/dbconnection.py +++ b/sqlobject/dbconnection.py @@ -108,8 +108,8 @@ class DBConnection: auth = getattr(self, 'user', '') or '' if auth: if self.password: - auth = auth + ':' + self.password - auth = auth + '@' + auth += ':' + self.password + auth += '@' else: assert not getattr(self, 'password', None), ( 'URIs cannot express passwords without usernames') @@ -129,8 +129,8 @@ class DBConnection: if auth: auth = quote(auth) if self.password: - auth = auth + ':' + quote(self.password) - auth = auth + '@' + auth += ':' + quote(self.password) + auth += '@' else: assert not getattr(self, 'password', None), ( 'URIs cannot express passwords without usernames') diff --git a/sqlobject/joins.py b/sqlobject/joins.py index afb0f88..e2c835a 100644 --- a/sqlobject/joins.py +++ b/sqlobject/joins.py @@ -170,9 +170,9 @@ class SOMultipleJoin(SOJoin): if not self.joinMethodName: name = self.otherClassName[0].lower() + self.otherClassName[1:] if name.endswith('s'): - name = name + "es" + name += "es" else: - name = name + "s" + name += "s" self.joinMethodName = name if addRemoveName: self.addRemoveName = addRemoveName diff --git a/sqlobject/tests/test_select.py b/sqlobject/tests/test_select.py index 3a0055e..1267706 100644 --- a/sqlobject/tests/test_select.py +++ b/sqlobject/tests/test_select.py @@ -66,7 +66,7 @@ def test_04_indexed_ended_by_exception(): try: while 1: all[count] - count = count + 1 + count += 1 # Stop the test if it's gone on too long if count > len(names): break ----------------------------------------------------------------------- Summary of changes: devscripts/git-hooks/post-checkout | 2 +- docs/News.rst | 10 ++++++++-- sqlobject/col.py | 9 ++++----- sqlobject/dbconnection.py | 8 ++++---- sqlobject/joins.py | 4 ++-- sqlobject/postgres/pgconnection.py | 2 +- sqlobject/tests/test_select.py | 2 +- 7 files changed, 21 insertions(+), 16 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-04-02 04:12:07
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via ed64be0ed032055b0a6613fe3051d83a74ded566 (commit) from be130c38f1ea2f31965345a537157124b6875dca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/ed64be0ed032055b0a6613fe3051d83a74ded566 commit ed64be0ed032055b0a6613fe3051d83a74ded566 Author: Oleg Broytman <ph...@ph...> Date: Tue Apr 2 02:38:37 2019 +0300 CI: At Travis run tests with oursql driver updated for Python 3.7 diff --git a/.travis.yml b/.travis.yml index a262724..acd3e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,9 @@ matrix: env: TOXENV=py35-mysql-oursql3 - python: "3.6" env: TOXENV=py36-mysql-oursql3 + - python: "3.7" + dist: xenial + env: TOXENV=py37-mysql-oursql3 - python: "2.7" env: TOXENV=py27-pymysql - python: "3.4" ----------------------------------------------------------------------- Summary of changes: .travis.yml | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-03-02 18:39:40
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via be130c38f1ea2f31965345a537157124b6875dca (commit) from 570cf8d5a43d4a6aeacaa4f1ebb6e92f09d35fbb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/be130c38f1ea2f31965345a537157124b6875dca commit be130c38f1ea2f31965345a537157124b6875dca Author: Oleg Broytman <ph...@ph...> Date: Sat Mar 2 20:57:22 2019 +0300 Refactor(compat.py): Rename `stuff` to `description` diff --git a/sqlobject/compat.py b/sqlobject/compat.py index a5a379c..72d696f 100644 --- a/sqlobject/compat.py +++ b/sqlobject/compat.py @@ -35,10 +35,10 @@ if PY2: import imp def load_module_from_file(base_name, module_name, filename): - fp, pathname, stuff = imp.find_module( + fp, pathname, description = imp.find_module( base_name, [os.path.dirname(filename)]) try: - module = imp.load_module(module_name, fp, pathname, stuff) + module = imp.load_module(module_name, fp, pathname, description) finally: fp.close() return module ----------------------------------------------------------------------- Summary of changes: sqlobject/compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-02-26 22:00:56
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 570cf8d5a43d4a6aeacaa4f1ebb6e92f09d35fbb (commit) from dc3ff012c220b6ee44a0ede7b467de4c0f5167b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/570cf8d5a43d4a6aeacaa4f1ebb6e92f09d35fbb commit 570cf8d5a43d4a6aeacaa4f1ebb6e92f09d35fbb Author: Oleg Broytman <ph...@ph...> Date: Wed Feb 27 00:36:46 2019 +0300 Tests: Fix DeprecationWarning from pytest.raises(..., "code") diff --git a/sqlobject/tests/test_select.py b/sqlobject/tests/test_select.py index 41ef0ef..3a0055e 100644 --- a/sqlobject/tests/test_select.py +++ b/sqlobject/tests/test_select.py @@ -108,10 +108,10 @@ def test_select_getOne(): assert IterTest.selectBy(name='a').getOne() == a assert IterTest.select(IterTest.q.name == 'b').getOne() == b assert IterTest.selectBy(name='c').getOne(None) is None - raises(SQLObjectNotFound, 'IterTest.selectBy(name="c").getOne()') + raises(SQLObjectNotFound, IterTest.selectBy(name="c").getOne) IterTest(name='b') - raises(SQLObjectIntegrityError, 'IterTest.selectBy(name="b").getOne()') - raises(SQLObjectIntegrityError, 'IterTest.selectBy(name="b").getOne(None)') + raises(SQLObjectIntegrityError, IterTest.selectBy(name="b").getOne) + raises(SQLObjectIntegrityError, IterTest.selectBy(name="b").getOne, None) def test_selectBy(): diff --git a/sqlobject/tests/test_select_through.py b/sqlobject/tests/test_select_through.py index b043a03..4852a34 100644 --- a/sqlobject/tests/test_select_through.py +++ b/sqlobject/tests/test_select_through.py @@ -40,7 +40,8 @@ def setup_module(mod): def testBadRef(): - pytest.raises(AttributeError, 'threes[0].throughTo.four') + with pytest.raises(AttributeError): + threes[0].throughTo.four def testThroughFK(): diff --git a/sqlobject/tests/test_transactions.py b/sqlobject/tests/test_transactions.py index b9ac500..56ce7f8 100644 --- a/sqlobject/tests/test_transactions.py +++ b/sqlobject/tests/test_transactions.py @@ -109,8 +109,9 @@ def test_transaction_delete(close=False): bOutID = bOutInst.id # noqa: bOutID is used in the string code below trans.commit(close=close) assert bOut.count() == 0 - raises(SQLObjectNotFound, "SOTestSOTrans.get(bOutID)") - raises(SQLObjectNotFound, "bOutInst.name") + raises(SQLObjectNotFound, SOTestSOTrans.get, bOutID) + with raises(SQLObjectNotFound): + bOutInst.name finally: trans.rollback() connection.autoCommit = True ----------------------------------------------------------------------- Summary of changes: sqlobject/tests/test_select.py | 6 +++--- sqlobject/tests/test_select_through.py | 3 ++- sqlobject/tests/test_transactions.py | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-02-25 20:01:44
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via dc3ff012c220b6ee44a0ede7b467de4c0f5167b8 (commit) via 8fd31c32bd420f19cf02e64088436d82e936aaab (commit) from f542e4e1ae3c047a124922ca90df755d50f907d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/dc3ff012c220b6ee44a0ede7b467de4c0f5167b8 commit dc3ff012c220b6ee44a0ede7b467de4c0f5167b8 Author: Oleg Broytman <ph...@ph...> Date: Mon Feb 25 22:54:38 2019 +0300 Tests(tox): Use easy_install to install mxDateTime Use `easy_install` to install `egenix-mx-base` eggs directly from downloads.egenix.com. diff --git a/tox.ini b/tox.ini index 0af7ecb..dc17448 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,6 @@ commands = {envpython} -c "import struct; print(struct.calcsize('P') * 8)" deps = -rdevscripts/requirements/requirements_tests.txt - py27: egenix-mx-base mysqldb: mysql-python mysqlclient: mysqlclient mysql-connector: mysql-connector <= 2.2.2 @@ -55,7 +54,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-mysqldb] -commands = {[mysqldb]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysqldb]commands} [mysqlclient] commands = @@ -86,7 +87,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-mysql-connector] -commands = {[mysql-connector]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-connector]commands} [testenv:py34-mysql-connector] commands = {[mysql-connector]commands} @@ -109,7 +112,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-mysql-oursql] -commands = {[oursql]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[oursql]commands} [testenv:py34-mysql-oursql3] commands = {[oursql]commands} @@ -132,7 +137,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-pymysql] -commands = {[pymysql]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pymysql]commands} [testenv:py34-pymysql] commands = {[pymysql]commands} @@ -156,7 +163,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-mysql-pyodbc] -commands = {[mysql-pyodbc]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-pyodbc]commands} [testenv:py34-mysql-pyodbc] commands = {[mysql-pyodbc]commands} @@ -179,7 +188,9 @@ commands = mysql -uroot -e 'drop database sqlobject_test;' [testenv:py27-mysql-pypyodbc] -commands = {[mysql-pypyodbc]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-pypyodbc]commands} [testenv:py34-mysql-pypyodbc] commands = {[mysql-pypyodbc]commands} @@ -203,7 +214,9 @@ commands = dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-psycopg] -commands = {[psycopg]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[psycopg]commands} [testenv:py34-postgres-psycopg] commands = {[psycopg]commands} @@ -226,7 +239,9 @@ commands = dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-pygresql] -commands = {[pygresql]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pygresql]commands} [testenv:py34-postgres-pygresql] commands = {[pygresql]commands} @@ -269,7 +284,9 @@ commands = dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-pg8000] -commands = {[pg8000]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pg8000]commands} [testenv:py34-postgres-pg8000] commands = {[pg8000]commands} @@ -293,7 +310,9 @@ commands = dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-pyodbc] -commands = {[postgres-pyodbc]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[postgres-pyodbc]commands} [testenv:py34-postgres-pyodbc] commands = {[postgres-pyodbc]commands} @@ -316,7 +335,9 @@ commands = dropdb -U postgres -w sqlobject_test [testenv:py27-postgres-pypyodbc] -commands = {[postgres-pypyodbc]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[postgres-pypyodbc]commands} [testenv:py34-postgres-pypyodbc] commands = {[postgres-pypyodbc]commands} @@ -340,7 +361,9 @@ commands = rm -f /tmp/sqlobject_test.sqdb [testenv:py27-sqlite] -commands = {[sqlite]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[sqlite]commands} [testenv:py34-sqlite] commands = {[sqlite]commands} @@ -360,7 +383,9 @@ commands = pytest --cov=sqlobject -D sqlite:/:memory:?debug=1 [testenv:py27-sqlite-memory] -commands = {[sqlite-memory]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[sqlite-memory]commands} [testenv:py34-sqlite-memory] commands = {[sqlite-memory]commands} @@ -384,7 +409,9 @@ commands = sudo rm -f /tmp/test.fdb [testenv:py27-firebird-fdb] -commands = {[fdb]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[fdb]commands} [testenv:py34-firebird-fdb] commands = {[fdb]commands} @@ -407,7 +434,9 @@ commands = sudo rm -f /tmp/test.fdb [testenv:py27-firebirdsql] -commands = {[firebirdsql]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[firebirdsql]commands} [testenv:py34-firebirdsql] commands = {[firebirdsql]commands} @@ -450,7 +479,9 @@ commands = [testenv:py27-mssql-pyodbc-w32] platform = win32 -commands = {[mssql-pyodbc-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mssql-pyodbc-w32]commands} [testenv:py34-mssql-pyodbc-w32] platform = win32 @@ -481,7 +512,9 @@ commands = [testenv:py27-mysql-connector-w32] platform = win32 -commands = {[mysql-connector-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-connector-w32]commands} [testenv:py34-mysql-connector-w32] platform = win32 @@ -512,7 +545,9 @@ commands = [testenv:py27-pymysql-w32] platform = win32 -commands = {[pymysql-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pymysql-w32]commands} [testenv:py34-pymysql-w32] platform = win32 @@ -544,7 +579,9 @@ commands = [testenv:py27-mysql-pyodbc-w32] platform = win32 -commands = {[mysql-pyodbc-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-pyodbc-w32]commands} [testenv:py34-mysql-pyodbc-w32] platform = win32 @@ -576,7 +613,9 @@ commands = [testenv:py27-mysql-pypyodbc-w32] platform = win32 -commands = {[mysql-pypyodbc-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[mysql-pypyodbc-w32]commands} [testenv:py34-mysql-pypyodbc-w32] platform = win32 @@ -607,7 +646,9 @@ commands = [testenv:py27-postgres-psycopg-w32] platform = win32 -commands = {[psycopg-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[psycopg-w32]commands} [testenv:py34-postgres-psycopg-w32] platform = win32 @@ -638,7 +679,9 @@ commands = [testenv:py27-postgres-pygresql-w32] platform = win32 -commands = {[pygresql-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pygresql-w32]commands} [testenv:py34-postgres-pygresql-w32] platform = win32 @@ -696,7 +739,9 @@ commands = [testenv:py27-postgres-pg8000-w32] platform = win32 -commands = {[pg8000-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[pg8000-w32]commands} [testenv:py34-postgres-pg8000-w32] platform = win32 @@ -728,7 +773,9 @@ commands = [testenv:py27-postgres-pyodbc-w32] platform = win32 -commands = {[postgres-pyodbc-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[postgres-pyodbc-w32]commands} [testenv:py34-postgres-pyodbc-w32] platform = win32 @@ -760,7 +807,9 @@ commands = [testenv:py27-postgres-pypyodbc-w32] platform = win32 -commands = {[postgres-pypyodbc-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[postgres-pypyodbc-w32]commands} [testenv:py34-postgres-pypyodbc-w32] platform = win32 @@ -788,7 +837,9 @@ commands = [testenv:py27-sqlite-w32] platform = win32 -commands = {[sqlite-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[sqlite-w32]commands} [testenv:py34-sqlite-w32] platform = win32 @@ -816,7 +867,9 @@ commands = [testenv:py27-sqlite-memory-w32] platform = win32 -commands = {[sqlite-memory-w32]commands} +commands = + easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base + {[sqlite-memory-w32]commands} [testenv:py34-sqlite-memory-w32] platform = win32 http://sourceforge.net/p/sqlobject/sqlobject/ci/8fd31c32bd420f19cf02e64088436d82e936aaab commit 8fd31c32bd420f19cf02e64088436d82e936aaab Author: Oleg Broytman <ph...@ph...> Date: Mon Feb 25 21:25:30 2019 +0300 CI: Remove branch limitations diff --git a/.travis.yml b/.travis.yml index 4f375a4..a262724 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,3 @@ -# Only test master and pull requests; skip tags. -# Other branches can allow themselves. -branches: - only: - - master - language: python python: diff --git a/appveyor.yml b/appveyor.yml index dc63324..953cc8a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,14 +3,6 @@ # and Michael Sverdlik's appveyor-utils (https://github.com/cloudify-cosmo/appveyor-utils) version: '{branch}-{build}' -# Only test master and pull requests; skip tags. -# Other branches can allow themselves. -branches: - only: - - master -skip_branch_with_pr: false -skip_tags: true - cache: - '%LOCALAPPDATA%\pip\Cache' ----------------------------------------------------------------------- Summary of changes: .travis.yml | 6 ---- appveyor.yml | 8 ----- tox.ini | 109 ++++++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 81 insertions(+), 42 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-02-25 17:19:10
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via f542e4e1ae3c047a124922ca90df755d50f907d1 (commit) from 46c236d21fad78824a6ff1505c188316e3247a6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/f542e4e1ae3c047a124922ca90df755d50f907d1 commit f542e4e1ae3c047a124922ca90df755d50f907d1 Author: Oleg Broytman <ph...@ph...> Date: Mon Feb 25 19:35:49 2019 +0300 Docs,tests: Limit Sphinx and pytest versions for Python 2.7 and 3.4 diff --git a/devscripts/requirements/requirements_docs.txt b/devscripts/requirements/requirements_docs.txt index 94d38eb..e36ba63 100644 --- a/devscripts/requirements/requirements_docs.txt +++ b/devscripts/requirements/requirements_docs.txt @@ -1,3 +1,4 @@ -r requirements.txt -Sphinx +Sphinx < 2.0; python_version == '2.7' or python_version == '3.4' +Sphinx; python_version >= '3.5' diff --git a/devscripts/requirements/requirements_tests.txt b/devscripts/requirements/requirements_tests.txt index ae7bbd9..9d64753 100644 --- a/devscripts/requirements/requirements_tests.txt +++ b/devscripts/requirements/requirements_tests.txt @@ -1,4 +1,5 @@ -r requirements.txt -pytest < 5.0 +pytest < 5.0; python_version == '2.7' or python_version == '3.4' +pytest; python_version >= '3.5' pytest-cov ----------------------------------------------------------------------- Summary of changes: devscripts/requirements/requirements_docs.txt | 3 ++- devscripts/requirements/requirements_tests.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-02-18 18:33:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 46c236d21fad78824a6ff1505c188316e3247a6b (commit) from 1ba34efb82000764682764a21a7becc2e86e8360 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/46c236d21fad78824a6ff1505c188316e3247a6b commit 46c236d21fad78824a6ff1505c188316e3247a6b Author: Oleg Broytman <ph...@ph...> Date: Mon Feb 18 21:31:34 2019 +0300 Style(setup): Fix flake8 F821 undefined name `execfile` under Python 3 diff --git a/setup.py b/setup.py index c31573b..9e5a954 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ versionpath = join(abspath(dirname(__file__)), 'sqlobject', '__version__.py') sqlobject_version = {} if sys.version_info[:2] == (2, 7): - execfile(versionpath, sqlobject_version) + execfile(versionpath, sqlobject_version) # noqa: F821 'execfile' Py3 elif sys.version_info >= (3, 4): exec(open(versionpath, 'rU').read(), sqlobject_version) ----------------------------------------------------------------------- Summary of changes: setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- SQLObject development repository |
From: Oleg B. <no...@so...> - 2019-02-18 18:10:05
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SQLObject development repository". The branch, master has been updated via 1ba34efb82000764682764a21a7becc2e86e8360 (commit) from 8cf109f4bc7084e6a177a4c4893c3cc90c4c8d95 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://sourceforge.net/p/sqlobject/sqlobject/ci/1ba34efb82000764682764a21a7becc2e86e8360 commit 1ba34efb82000764682764a21a7becc2e86e8360 Author: Oleg Broytman <ph...@ph...> Date: Mon Feb 18 21:06:56 2019 +0300 Build(setup): Use exec[file] to get version from __version__.py Use exec[file] instead of imp/importlib. diff --git a/setup.py b/setup.py index 8ef5c81..c31573b 100755 --- a/setup.py +++ b/setup.py @@ -4,25 +4,18 @@ from os.path import abspath, dirname, join from setuptools import setup import sys +versionpath = join(abspath(dirname(__file__)), 'sqlobject', '__version__.py') +sqlobject_version = {} + if sys.version_info[:2] == (2, 7): - from imp import load_source + execfile(versionpath, sqlobject_version) elif sys.version_info >= (3, 4): - from importlib.machinery import SourceFileLoader - import types - - def load_source(fullname, path): - loader = SourceFileLoader(fullname, path) - loaded = types.ModuleType(loader.name) - loader.exec_module(loaded) - return loaded + exec(open(versionpath, 'rU').read(), sqlobject_version) else: raise ImportError("SQLObject requires Python 2.7 or 3.4+") -versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py") -sqlobject_version = load_source("sqlobject_version", versionpath) - subpackages = ['firebird', 'include', 'include.tests', 'inheritance', 'inheritance.tests', 'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost', @@ -31,7 +24,7 @@ subpackages = ['firebird', 'include', 'include.tests', setup( name="SQLObject", - version=sqlobject_version.version, + version=sqlobject_version['version'], description="Object-Relational Manager, aka database wrapper", long_description="""\ SQLObject is a popular *Object Relational Manager* for providing an @@ -76,12 +69,12 @@ and `GitHub <https://github.com/sqlobject>`_. maintainer_email="ph...@ph...", url="http://sqlobject.org/", download_url="https://pypi.org/project/SQLObject/%s/" % - sqlobject_version.version, + sqlobject_version['version'], project_urls={ 'Homepage': 'http://sqlobject.org/', 'Development docs': 'http://sqlobject.org/devel/', 'Download': 'https://pypi.org/project/SQLObject/%s/' % - sqlobject_version.version, + sqlobject_version['version'], 'Github repo': 'https://github.com/sqlobject', 'Issue tracker': 'https://github.com/sqlobject/sqlobject/issues', 'SourceForge project': 'https://sourceforge.net/projects/sqlobject/', ----------------------------------------------------------------------- Summary of changes: setup.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) hooks/post-receive -- SQLObject development repository |