[SQL-CVS] SQLObject development repository branch master updated. 3.2.0-17-gca89f87

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  ca89f873c3137c2f47e18fbb435ee0c4af3a3a4a (commit)
       via  801dae53ba83aa313b281a1aa5782f84433b79e1 (commit)
       via  0faf96630e54a95b43e5829ac5ab5251136a0975 (commit)
       via  8d714e82c7fb3618c2a960ef417d799e07932170 (commit)
       via  093945bac78e061b5daf58a6dc544597f10b2c53 (commit)
      from  6c87d84438b7259af7e8348a16c3831df8abedb7 (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/ca89f873c3137c2f47e18fbb435ee0c4af3a3a4a

commit ca89f873c3137c2f47e18fbb435ee0c4af3a3a4a
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 25 23:23:35 2017 +0300

    Run MySQL tests at AppVeyor with Python 3.5 and 3.6

diff --git a/appveyor.yml b/appveyor.yml
index ae8b89a..5966552 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,6 +29,12 @@ environment:
     - PYTHON: "C:\\Python34"
       db: mysql
       TOX_ENV: "py34-mysql-connector-w32"
+    - PYTHON: "C:\\Python35"
+      db: mysql
+      TOX_ENV: "py35-mysql-connector-w32"
+    - PYTHON: "C:\\Python36"
+      db: mysql
+      TOX_ENV: "py36-mysql-connector-w32"
     - PYTHON: "C:\\Python27"
       db: postgresql
       TOX_ENV: "py27-postgres-psycopg-w32"
diff --git a/tox.ini b/tox.ini
index edf6e41..3d37e1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -300,7 +300,7 @@ commands = {[mssql-w32]commands}
 commands =
     -mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
     mysql -u root "-pPassword12!" -e 'create database sqlobject_test;'
-    pytest --cov=sqlobject -D "mysql://root:Password12!@localhost/sqlobject_test?driver=connector&debug=1"
+    pytest --cov=sqlobject -D "mysql://root:Password12!@localhost/sqlobject_test?driver=connector&charset=utf8&debug=1"
     mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
 
 [testenv:py27-mysql-connector-w32]

http://sourceforge.net/p/sqlobject/sqlobject/ci/801dae53ba83aa313b281a1aa5782f84433b79e1

commit 801dae53ba83aa313b281a1aa5782f84433b79e1
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 25 22:48:12 2017 +0300

    Use mysql-connector version <= 2.2.2
    
    mysql-connector >= 2.2.3 requires Protobuf >= 2.6.0.

diff --git a/tox.ini b/tox.ini
index 58c9498..edf6e41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
     py{26,27}: egenix-mx-base
     mysqldb: mysql-python
     mysqlclient: mysqlclient
-    mysql-connector: mysql-connector
+    mysql-connector: mysql-connector <= 2.2.2
     mysql-oursql: oursql
     pymysql: pymysql
     postgres-psycopg: psycopg2

http://sourceforge.net/p/sqlobject/sqlobject/ci/0faf96630e54a95b43e5829ac5ab5251136a0975

commit 0faf96630e54a95b43e5829ac5ab5251136a0975
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 25 18:27:54 2017 +0300

    Disable microseconds at AppVeyor for MySQL

diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index cffb7d5..05ef526 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -1,3 +1,5 @@
+import os
+
 from sqlobject import col, dberrors
 from sqlobject.compat import PY2
 from sqlobject.dbconnection import DBAPI
@@ -411,6 +413,9 @@ class MySQLConnection(DBAPI):
     def can_use_microseconds(self):
         if self._can_use_microseconds is not None:
             return self._can_use_microseconds
+        if os.environ.get('APPVEYOR'):
+            self._can_use_microseconds = False
+            return False
         server_version = self.server_version()
         if server_version is None:
             return None
diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index 9102d99..8ddcaa3 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -120,7 +120,11 @@ except Exception as e:
     if 'sphinx' not in sys.modules:
         print("Could not open database: %s" % e, file=sys.stderr)
 else:
-    if connection.dbName == 'firebird':
+    if (connection.dbName == 'firebird') \
+        or (
+            (connection.dbName == 'mysql') and
+            (os.environ.get('APPVEYOR'))
+    ):
         use_microseconds(False)
 
 
diff --git a/tox.ini b/tox.ini
index 38a8778..58c9498 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ deps =
     firebird-fdb: fdb
     firebirdsql: firebirdsql
     mssql: pymssql
-passenv = CI TRAVIS TRAVIS_* PGPASSWORD
+passenv = CI TRAVIS TRAVIS_* PGPASSWORD APPVEYOR
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     mysql

http://sourceforge.net/p/sqlobject/sqlobject/ci/8d714e82c7fb3618c2a960ef417d799e07932170

commit 8d714e82c7fb3618c2a960ef417d799e07932170
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 25 16:30:29 2017 +0300

    Refactor .travis.yml: move around some sections

diff --git a/.travis.yml b/.travis.yml
index d29b2ba..e7773d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,23 +18,6 @@ addons:
       - firebird2.5-super
   postgresql: "9.4"
 
-before_install:
-  # Start the firebird database server.
-  # We use firebird-super, so there's none of the inetd configuration
-  # required by firebird-classic.
-  # We also create a test user for the firebird test and
-  # create a script that can be fed into isql-fb
-  # to create the test database.
-  - if [[ $TOXENV = *firebird* ]]; then
-      sudo sed -i /etc/default/firebird2.5 -e 's/=no/=yes/' &&
-      sudo /etc/init.d/firebird2.5-super start && sleep 5 &&
-      sudo touch /var/lib/firebird/create_test_db &&
-      sudo chmod 666 /var/lib/firebird/create_test_db &&
-      echo "CREATE DATABASE 'localhost:/tmp/test.fdb';" > /var/lib/firebird/create_test_db &&
-      sudo chmod 644 /var/lib/firebird/create_test_db &&
-      sudo gsec -user sysdba -pass masterkey -add test -pw test;
-    fi
-
 env:
   - TOXENV=py26-mysqldb
   - TOXENV=py27-mysqldb
@@ -87,8 +70,6 @@ env:
   - TOXENV=py35-firebirdsql
   - TOXENV=py36-firebirdsql
 
-install: travis_retry pip install tox coveralls codecov
-
 matrix:
   allow_failures:
     - env: TOXENV=py26-postgres-pygresql
@@ -109,6 +90,25 @@ matrix:
     - env: TOXENV=py36-firebirdsql
   fast_finish: true
 
+before_install:
+  # Start the firebird database server.
+  # We use firebird-super, so there's none of the inetd configuration
+  # required by firebird-classic.
+  # We also create a test user for the firebird test and
+  # create a script that can be fed into isql-fb
+  # to create the test database.
+  - if [[ $TOXENV = *firebird* ]]; then
+      sudo sed -i /etc/default/firebird2.5 -e 's/=no/=yes/' &&
+      sudo /etc/init.d/firebird2.5-super start && sleep 5 &&
+      sudo touch /var/lib/firebird/create_test_db &&
+      sudo chmod 666 /var/lib/firebird/create_test_db &&
+      echo "CREATE DATABASE 'localhost:/tmp/test.fdb';" > /var/lib/firebird/create_test_db &&
+      sudo chmod 644 /var/lib/firebird/create_test_db &&
+      sudo gsec -user sysdba -pass masterkey -add test -pw test;
+    fi
+
+install: travis_retry pip install tox coveralls codecov
+
 script: tox -e ${TOXENV}
 
 after_success:

http://sourceforge.net/p/sqlobject/sqlobject/ci/093945bac78e061b5daf58a6dc544597f10b2c53

commit 093945bac78e061b5daf58a6dc544597f10b2c53
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 25 16:21:46 2017 +0300

    Run tests at Travis CI and AppVeyor with Python 3.6, x86 and x64

diff --git a/.travis.yml b/.travis.yml
index eca2470..d29b2ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: required
 
 language: python
 
+python:
+  - "3.6"
+
 cache: pip
 
 addons:
@@ -37,42 +40,52 @@ env:
   - TOXENV=py27-mysqldb
   - TOXENV=py34-mysqlclient
   - TOXENV=py35-mysqlclient
+  - TOXENV=py36-mysqlclient
   - TOXENV=py26-mysql-connector
   - TOXENV=py27-mysql-connector
   - TOXENV=py34-mysql-connector
   - TOXENV=py35-mysql-connector
+  - TOXENV=py36-mysql-connector
   - TOXENV=py26-mysql-oursql
   - TOXENV=py27-mysql-oursql
   - TOXENV=py26-pymysql
   - TOXENV=py27-pymysql
   - TOXENV=py34-pymysql
   - TOXENV=py35-pymysql
+  - TOXENV=py36-pymysql
   - TOXENV=py26-postgres-psycopg
   - TOXENV=py27-postgres-psycopg
   - TOXENV=py34-postgres-psycopg
   - TOXENV=py35-postgres-psycopg
+  - TOXENV=py36-postgres-psycopg
   - TOXENV=py26-postgres-pygresql
   - 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=py26-sqlite
   - TOXENV=py27-sqlite
   - TOXENV=py34-sqlite
   - TOXENV=py35-sqlite
+  - TOXENV=py36-sqlite
   - TOXENV=py26-sqlite-memory
   - 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
 
 install: travis_retry pip install tox coveralls codecov
 
@@ -82,14 +95,18 @@ matrix:
     - env: TOXENV=py27-postgres-pygresql
     - env: TOXENV=py34-postgres-pygresql
     - env: TOXENV=py35-postgres-pygresql
+    - env: TOXENV=py36-postgres-pygresql
     - env: TOXENV=py34-pypostgresql
     - env: TOXENV=py35-pypostgresql
+    - env: TOXENV=py36-pypostgresql
     - env: TOXENV=py27-firebird-fdb
     - env: TOXENV=py34-firebird-fdb
     - env: TOXENV=py35-firebird-fdb
+    - env: TOXENV=py36-firebird-fdb
     - env: TOXENV=py27-firebirdsql
     - env: TOXENV=py34-firebirdsql
     - env: TOXENV=py35-firebirdsql
+    - env: TOXENV=py36-firebirdsql
   fast_finish: true
 
 script: tox -e ${TOXENV}
diff --git a/appveyor.yml b/appveyor.yml
index c7ccf44..ae8b89a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,6 +47,12 @@ environment:
     - PYTHON: "C:\\Python35-x64"
       db: postgresql
       TOX_ENV: "py35-postgres-psycopg-w32"
+    - PYTHON: "C:\\Python36"
+      db: postgresql
+      TOX_ENV: "py36-postgres-psycopg-w32"
+    - PYTHON: "C:\\Python36-x64"
+      db: postgresql
+      TOX_ENV: "py36-postgres-psycopg-w32"
     - PYTHON: "C:\\Python27"
       TOX_ENV: "py27-sqlite-w32"
     - PYTHON: "C:\\Python27-x64"
@@ -59,6 +65,10 @@ environment:
       TOX_ENV: "py35-sqlite-w32"
     - PYTHON: "C:\\Python35-x64"
       TOX_ENV: "py35-sqlite-w32"
+    - PYTHON: "C:\\Python36"
+      TOX_ENV: "py36-sqlite-w32"
+    - PYTHON: "C:\\Python36-x64"
+      TOX_ENV: "py36-sqlite-w32"
     - PYTHON: "C:\\Python27"
       TOX_ENV: "py27-sqlite-memory-w32"
     - PYTHON: "C:\\Python27-x64"
@@ -71,6 +81,10 @@ environment:
       TOX_ENV: "py35-sqlite-memory-w32"
     - PYTHON: "C:\\Python35-x64"
       TOX_ENV: "py35-sqlite-memory-w32"
+    - PYTHON: "C:\\Python36"
+      TOX_ENV: "py36-sqlite-memory-w32"
+    - PYTHON: "C:\\Python36-x64"
+      TOX_ENV: "py36-sqlite-memory-w32"
 
 install:
   # Ensure we use the right python version
diff --git a/docs/News.rst b/docs/News.rst
index 57fa4c0..6123ae0 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -17,6 +17,11 @@ Minor features
   Some of thses scripts are version-dependent so it's better to have them
   in the main repo.
 
+Tests
+-----
+
+* Run tests at Travis CI and AppVeyor with Python 3.6, x86 and x64.
+
 SQLObject 3.2.0
 ===============
 
diff --git a/setup.py b/setup.py
index 031c43d..d4b4324 100755
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ and `GitHub <https://github.com/sqlobject>`_.
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
           "Topic :: Database",
           "Topic :: Database :: Front-Ends",
           "Topic :: Software Development :: Libraries :: Python Modules",
diff --git a/tox.ini b/tox.ini
index 3cd1677..38a8778 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35}-{mysqlclient,pypostgresql},py{26,27,34,35}-{mysql-connector,pymysql,postgres-psycopg,postgres-pygresql,sqlite,sqlite-memory},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,py{27,34,35}-{mssql,mysql-connector,postgres-psycopg,sqlite,sqlite-memory}-w32
+envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35,36}-{mysqlclient,pypostgresql},py{26,27,34,35,36}-{mysql-connector,pymysql,postgres-psycopg,postgres-pygresql,sqlite,sqlite-memory},py{27,34,35,36}-{firebird-fdb,firebirdsql},py{27,34}-flake8,py{27,34,35,36}-{mssql,mysql-connector,postgres-psycopg,sqlite,sqlite-memory}-w32
 
 # Base test environment settings
 [testenv]
@@ -10,7 +10,7 @@ deps =
     pytest
     pytest-cov
     py{26,27}: FormEncode >= 1.1.1, != 1.3.0
-    py{34,35}: FormEncode >= 1.3.1
+    py{34,35,36}: FormEncode >= 1.3.1
     PyDispatcher>=2.0.4
     py{26,27}: egenix-mx-base
     mysqldb: mysql-python
@@ -62,6 +62,9 @@ commands = {[mysqlclient]commands}
 [testenv:py35-mysqlclient]
 commands = {[mysqlclient]commands}
 
+[testenv:py36-mysqlclient]
+commands = {[mysqlclient]commands}
+
 [mysql-connector]
 commands =
     -mysql -e 'drop database sqlobject_test;'
@@ -81,6 +84,9 @@ commands = {[mysql-connector]commands}
 [testenv:py35-mysql-connector]
 commands = {[mysql-connector]commands}
 
+[testenv:py36-mysql-connector]
+commands = {[mysql-connector]commands}
+
 [oursql]
 commands =
     -mysql -e 'drop database sqlobject_test;'
@@ -113,6 +119,9 @@ commands = {[pymysql]commands}
 [testenv:py35-pymysql]
 commands = {[pymysql]commands}
 
+[testenv:py36-pymysql]
+commands = {[pymysql]commands}
+
 # PostgreSQL test environments
 [psycopg]
 commands =
@@ -133,6 +142,9 @@ commands = {[psycopg]commands}
 [testenv:py35-postgres-psycopg]
 commands = {[psycopg]commands}
 
+[testenv:py36-postgres-psycopg]
+commands = {[psycopg]commands}
+
 [pygresql]
 commands =
     -dropdb -U postgres -w sqlobject_test
@@ -152,6 +164,9 @@ commands = {[pygresql]commands}
 [testenv:py35-postgres-pygresql]
 commands = {[pygresql]commands}
 
+[testenv:py36-postgres-pygresql]
+commands = {[pygresql]commands}
+
 [pypostgresql]
 commands =
     -dropdb -U postgres -w sqlobject_test
@@ -165,6 +180,9 @@ commands = {[pypostgresql]commands}
 [testenv:py35-pypostgresql]
 commands = {[pypostgresql]commands}
 
+[testenv:py36-pypostgresql]
+commands = {[pypostgresql]commands}
+
 # SQLite test environments
 [sqlite]
 commands =
@@ -184,6 +202,9 @@ commands = {[sqlite]commands}
 [testenv:py35-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py36-sqlite]
+commands = {[sqlite]commands}
+
 [sqlite-memory]
 commands =
     pytest --cov=sqlobject -D sqlite:/:memory:?debug=1
@@ -200,6 +221,9 @@ commands = {[sqlite-memory]commands}
 [testenv:py35-sqlite-memory]
 commands = {[sqlite-memory]commands}
 
+[testenv:py36-sqlite-memory]
+commands = {[sqlite-memory]commands}
+
 # Firebird database test environments
 [fdb]
 commands =
@@ -217,6 +241,9 @@ commands = {[fdb]commands}
 [testenv:py35-firebird-fdb]
 commands = {[fdb]commands}
 
+[testenv:py36-firebird-fdb]
+commands = {[fdb]commands}
+
 [firebirdsql]
 commands =
     sudo rm -f /tmp/test.fdb
@@ -233,6 +260,9 @@ commands = {[firebirdsql]commands}
 [testenv:py35-firebirdsql]
 commands = {[firebirdsql]commands}
 
+[testenv:py36-firebirdsql]
+commands = {[firebirdsql]commands}
+
 # Special test environments
 [testenv:py27-flake8]
 changedir = ./
@@ -263,6 +293,9 @@ commands = {[mssql-w32]commands}
 [testenv:py35-mssql-w32]
 commands = {[mssql-w32]commands}
 
+[testenv:py36-mssql-w32]
+commands = {[mssql-w32]commands}
+
 [mysql-connector-w32]
 commands =
     -mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
@@ -279,6 +312,9 @@ commands = {[mysql-connector-w32]commands}
 [testenv:py35-mysql-connector-w32]
... 47 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository




[SQL-CVS] SQLObject development repository branch master updated. 3.2.0-17-gca89f87

SQLObject is a Python ORM.

[SQL-CVS] SQLObject development repository branch master updated. 3.2.0-17-gca89f87