|
From: Oleg B. <no...@so...> - 2017-10-03 23:02:51
|
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 8fb6fd7e3dbc0073665929f59fd4230c9af296f3 (commit)
via e3e522ec5fb30e4dde949828ba233bfe45144171 (commit)
via ec4889a8c1b02cddc90cd62b6ead36e87d4222b0 (commit)
via ea7d88912f90a2bfc23d444554c968bc8515e944 (commit)
via b06e2072ce95012ed04810ae951b08be19115aaa (commit)
via 81c84618c9342f1119e97e83cd046446a7de568c (commit)
via 4446696f44d1172ede047a11d89f94c8672c3e25 (commit)
via e6241109b11e9018ae801e02a7893b6f206c8fb1 (commit)
via 4ae096a649a465d08a1b65a2164a086bfafa95ad (commit)
from 4bf401075edc7addd6a89d1c10d1179c77a3325e (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/8fb6fd7e3dbc0073665929f59fd4230c9af296f3
commit 8fb6fd7e3dbc0073665929f59fd4230c9af296f3
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 3 23:00:30 2017 +0300
Tests(CI): Explicitly list python versions
diff --git a/.travis.yml b/.travis.yml
index 3b18a1c..60548f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ sudo: required
language: python
python:
- - "3.6"
+ - "2.7"
cache: pip
@@ -24,55 +24,101 @@ addons:
- firebird2.5-super
postgresql: "9.4"
-env:
- - TOXENV=py27-mysqldb
- - TOXENV=py34-mysqlclient
- - TOXENV=py35-mysqlclient
- - TOXENV=py36-mysqlclient
- - TOXENV=py27-mysql-connector
- - TOXENV=py34-mysql-connector
- - TOXENV=py35-mysql-connector
- - TOXENV=py36-mysql-connector
- - TOXENV=py27-mysql-oursql
- - TOXENV=py27-pymysql
- - TOXENV=py34-pymysql
- - TOXENV=py35-pymysql
- - TOXENV=py36-pymysql
- - TOXENV=py27-postgres-psycopg
- - TOXENV=py34-postgres-psycopg
- - TOXENV=py35-postgres-psycopg
- - TOXENV=py36-postgres-psycopg
- - TOXENV=py27-postgres-pygresql
- - TOXENV=py34-postgres-pygresql
- - TOXENV=py35-postgres-pygresql
- - TOXENV=py36-postgres-pygresql
- - TOXENV=py34-pypostgresql
- - TOXENV=py35-pypostgresql
- - TOXENV=py36-pypostgresql
- - TOXENV=py27-postgres-pg8000
- - TOXENV=py34-postgres-pg8000
- - TOXENV=py35-postgres-pg8000
- - TOXENV=py36-postgres-pg8000
- - TOXENV=py27-sqlite
- - TOXENV=py34-sqlite
- - TOXENV=py35-sqlite
- - TOXENV=py36-sqlite
- - TOXENV=py27-sqlite-memory
- - TOXENV=py34-sqlite-memory
- - TOXENV=py35-sqlite-memory
- - TOXENV=py36-sqlite-memory
- - TOXENV=py27-flake8
- - TOXENV=py34-flake8
- - TOXENV=py27-firebird-fdb
- - TOXENV=py34-firebird-fdb
- - TOXENV=py35-firebird-fdb
- - TOXENV=py36-firebird-fdb
- - TOXENV=py27-firebirdsql
- - TOXENV=py34-firebirdsql
- - TOXENV=py35-firebirdsql
- - TOXENV=py36-firebirdsql
-
matrix:
+ include:
+ - python: "2.7"
+ env: TOXENV=py27-mysqldb
+ - python: "3.4"
+ env: TOXENV=py34-mysqlclient
+ - python: "3.5"
+ env: TOXENV=py35-mysqlclient
+ - python: "3.6"
+ env: TOXENV=py36-mysqlclient
+ - python: "2.7"
+ env: TOXENV=py27-mysql-connector
+ - python: "3.4"
+ env: TOXENV=py34-mysql-connector
+ - python: "3.5"
+ env: TOXENV=py35-mysql-connector
+ - python: "3.6"
+ env: TOXENV=py36-mysql-connector
+ - python: "2.7"
+ env: TOXENV=py27-mysql-oursql
+ - 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: "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: "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.4"
+ env: TOXENV=py34-pypostgresql
+ - python: "3.5"
+ env: TOXENV=py35-pypostgresql
+ - python: "3.6"
+ env: TOXENV=py36-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: "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: "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: "2.7"
+ env: TOXENV=py27-flake8
+ - python: "3.4"
+ env: TOXENV=py34-flake8
+ - python: "2.7"
+ env: TOXENV=py27-firebird-fdb
+ - python: "3.4"
+ env: TOXENV=py34-firebird-fdb
+ - python: "3.5"
+ env: TOXENV=py35-firebird-fdb
+ - python: "3.6"
+ env: TOXENV=py36-firebird-fdb
+ - python: "2.7"
+ env: TOXENV=py27-firebirdsql
+ - python: "3.4"
+ env: TOXENV=py34-firebirdsql
+ - python: "3.5"
+ env: TOXENV=py35-firebirdsql
+ - python: "3.6"
+ env: TOXENV=py36-firebirdsql
+
allow_failures:
- env: TOXENV=py27-postgres-pg8000
- env: TOXENV=py27-firebird-fdb
@@ -83,6 +129,7 @@ matrix:
- env: TOXENV=py34-firebirdsql
- env: TOXENV=py35-firebirdsql
- env: TOXENV=py36-firebirdsql
+
fast_finish: true
before_install:
http://sourceforge.net/p/sqlobject/sqlobject/ci/e3e522ec5fb30e4dde949828ba233bfe45144171
commit e3e522ec5fb30e4dde949828ba233bfe45144171
Author: Shailesh Mungikar <sha...@dr...>
Date: Sat Sep 23 16:40:54 2017 +0530
Fix for #139: autoreconnect does not work with pymysql driver
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 893d397..31ffed8 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -22,7 +22,7 @@ I'm pleased to announce version 3.4.1, the first bugfix release of branch
What's new in SQLObject
=======================
-Contributor for this release is
+Contributor for this release is Shailesh Mungikar.
For a more complete list, please see the news:
http://sqlobject.org/News.html
diff --git a/docs/Authors.rst b/docs/Authors.rst
index cf35dfc..1d0a063 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -34,6 +34,7 @@ Contributions have been made by:
* Gregor Horvath <gh at gregor-horvath.com>
* Nathan Edwards <nje5 at georgetown.edu>
* Lutz Steinborn <l.steinborn at 4c-gmbh.de>
+* Shailesh Mungikar <shailesh.mungikar at druva.com>
* Oleg Broytman <ph...@ph...>
.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
diff --git a/docs/News.rst b/docs/News.rst
index 22094c4..a2e2b25 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -16,6 +16,8 @@ Drivers
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
PostgreSQL driver (from git). There is a minor problem with Python 2.7.
+* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
+
Tests
-----
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index eb56223..bcda054 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -206,6 +206,13 @@ class MySQLConnection(DBAPI):
# mysql-connector has autocommit as a property
conn.autocommit = auto
+ def _force_reconnect(self, conn):
+ if self.driver.lower() == 'pymysql':
+ conn.ping(True)
+ self._setAutoCommit(conn, bool(self.autoCommit))
+ if self.dbEncoding:
+ conn.query("SET NAMES %s" % self.dbEncoding)
+
def _executeRetry(self, conn, cursor, query):
if self.debug:
self.printDebug(conn, query, 'QueryR')
@@ -225,6 +232,8 @@ class MySQLConnection(DBAPI):
# reconnect flag must be set when making the connection to indicate
# that autoreconnecting is desired. In MySQLdb 1.2.2 or newer this is
# done by calling ping(True) on the connection.
+ # PyMySQL needs explicit reconnect
+ # each time we detect connection timeout.
for count in range(3):
try:
return cursor.execute(query)
@@ -235,6 +244,8 @@ class MySQLConnection(DBAPI):
raise dberrors.OperationalError(ErrorMessage(e))
if self.debug:
self.printDebug(conn, str(e), 'ERROR')
+ if self.driver.lower() == 'pymysql':
+ self._force_reconnect(conn)
else:
raise dberrors.OperationalError(ErrorMessage(e))
except self.module.IntegrityError as e:
http://sourceforge.net/p/sqlobject/sqlobject/ci/ec4889a8c1b02cddc90cd62b6ead36e87d4222b0
commit ec4889a8c1b02cddc90cd62b6ead36e87d4222b0
Author: Oleg Broytman <ph...@ph...>
Date: Wed Aug 23 09:46:12 2017 +0300
Tests(CI): Fix bugs in py-postgresql at AppVeyor
diff --git a/docs/News.rst b/docs/News.rst
index 863d4be..22094c4 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -21,6 +21,9 @@ Tests
* Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor.
+* Fixed bugs in py-postgresql at AppVeyor. SQLObject requires
+ the latest version of the driver from git.
+
SQLObject 3.4.0
===============
diff --git a/tox.ini b/tox.ini
index 7c5d0ee..51231c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ deps =
pymysql: pymysql
postgres-psycopg: psycopg2
postgres-pygresql: pygresql
- pypostgresql: py-postgresql
+ pypostgresql: git+https://github.com/sqlobject/py-postgresql.git@fix_w32#egg=pypostgresql
postgres-pg8000: git+https://github.com/mfenniak/pg8000.git#egg=pg8000
pyodbc: pyodbc
pypyodbc: pypyodbc
http://sourceforge.net/p/sqlobject/sqlobject/ci/ea7d88912f90a2bfc23d444554c968bc8515e944
commit ea7d88912f90a2bfc23d444554c968bc8515e944
Author: Oleg Broytman <ph...@ph...>
Date: Sat Aug 19 03:33:36 2017 +0300
Feat(setup): Add keywords and platforms
diff --git a/setup.py b/setup.py
index f9fe802..cba0bf3 100755
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,9 @@ and `GitHub <https://github.com/sqlobject>`_.
maintainer_email="ph...@ph...",
url="http://sqlobject.org/",
download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+ keywords=["sql", "orm", "object-relational mapper"],
license="LGPL",
+ platforms="Any",
packages=["sqlobject"] +
['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
http://sourceforge.net/p/sqlobject/sqlobject/ci/b06e2072ce95012ed04810ae951b08be19115aaa
commit b06e2072ce95012ed04810ae951b08be19115aaa
Author: Oleg Broytman <ph...@ph...>
Date: Fri Aug 18 22:59:16 2017 +0300
Tests(CI): Remove PyGreSQL tests with 32-bit Python
32-bit PyGreSQL requires 32-bit libraries for PostgreSQL,
but AppVeyor has only 64-bit Pg preinstalled.
diff --git a/appveyor.yml b/appveyor.yml
index 0b76195..12ae77d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -114,41 +114,21 @@ environment:
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- TOX_ENV: "py27-postgres-pygresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: postgresql
- - TOX_ENV: "py27-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- TOX_ENV: "py34-postgres-pygresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOX_ENV: "py34-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- TOX_ENV: "py35-postgres-pygresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOX_ENV: "py35-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
db: postgresql
- TOX_ENV: "py36-postgres-pygresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- - TOX_ENV: "py36-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
http://sourceforge.net/p/sqlobject/sqlobject/ci/81c84618c9342f1119e97e83cd046446a7de568c
commit 81c84618c9342f1119e97e83cd046446a7de568c
Author: Oleg Broytman <ph...@ph...>
Date: Fri Aug 18 22:59:16 2017 +0300
Tests(CI): Reorder env vars in appveyor.yml
Reorder environment variables in appveyor.yml to make them more visible
in the web interface.
diff --git a/appveyor.yml b/appveyor.yml
index 6573e06..0b76195 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,254 +33,254 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
- - PYTHON_HOME: "C:\\Python27"
- PYTHON_VERSION: "2.7"
+ - TOX_ENV: "py27-mssql-pyodbc-w32"
PYTHON_ARCH: "32"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27"
db: mssql2014
- TOX_ENV: "py27-mssql-pyodbc-w32"
- - PYTHON_HOME: "C:\\Python34-x64"
- PYTHON_VERSION: "3.4"
+ - TOX_ENV: "py34-mssql-pyodbc-w32"
PYTHON_ARCH: "64"
+ PYTHON_VERSION: "3.4"
+ PYTHON_HOME: "C:\\Python34-x64"
db: mssql2014
- TOX_ENV: "py34-mssql-pyodbc-w32"
- - PYTHON_HOME: "C:\\Python27"
- PYTHON_VERSION: "2.7"
+ - TOX_ENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27"
db: mysql
- TOX_ENV: "py27-mysql-connector-w32"
- - PYTHON_HOME: "C:\\Python34"
- PYTHON_VERSION: "3.4"
+ - TOX_ENV: "py34-mysql-connector-w32"
PYTHON_ARCH: "32"
+ PYTHON_VERSION: "3.4"
+ PYTHON_HOME: "C:\\Python34"
db: mysql
- TOX_ENV: "py34-mysql-connector-w32"
- - PYTHON_HOME: "C:\\Python35"
- PYTHON_VERSION: "3.5"
+ - TOX_ENV: "py35-mysql-connector-w32"
PYTHON_ARCH: "32"
+ PYTHON_VERSION: "3.5"
+ PYTHON_HOME: "C:\\Python35"
db: mysql
- TOX_ENV: "py35-mysql-connector-w32"
- - PYTHON_HOME: "C:\\Python36"
- PYTHON_VERSION: "3.6"
+ - TOX_ENV: "py36-mysql-connector-w32"
PYTHON_ARCH: "32"
+ PYTHON_VERSION: "3.6"
+ PYTHON_HOME: "C:\\Python36"
db: mysql
- TOX_ENV: "py36-mysql-connector-w32"
- - PYTHON_HOME: "C:\\Python27-x64"
- PYTHON_VERSION: "2.7"
+ - TOX_ENV: "py27-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27-x64"
db: mysql
- TOX_ENV: "py27-mysql-pyodbc-w32"
- - PYTHON_HOME: "C:\\Python34-x64"
- PYTHON_VERSION: "3.4"
+ - TOX_ENV: "py34-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
+ PYTHON_VERSION: "3.4"
+ PYTHON_HOME: "C:\\Python34-x64"
db: mysql
- TOX_ENV: "py34-mysql-pyodbc-w32"
- - PYTHON_HOME: "C:\\Python27"
- PYTHON_VERSION: "2.7"
+ - TOX_ENV: "py27-postgres-psycopg-w32"
PYTHON_ARCH: "32"
- db: postgresql
- TOX_ENV: "py27-postgres-psycopg-w32"
- - PYTHON_HOME: "C:\\Python27-x64"
PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27"
+ db: postgresql
+ - TOX_ENV: "py27-postgres-psycopg-w32"
PYTHON_ARCH: "64"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- TOX_ENV: "py27-postgres-psycopg-w32"
- - PYTHON_HOME: "C:\\Python34"
- PYTHON_VERSION: "3.4"
+ - TOX_ENV: "py34-postgres-psycopg-w32"
PYTHON_ARCH: "32"
- db: postgresql
... 897 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
