|
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
|
