Fix(oursql): Extend support for Python 3

Use our fork.
sqlobject · Jan 13, 2018 · 37d19d1 · 37d19d1
1 parent a6cc22e
commit 37d19d1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git 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
@@ -8,6 +8,11 @@ News
 SQLObject 3.6.0 (master)
 ========================
 
+Drivers
+-------
+
+* Extend support for oursql and Python 3 (require our fork).
+
 Documentation
 -------------
 

diff --git 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
@@ -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
@@ -44,7 +44,7 @@
         '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
@@ -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}