|
From: Oleg B. <no...@so...> - 2018-01-13 21:12: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 branch, master has been updated
via e69b735685ee068ba7468adbdfe1d3051b5ecb1e (commit)
via a6cc22eb346a42a67142fb7a1b59b5fce51387fa (commit)
via f3fc349e34bfc6def689d94ed6e9c6327c93c845 (commit)
from 7ca3a7ed760aded7d5a159dfaaf74fd82c2e7e9f (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/e69b735685ee068ba7468adbdfe1d3051b5ecb1e
commit e69b735685ee068ba7468adbdfe1d3051b5ecb1e
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 22:43:43 2018 +0300
Fix(oursql): Extend support for Python 3
Use our fork.
diff --git a/.travis.yml b/.travis.yml
index 72148bb..4525649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,12 @@ matrix:
env: TOXENV=py36-mysql-connector
- python: "2.7"
env: TOXENV=py27-mysql-oursql
+ - python: "3.4"
+ env: TOXENV=py34-mysql-oursql3
+ - python: "3.5"
+ env: TOXENV=py35-mysql-oursql3
+ - python: "3.6"
+ env: TOXENV=py36-mysql-oursql3
- python: "2.7"
env: TOXENV=py27-pymysql
- python: "3.4"
@@ -120,6 +126,9 @@ matrix:
env: TOXENV=py36-firebirdsql
allow_failures:
+ - env: TOXENV=py34-mysql-oursql3
+ - env: TOXENV=py35-mysql-oursql3
+ - env: TOXENV=py36-mysql-oursql3
- env: TOXENV=py27-firebird-fdb
- env: TOXENV=py34-firebird-fdb
- env: TOXENV=py35-firebird-fdb
diff --git a/docs/News.rst b/docs/News.rst
index 5590434..9dc8125 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,12 @@ News
SQLObject 3.6.0 (master)
========================
+Drivers
+-------
+
+* Extend support for oursql and Python 3 (require our fork); there are
+ some unicode-related problems.
+
Documentation
-------------
diff --git a/docs/TODO.rst b/docs/TODO.rst
index 8e5b307..b226405 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -1,10 +1,10 @@
TODO
----
-* Restore oursql driver; use our fork.
-
* Fix test ordering problem with Postgres.
+* Fix unicode problems with oursql.
+
* Fix unicode problems with pyodbc at AppVeyor.
* Resolve timeout problems with MSSQL.
diff --git a/docs/download.rst b/docs/download.rst
index 6877d6a..a028998 100644
--- a/docs/download.rst
+++ b/docs/download.rst
@@ -63,7 +63,7 @@ MySQL
^^^^^
mysql (installs MySQL-python for Python 2.7 and mysqlclient for Python 3.4+)
-mysql-connector oursql (only for Python 2.7) pymysql
+mysql-connector oursql pymysql
ODBC
^^^^
diff --git a/setup.py b/setup.py
index 2adc4ab..20c3ff1 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ if is_setuptools:
'mysql:python_version=="2.7"': ['MySQL-python'],
'mysql:python_version>="3.4"': ['mysqlclient'],
'mysql-connector': ['mysql-connector'],
- 'oursql:python_version=="2.7"': ['oursql'],
+ 'oursql': ['oursql'],
'pymysql': ['pymysql'],
# ODBC
'odbc': ['pyodbc'],
diff --git a/tox.ini b/tox.ini
index 7044bc2..bf85a35 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,8 @@ deps =
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
- mysql-oursql: oursql
+ 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-pygresql: pygresql
@@ -103,6 +104,15 @@ commands =
[testenv:py27-mysql-oursql]
commands = {[oursql]commands}
+[testenv:py34-mysql-oursql3]
+commands = {[oursql]commands}
+
+[testenv:py35-mysql-oursql3]
+commands = {[oursql]commands}
+
+[testenv:py36-mysql-oursql3]
+commands = {[oursql]commands}
+
[pymysql]
commands =
{[testenv]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/a6cc22eb346a42a67142fb7a1b59b5fce51387fa
commit a6cc22eb346a42a67142fb7a1b59b5fce51387fa
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 22:22:48 2018 +0300
Tests(tox): Fix pypyodbc driver's name
diff --git a/tox.ini b/tox.ini
index 8fef624..7044bc2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -611,7 +611,7 @@ commands =
{envpython} -c "import pypyodbc; print(pypyodbc.drivers())"
-dropdb -U postgres -w sqlobject_test
createdb -U postgres -w sqlobject_test
- pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=odbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
+ 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]
http://sourceforge.net/p/sqlobject/sqlobject/ci/f3fc349e34bfc6def689d94ed6e9c6327c93c845
commit f3fc349e34bfc6def689d94ed6e9c6327c93c845
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 21:01:19 2018 +0300
Tests(tox): Shorten default list of environments
By default only run SQLite3 and flake8 tests.
diff --git a/devscripts/tox-select-envs b/devscripts/tox-select-envs
index 49cf3ab..34ff4b2 100755
--- a/devscripts/tox-select-envs
+++ b/devscripts/tox-select-envs
@@ -2,7 +2,7 @@
pattern="$1"
shift
-envs="`tox --listenvs | grep -F $pattern | sed 's/$/,/'`"
+envs="`tox --listenvs-all | grep -F $pattern | sed 's/$/,/'`"
if [ -n "$envs" ]; then
exec tox -e "$envs" "$@"
diff --git a/tox.ini b/tox.ini
index f25ba41..8fef624 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py27-{mysqldb,mysql-oursql},py{34,35,36}-{mysqlclient,pypostgresql},py{27,34,35,36}-{mysql-connector,pymysql,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg8000,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory},py{27,34,35,36}-{firebird-fdb,firebirdsql},py{27,34}-flake8,py{27,34,35,36}-{mssql-pyodbc,mysql-connector,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg800,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory}-w32,py{34,35,36}-pypostgresql-w32
+envlist = py{27,34,35,36}-sqlite{,-memory},py{27,34}-flake8
# Base test environment settings
[testenv]
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 9 +++++++++
devscripts/tox-select-envs | 2 +-
docs/News.rst | 6 ++++++
docs/TODO.rst | 4 ++--
docs/download.rst | 2 +-
setup.py | 2 +-
tox.ini | 16 +++++++++++++---
7 files changed, 33 insertions(+), 8 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
