|
From: Oleg B. <no...@so...> - 2021-02-27 14:19: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
discards 6f143c27b70eaf624e64272f2851e9e23cc06ee2 (commit)
via df7ad69dca4d25021b0f07f90aac075b38d20227 (commit)
via a95ac237f6c8289afa872c879622cb14cb7af995 (commit)
via cf99cde3cb2a828ee165e2b32dc886a0b881f17e (commit)
via 1551a039c36ae52b03076a7826b3fded29950245 (commit)
via 8bcaa3cc57c96d915549b8666548b4e0d5fabaa9 (commit)
via 3173e08bcd55284c5b914d7d59088c94ad83f7c7 (commit)
via aa8815be7576ca097233993d6387a34196570c1d (commit)
via 47307e617424d8a4bdcad350ca235a72396fd23f (commit)
via 99861557ab30dd842c4b0d22f0c995d7f29d1778 (commit)
via 00c4a089d8185576f4ebcf5eba94d96044f3b092 (commit)
via 28974d303f13f085113018651ad7f074d510937c (commit)
via 9e9724b152a4bbc359708906cf327af2d7fe2e51 (commit)
via 70355ffdaab154c93494c5ed2e32395a5bbd4737 (commit)
via 52740edf09bb92b5d57d1364411db4c6bdc8d4fc (commit)
via d724e34b67a89e3dfddf2b2d7914673170312e71 (commit)
via da5e27ffd5bd80acdba7459c276f5cd80c0e6162 (commit)
via a784248acfa8d1ba01b69553100fe20c4f0859ba (commit)
via 6f6f974c00bf095cb8120ca2df3ca6ef18d52a94 (commit)
via a2b0c6297dafc14a37503fb8c089e0cbc4d9e925 (commit)
via 78cf7a8465a224ee11dac455c6b8affe92fa016f (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (6f143c27b70eaf624e64272f2851e9e23cc06ee2)
\
N -- N -- N (df7ad69dca4d25021b0f07f90aac075b38d20227)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/df7ad69dca4d25021b0f07f90aac075b38d20227
commit df7ad69dca4d25021b0f07f90aac075b38d20227
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 27 17:04:44 2021 +0300
Build(devscripts): Fix `build-all-docs`: Set the current version
[skip ci]
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 1f21c9a..34aacd3 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.9.0 &&
+build_docs 3.9.1 &&
build_docs master devel &&
rm -rf docs/html &&
http://sourceforge.net/p/sqlobject/sqlobject/ci/a95ac237f6c8289afa872c879622cb14cb7af995
commit a95ac237f6c8289afa872c879622cb14cb7af995
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 27 17:00:20 2021 +0300
Build(devscripts): Update `RELEASE-CHECKLIST`
Reorder instructions: run `push-all` after `postrelease`.
[skip ci]
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
index 42f6b10..f47ec41 100644
--- a/devscripts/RELEASE-CHECKLIST
+++ b/devscripts/RELEASE-CHECKLIST
@@ -34,15 +34,15 @@
6. Move old releases at SourceForge to subdirectory OldFiles.
-7. Run devscripts/push-all in the development repository to push all
- branches and tags to the public repositories.
-
-8. Run devscripts/postrelease. The script restores ANNOUNCE.rst and
+7. Run devscripts/postrelease. The script restores ANNOUNCE.rst and
setup.cfg from the previous commit (HEAD~). It calls editor; update next
version, remove the list of contributors and the list of changes, edit
download URL in ANNOUNCE.rst. Edit README.rst and docs/News.rst - add
new version.
+8. Run devscripts/push-all in the development repository to push all
+ branches and tags to the public repositories.
+
9. Generate new docs using devscripts/build-all-docs. Upload docs using
devscripts/publish-docs.
http://sourceforge.net/p/sqlobject/sqlobject/ci/cf99cde3cb2a828ee165e2b32dc886a0b881f17e
commit cf99cde3cb2a828ee165e2b32dc886a0b881f17e
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 27 16:58:29 2021 +0300
Build(devscripts): Update `RELEASE-CHECKLIST`
Remove duplicate "commit and merge" instructions.
[skip ci]
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
index e85de5e..42f6b10 100644
--- a/devscripts/RELEASE-CHECKLIST
+++ b/devscripts/RELEASE-CHECKLIST
@@ -17,8 +17,7 @@
'dev' and date stamp).
If it's the first stable release of the branch - edit build-all-docs,
- advance stable branch. Commit. If it's not master - merge to all higher
- branches and master.
+ advance stable branch.
Commit. Verify.
http://sourceforge.net/p/sqlobject/sqlobject/ci/1551a039c36ae52b03076a7826b3fded29950245
commit 1551a039c36ae52b03076a7826b3fded29950245
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 27 16:49:36 2021 +0300
Build: Prepare for the next release
[skip ci]
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index fdee54b..5f6c2aa 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,37 +1,25 @@
Hello!
-I'm pleased to announce version 3.9.1, the first minor feature release
-of branch 3.9 of SQLObject.
+I'm pleased to announce version 3.9.2a1, the first alpha of the upcoming
+release of branch 3.9 of SQLObject.
+I'm pleased to announce version 3.9.2a2, the second alpha of the upcoming
+release of branch 3.9 of SQLObject.
-What's new in SQLObject
-=======================
-
-Drivers
--------
-
-* Adapt to the latest ``pg8000``.
-
-* Protect ``getuser()`` - it can raise ``ImportError`` on w32
- due to absent of ``pwd`` module.
+I'm pleased to announce version 3.9.2b1, the first beta of the upcoming
+release of branch 3.9 of SQLObject.
-Build
------
+I'm pleased to announce version 3.9.2rc1, the first release candidate
+of the upcoming release of branch 3.9 of SQLObject.
-* Change URLs for ``oursql`` in ``extras_require`` in ``setup.py``.
- Provide separate URLs for Python 2.7 and 3.4+.
+I'm pleased to announce version 3.9.2, the first bugfix release of branch
+3.9 of SQLObject.
-* Add ``mariadb`` in ``extras_require`` in ``setup.py``.
-CI
---
-
-* For tests with Python 3.4 run ``tox`` under Python 3.5.
-
-Tests
------
+What's new in SQLObject
+=======================
-* Refactor ``tox.ini``.
+Contributors for this release are
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -64,7 +52,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.org/project/SQLObject/3.9.1
+https://pypi.org/project/SQLObject/3.9.2a0.dev20210227/
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 80d6966..2152854 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.9.1
-===============
+SQLObject 3.9.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 06c9c8f..37935f3 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,6 +5,9 @@ News
.. contents:: Contents:
:backlinks: none
+SQLObject (master)
+==================
+
SQLObject 3.9.1
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/8bcaa3cc57c96d915549b8666548b4e0d5fabaa9
commit 8bcaa3cc57c96d915549b8666548b4e0d5fabaa9
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 27 16:40:16 2021 +0300
Release 3.9.1
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 7287250..fdee54b 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,25 +1,37 @@
Hello!
-I'm pleased to announce version 3.9.1a1, the first alpha of the upcoming
-release of branch 3.9 of SQLObject.
+I'm pleased to announce version 3.9.1, the first minor feature release
+of branch 3.9 of SQLObject.
-I'm pleased to announce version 3.9.1a2, the second alpha of the upcoming
-release of branch 3.9 of SQLObject.
-I'm pleased to announce version 3.9.1b1, the first beta of the upcoming
-release of branch 3.9 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.9.1rc1, the first release candidate
-of the upcoming release of branch 3.9 of SQLObject.
+Drivers
+-------
-I'm pleased to announce version 3.9.1, the first bugfix release of branch
-3.9 of SQLObject.
+* Adapt to the latest ``pg8000``.
+* Protect ``getuser()`` - it can raise ``ImportError`` on w32
+ due to absent of ``pwd`` module.
-What's new in SQLObject
-=======================
+Build
+-----
+
+* Change URLs for ``oursql`` in ``extras_require`` in ``setup.py``.
+ Provide separate URLs for Python 2.7 and 3.4+.
+
+* Add ``mariadb`` in ``extras_require`` in ``setup.py``.
+
+CI
+--
+
+* For tests with Python 3.4 run ``tox`` under Python 3.5.
+
+Tests
+-----
-Contributors for this release are
+* Refactor ``tox.ini``.
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -52,7 +64,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.org/project/SQLObject/3.9.1a0.dev20201215/
+https://pypi.org/project/SQLObject/3.9.1
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 2442b67..80d6966 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.9.1a0
-=================
+SQLObject 3.9.1
+===============
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 f190d96..06c9c8f 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,10 @@ News
.. contents:: Contents:
:backlinks: none
-SQLObject (master)
-==================
+SQLObject 3.9.1
+===============
+
+Released 2021 Feb 27.
Drivers
-------
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index f133a87..cb43f08 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
-version = '3.9.0'
+version = '3.9.1'
major = 3
minor = 9
-micro = 0
+micro = 1
release_level = 'final'
serial = 0
version_info = (major, minor, micro, release_level, serial)
http://sourceforge.net/p/sqlobject/sqlobject/ci/3173e08bcd55284c5b914d7d59088c94ad83f7c7
commit 3173e08bcd55284c5b914d7d59088c94ad83f7c7
Author: Oleg Broytman <ph...@ph...>
Date: Tue Feb 23 22:00:41 2021 +0300
Feat(PostgreSQL): Protect `getuser()`
It can raise `ImportError` on w32 due to absent of `pwd` module.
diff --git a/docs/News.rst b/docs/News.rst
index 234fca5..f190d96 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -13,6 +13,9 @@ Drivers
* Adapt to the latest ``pg8000``.
+* Protect ``getuser()`` - it can raise ``ImportError`` on w32
+ due to absent of ``pwd`` module.
+
Build
-----
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index 749ca57..722f3d4 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -35,6 +35,15 @@ class ErrorMessage(str):
return obj
+def _getuser():
+ # ``getuser()`` on w32 can raise ``ImportError``
+ # due to absent of ``pwd`` module.
+ try:
+ return getuser()
+ except ImportError:
+ return None
+
+
class PostgresConnection(DBAPI):
supportTransactions = True
@@ -174,7 +183,7 @@ class PostgresConnection(DBAPI):
dsn_dict["host"] = None
dsn_dict["unix_sock"] = host
if user is None:
- dsn_dict["user"] = getuser()
+ dsn_dict["user"] = _getuser()
self.dsn = dsn
self.driver = driver
self.unicodeCols = kw.pop('unicodeCols', False)
http://sourceforge.net/p/sqlobject/sqlobject/ci/aa8815be7576ca097233993d6387a34196570c1d
commit aa8815be7576ca097233993d6387a34196570c1d
Author: Oleg Broytman <ph...@ph...>
Date: Tue Feb 23 21:20:21 2021 +0300
Tests(tox.ini): Limit `pg8000` version for Python 2.7 and 3.4
Revert back to stock `pg8000`.
diff --git a/devscripts/requirements/requirements_pg8000.txt b/devscripts/requirements/requirements_pg8000.txt
new file mode 100644
index 0000000..06cd178
--- /dev/null
+++ b/devscripts/requirements/requirements_pg8000.txt
@@ -0,0 +1,3 @@
+pg8000 < 1.13; python_version == '2.7'
+pg8000 < 1.12.4; python_version == '3.4'
+pg8000; python_version >= '3.5'
diff --git a/devscripts/requirements/requirements_pygresql.txt b/devscripts/requirements/requirements_pygresql.txt
index ea4052c..5fbb351 100644
--- a/devscripts/requirements/requirements_pygresql.txt
+++ b/devscripts/requirements/requirements_pygresql.txt
@@ -1,2 +1,2 @@
-pygresql<5.2; python_version == '3.4'
+pygresql < 5.2; python_version == '3.4'
pygresql; python_version != '3.4'
diff --git a/setup.py b/setup.py
index 11a6cba..3dfd2ca 100755
--- a/setup.py
+++ b/setup.py
@@ -133,7 +133,9 @@ and `GitHub <https://github.com/sqlobject>`_.
'pygresql': ['pygresql'],
'pypostgresql': ['py-postgresql'],
'py-postgresql': ['py-postgresql'],
- 'pg8000': ['pg8000'],
+ 'pg8000:python_version=="2.7"': ['pg8000<1.13'],
+ 'pg8000:python_version=="3.4"': ['pg8000<1.12.4'],
+ 'pg8000:python_version>="3.5"': ['pg8000'],
#
'sapdb': ['sapdb'],
'sqlite': ['pysqlite'],
diff --git a/tox.ini b/tox.ini
index 95bfdbd..67765a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ deps =
postgres-psycopg: psycopg2-binary
pygresql: -rdevscripts/requirements/requirements_pygresql.txt
pypostgresql: git+https://github.com/sqlobject/py-postgresql.git@fix_w32#egg=py-postgresql
- postgres-pg8000: git+https://github.com/sqlobject/pg8000.git@getuser#egg=pg8000
+ pg8000: -rdevscripts/requirements/requirements_pg8000.txt
pyodbc: pyodbc
pypyodbc: pypyodbc
supersqlite: supersqlite
http://sourceforge.net/p/sqlobject/sqlobject/ci/47307e617424d8a4bdcad350ca235a72396fd23f
commit 47307e617424d8a4bdcad350ca235a72396fd23f
Author: Oleg Broytman <ph...@ph...>
Date: Tue Feb 23 21:12:58 2021 +0300
Feat(PostgreSQL): Adapt to the latest `pg8000`
diff --git a/docs/News.rst b/docs/News.rst
index 43d381c..234fca5 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,11 @@ News
SQLObject (master)
==================
+Drivers
+-------
+
+* Adapt to the latest ``pg8000``.
+
Build
-----
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index 85a5094..749ca57 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -10,13 +10,26 @@ from sqlobject.dbconnection import DBAPI
class ErrorMessage(str):
def __new__(cls, e, append_msg=''):
- obj = str.__new__(cls, e.args[0] + append_msg)
- if hasattr(e, 'pgcode'): # psycopg2 or psycopg2.errors
- obj.code = getattr(e, 'pgcode', None)
- obj.error = getattr(e, 'pgerror', None)
+ eargs0 = emessage = e.args[0]
+ if e.__module__.startswith('pg8000') \
+ and isinstance(e.args, tuple) and len(e.args) > 1:
+ # pg8000 =~ 1.12 for Python 3.4
+ ecode = e.args[2]
+ eerror = emessage = e.args[3]
+ elif e.__module__.startswith('pg8000') and isinstance(eargs0, dict):
+ # pg8000 =~ 1.13 for Python 2.7
... 1629 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
