|
From: Oleg B. <no...@so...> - 2018-06-06 16:20:36
|
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 b1fd69522c0c18d79c572bdefcc384fa1a30525f (commit)
via a4bc6269f4515f7cd929e90ac73f4e7272e6c8fb (commit)
via 1ab0c67224f5bb1d20e8d4d3659494e638ea0dfc (commit)
via 5f8e6ecf48f314e7d990f69914542959ebf19010 (commit)
from fec1260acd46aaf9852b1f5bdf33da83aab7e9af (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/b1fd69522c0c18d79c572bdefcc384fa1a30525f
commit b1fd69522c0c18d79c572bdefcc384fa1a30525f
Author: Oleg Broytman <ph...@ph...>
Date: Wed Jun 6 19:08:52 2018 +0300
Release 3.7.0
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 781eee7..a81ce5e 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,28 +1,36 @@
Hello!
-I'm pleased to announce version 3.7.0a1, the first alpha of the upcoming
-release of branch 3.7 of SQLObject.
+I'm pleased to announce version 3.7.0, the first stable release of branch
+3.7 of SQLObject.
-I'm pleased to announce version 3.7.0a2, the second alpha of the upcoming
-release of branch 3.7 of SQLObject.
-I'm pleased to announce version 3.7.0b1, the first beta of the upcoming
-release of branch 3.7 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.7.0rc1, the first release candidate
-of the upcoming release of branch 3.7 of SQLObject.
+Contributors for this release are Scott Stahl and Christophe Popov.
-I'm pleased to announce version 3.7.0, the first stable release of branch
-3.7 of SQLObject.
+Features
+--------
-I'm pleased to announce version 3.7.0, the first bugfix release of branch
-3.7 of SQLObject.
+* Add signals on commit and rollback; pull request by Scott Stahl.
+Bug fixes
+---------
-What's new in SQLObject
-=======================
+* Fix SSL-related parameters for MySQL-connector (connector uses
+ a different param style). Bug reported by Christophe Popov.
+
+Drivers
+-------
+
+* Remove psycopg1. Driver ``psycopg`` is now just an alias for ``psycopg2``.
+
+Tests
+-----
+
+* Install psycopg2 from `psycopg2-binary`_ package.
-Contributors for this release are
+.. _`psycopg2-binary`: https://pypi.org/project/psycopg2-binary/
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -54,7 +62,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.org/project/SQLObject/3.7.0a0.dev20171115/
+https://pypi.org/project/SQLObject/3.7.0/
News and changes:
http://sqlobject.org/News.html
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 3eb17ed..233c068 100755
--- a/devscripts/build-all-docs
+++ b/devscripts/build-all-docs
@@ -11,7 +11,7 @@ cd "$PROG_DIR" &&
PROG_DIR="`pwd`" &&
cd "$PROG_DIR"/SQLObject &&
-build_docs 3.6.0 &&
+build_docs 3.7.0 &&
build_docs master devel &&
rm -rf docs/html &&
diff --git a/docs/News.rst b/docs/News.rst
index 51b3d0e..fe8965f 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,10 @@ News
.. contents:: Contents:
:backlinks: none
-SQLObject 3.7.0 (master)
-========================
+SQLObject 3.7.0
+===============
+
+Released 6 June 2018.
Features
--------
diff --git a/setup.cfg b/setup.cfg
index 40ee4ca..121fe8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,11 +4,6 @@ universal = 1
[easy_install]
optimize = 2
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
[flake8]
exclude = .git,.tox,docs/europython/*.py
# E305: expected 2 blank lines after class or function definition, found 1
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index cd24270..ba9bc27 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -3,6 +3,6 @@ version = '3.7.0'
major = 3
minor = 7
micro = 0
-release_level = 'dev'
+release_level = 'final'
serial = 0
version_info = (major, minor, micro, release_level, serial)
http://sourceforge.net/p/sqlobject/sqlobject/ci/a4bc6269f4515f7cd929e90ac73f4e7272e6c8fb
commit a4bc6269f4515f7cd929e90ac73f4e7272e6c8fb
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jun 3 23:46:28 2018 +0300
Feat(tox): Install psycopg2 from psycopg2-binary package
diff --git a/docs/News.rst b/docs/News.rst
index 422882e..51b3d0e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -24,6 +24,13 @@ Drivers
* Remove psycopg1. Driver ``psycopg`` is now just an alias for ``psycopg2``.
+Tests
+-----
+
+* Install psycopg2 from `psycopg2-binary`_ package.
+
+.. _`psycopg2-binary`: https://pypi.org/project/psycopg2-binary/
+
SQLObject 3.6.0
===============
diff --git a/tox.ini b/tox.ini
index c902edb..5ca1e8b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ deps =
mysql-oursql: git+https://github.com/sqlobject/oursql.git@master#egg=oursql
mysql-oursql3: git+https://github.com/sqlobject/oursql.git@py3k#egg=oursql
pymysql: pymysql
- postgres-psycopg: psycopg2
+ postgres-psycopg: psycopg2-binary
postgres-pygresql: pygresql
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
http://sourceforge.net/p/sqlobject/sqlobject/ci/1ab0c67224f5bb1d20e8d4d3659494e638ea0dfc
commit 1ab0c67224f5bb1d20e8d4d3659494e638ea0dfc
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jun 3 23:43:44 2018 +0300
Feat(postgres): Remove psycopg1
diff --git a/docs/News.rst b/docs/News.rst
index 1705c76..422882e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -19,6 +19,11 @@ Bug fixes
* Fix SSL-related parameters for MySQL-connector (connector uses
a different param style). Bug reported by Christophe Popov.
+Drivers
+-------
+
+* Remove psycopg1. Driver ``psycopg`` is now just an alias for ``psycopg2``.
+
SQLObject 3.6.0
===============
diff --git a/docs/SQLObject.rst b/docs/SQLObject.rst
index dd96d07..46d820e 100644
--- a/docs/SQLObject.rst
+++ b/docs/SQLObject.rst
@@ -48,7 +48,7 @@ Requirements
Currently SQLObject supports MySQL_ via MySQLdb_ aka MySQL-python (called
mysqlclient_ for Python 3), `MySQL Connector`_, oursql_, PyMySQL_, PyODBC_
-and PyPyODBC_. For PostgreSQL_ psycopg2_ or psycopg1 are recommended;
+and PyPyODBC_. For PostgreSQL_ psycopg2_ is recommended;
PyGreSQL_, py-postgresql_ and pg8000_ are supported; SQLite_ has a
built-in driver or PySQLite_. Firebird_ is supported via fdb_ or
kinterbasdb_; pyfirebirdsql_ is supported but has problems. `MAX DB`_
@@ -1832,8 +1832,8 @@ PostgresConnection supports transactions and all other features.
The user can choose a DB API driver for PostgreSQL by using a ``driver``
parameter in DB URI or PostgresConnection that can be a comma-separated
-list of driver names. Possible drivers are: ``psycopg2``, psycopg1,
-``psycopg`` (tries psycopg2 and psycopg1), ``pygresql``, ``pypostgresql``,
+list of driver names. Possible drivers are: ``psycopg2``,
+``psycopg`` (alias for ``psycopg2``), ``pygresql``, ``pypostgresql``,
``pg8000``, ``pyodbc``, ``pypyodbc`` or ``odbc`` (try ``pyodbc`` and
``pypyodbc``). Default is ``psycopg``.
diff --git a/docs/download.rst b/docs/download.rst
index 4d87846..1d9e546 100644
--- a/docs/download.rst
+++ b/docs/download.rst
@@ -73,7 +73,7 @@ pyodbc pypyodbc odbc (synonym for pyodbc)
PostgreSQL
^^^^^^^^^^
-psycopg1 psycopg2 psycopg postgres postgresql (synonyms for psycopg2)
+psycopg2 psycopg postgres postgresql (synonyms for psycopg2)
pygresql pypostgresql py-postgresql pg8000
The rest
diff --git a/setup.py b/setup.py
index 77a9947..b0fb383 100755
--- a/setup.py
+++ b/setup.py
@@ -110,7 +110,6 @@ and `GitHub <https://github.com/sqlobject>`_.
'pyodbc': ['pyodbc'],
'pypyodbc': ['pypyodbc'],
# PostgreSQL
- 'psycopg1': ['psycopg1'],
'psycopg2': ['psycopg2'],
'psycopg': ['psycopg2'],
'postgres': ['psycopg2'],
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index b8a83c7..b567f99 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -38,18 +38,9 @@ class PostgresConnection(DBAPI):
if not driver:
continue
try:
- if driver == 'psycopg2':
+ if driver in ('psycopg', 'psycopg2'):
import psycopg2 as psycopg
self.module = psycopg
- elif driver == 'psycopg1':
- import psycopg
- self.module = psycopg
- elif driver == 'psycopg':
- try:
- import psycopg2 as psycopg
- except ImportError:
- import psycopg
- self.module = psycopg
elif driver == 'pygresql':
import pgdb
self.module = pgdb
@@ -74,7 +65,7 @@ class PostgresConnection(DBAPI):
else:
raise ValueError(
'Unknown PostgreSQL driver "%s", '
- 'expected psycopg, psycopg2, psycopg1, '
+ 'expected psycopg, psycopg2, '
'pygresql, pypostgresql, pg8000, '
'odbc, pyodbc or pypyodbc' % driver)
except ImportError:
http://sourceforge.net/p/sqlobject/sqlobject/ci/5f8e6ecf48f314e7d990f69914542959ebf19010
commit 5f8e6ecf48f314e7d990f69914542959ebf19010
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 1 05:04:01 2018 +0300
Fix(mysql): Fix SSL-related parameters for MySQL-connector
Fixes: #144.
diff --git a/docs/News.rst b/docs/News.rst
index 209ae25..1705c76 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -13,6 +13,12 @@ Features
* Add signals on commit and rollback; pull request by Scott Stahl.
+Bug fixes
+---------
+
+* Fix SSL-related parameters for MySQL-connector (connector uses
+ a different param style). Bug reported by Christophe Popov.
+
SQLObject 3.6.0
===============
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 51cbde4..310b21d 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -111,11 +111,16 @@ class MySQLConnection(DBAPI):
"client_flag", "local_infile"):
if key in kw:
self.kw[key] = int(kw.pop(key))
- for key in ("ssl_key", "ssl_cert", "ssl_ca", "ssl_capath"):
- if key in kw:
- if "ssl" not in self.kw:
- self.kw["ssl"] = {}
- self.kw["ssl"][key[4:]] = kw.pop(key)
+ if driver == 'connector':
+ for key in ("ssl_key", "ssl_cert", "ssl_ca", "ssl_capath"):
+ if key in kw:
+ self.kw[key] = kw.pop(key)
+ else:
+ for key in ("ssl_key", "ssl_cert", "ssl_ca", "ssl_capath"):
+ if key in kw:
+ if "ssl" not in self.kw:
+ self.kw["ssl"] = {}
+ self.kw["ssl"][key[4:]] = kw.pop(key)
if "charset" in kw:
self.dbEncoding = self.kw["charset"] = kw.pop("charset")
else:
-----------------------------------------------------------------------
Summary of changes:
ANNOUNCE.rst | 40 +++++++++++++++++++++++---------------
devscripts/build-all-docs | 2 +-
docs/News.rst | 24 +++++++++++++++++++++--
docs/SQLObject.rst | 6 +++---
docs/download.rst | 2 +-
setup.cfg | 5 -----
setup.py | 1 -
sqlobject/__version__.py | 2 +-
sqlobject/mysql/mysqlconnection.py | 15 +++++++++-----
sqlobject/postgres/pgconnection.py | 13 ++-----------
tox.ini | 2 +-
11 files changed, 65 insertions(+), 47 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
