|
From: Oleg B. <no...@so...> - 2017-01-03 19:07:12
|
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 5dd17da20cc4b264893bed3b21aab7da0bb1ebb2 (commit)
via 657191177616bc12a96295970458b1049541e96c (commit)
via ffb3e4c721d678ee618dbcc008a6008a3536dbd1 (commit)
via 09c0d9a37eebc4b1befd76abc0ff741c5115088c (commit)
via 707461ab20794ad12825311ac7448584d2c528ab (commit)
from 54fa5fcb29c035a7d074c21d154933c17743da2e (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/5dd17da20cc4b264893bed3b21aab7da0bb1ebb2
commit 5dd17da20cc4b264893bed3b21aab7da0bb1ebb2
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 3 22:02:04 2017 +0300
Drop Circle CI
[skip si]
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 4c9174e..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-dependencies:
- cache_directories:
- - ~/.cache/pip
- override:
- - sudo apt-get -qq update
- - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2 python3-psycopg2
- - pip install -U pip
- - pip install -U tox tox-pyenv
- - pyenv local 2.6.8 2.7.10 3.4.3 3.5.0
-
-test:
- override:
- - ?
- case $CIRCLE_NODE_INDEX in
- 0) tox -e '{py26,py27}-mysqldb,{py34,py35}-mysqlclient' ;;
- 1) tox -e '{py26,py27,py34,py35}-psycopg' ;;
- 2) tox -e '{py26,py27,py34,py35}-sqlite' ;;
- 3) tox -e '{py27,py34}-flake8' ;;
- esac
- :
- parallel: true
diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index e4dd096..ce89c86 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -257,18 +257,15 @@ forced to write the test. That's no fun for us, to just be writing
tests. So please, write tests; everything at least needs to be
exercised, even if the tests are absolutely complete.
-We now use Travis CI and Circle CI to run tests. See the statuses:
+We now use Travis CI to run tests. See the statuses:
.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
:target: https://travis-ci.org/sqlobject/sqlobject
-.. image:: https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
- :target: https://circleci.com/gh/sqlobject/sqlobject
-
To avoid triggering unnecessary test run at CI services add text `[skip ci]
<https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_ or
-`[ci skip] <https://circleci.com/docs/skip-a-build/>`_ anywhere in your commit
-messages for commits that don't change code (documentation updates and such).
+``[ci skip]`` anywhere in your commit messages for commits that don't change
+code (documentation updates and such).
We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
to measures code coverage by tests and upload the result for analyzis to
diff --git a/docs/News.rst b/docs/News.rst
index b1fd213..4c2dc9e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -78,7 +78,7 @@ Tests
* Tests are now run at CIs with ``python3.5``.
-* Tests are split at ``Circle CI`` in 4 parallel containers.
+* Drop ``Circle CI``.
SQLObject 3.1.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/657191177616bc12a96295970458b1049541e96c
commit 657191177616bc12a96295970458b1049541e96c
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 3 21:59:30 2017 +0300
There are major problems with pg8000 driver
[skip ci]
diff --git a/docs/News.rst b/docs/News.rst
index 58bbc27..b1fd213 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -52,7 +52,7 @@ Drivers (work in progress)
are still problems with the driver.
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver. There are still some problems.
+ PostgreSQL driver. There are major problems with the driver.
* Add support for `pyfirebirdsql
<https://pypi.python.org/pypi/firebirdsql>`_ (untested).
http://sourceforge.net/p/sqlobject/sqlobject/ci/ffb3e4c721d678ee618dbcc008a6008a3536dbd1
commit ffb3e4c721d678ee618dbcc008a6008a3536dbd1
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 3 20:56:15 2017 +0300
Set charset=utf8 for test DB URIs for oursql
diff --git a/tox.ini b/tox.ini
index 51c497d..ba72491 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,7 +75,7 @@ commands = {[mysql-connector]commands}
[oursql]
commands =
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=oursql
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=oursql&charset=utf8
mysql -e 'drop database sqlobject_test;'
[testenv:py26-oursql]
http://sourceforge.net/p/sqlobject/sqlobject/ci/09c0d9a37eebc4b1befd76abc0ff741c5115088c
commit 09c0d9a37eebc4b1befd76abc0ff741c5115088c
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 3 20:53:56 2017 +0300
MySQL: call set_character_set(dbEncoding) for all drivers
For oursql set charset property.
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 39b6417..c6fc133 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -121,7 +121,7 @@ class MySQLConnection(DBAPI):
def makeConnection(self):
dbEncoding = self.dbEncoding
if dbEncoding:
- if self.driver.lower() == 'mysqldb':
+ if self.driver.lower() in ('mysqldb', 'pymysql'):
from MySQLdb.connections import Connection
if not hasattr(Connection, 'set_character_set'):
# monkeypatch pre MySQLdb 1.2.1
@@ -145,10 +145,12 @@ class MySQLConnection(DBAPI):
self._setAutoCommit(conn, bool(self.autoCommit))
- if dbEncoding and self.driver.lower() == 'mysqldb':
- if hasattr(conn, 'set_character_set'): # MySQLdb 1.2.1 and later
+ if dbEncoding:
+ if hasattr(conn, 'set_character_set'):
conn.set_character_set(dbEncoding)
- else: # pre MySQLdb 1.2.1
+ elif self.driver == 'oursql':
+ conn.charset = dbEncoding
+ elif hasattr(conn, 'query'):
# works along with monkeypatching code above
conn.query("SET NAMES %s" % dbEncoding)
http://sourceforge.net/p/sqlobject/sqlobject/ci/707461ab20794ad12825311ac7448584d2c528ab
commit 707461ab20794ad12825311ac7448584d2c528ab
Author: Oleg Broytman <ph...@ph...>
Date: Tue Jan 3 20:47:37 2017 +0300
MySQL: use driver instead of module.__name__
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 149cd4c..39b6417 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -100,6 +100,7 @@ class MySQLConnection(DBAPI):
self.dbEncoding = self.kw["charset"] = kw.pop("charset")
else:
self.dbEncoding = None
+ self.driver = driver
global mysql_Bin
if not PY2 and mysql_Bin is None:
@@ -120,20 +121,20 @@ class MySQLConnection(DBAPI):
def makeConnection(self):
dbEncoding = self.dbEncoding
if dbEncoding:
- if self.module.__name__ == 'MySQLdb':
+ if self.driver.lower() == 'mysqldb':
from MySQLdb.connections import Connection
if not hasattr(Connection, 'set_character_set'):
# monkeypatch pre MySQLdb 1.2.1
def character_set_name(self):
return dbEncoding + '_' + dbEncoding
Connection.character_set_name = character_set_name
- if self.module.__name__ == 'mysql.connector':
+ if self.driver == 'connector':
self.kw['consume_results'] = True
try:
conn = self.module.connect(
host=self.host, port=self.port, db=self.db,
user=self.user, passwd=self.password, **self.kw)
- if self.module.__name__ != 'oursql':
+ if self.driver != 'oursql':
# Attempt to reconnect. This setting is persistent.
conn.ping(True)
except self.module.OperationalError as e:
@@ -144,7 +145,7 @@ class MySQLConnection(DBAPI):
self._setAutoCommit(conn, bool(self.autoCommit))
- if dbEncoding and self.module.__name__ == 'MySQLdb':
+ if dbEncoding and self.driver.lower() == 'mysqldb':
if hasattr(conn, 'set_character_set'): # MySQLdb 1.2.1 and later
conn.set_character_set(dbEncoding)
else: # pre MySQLdb 1.2.1
-----------------------------------------------------------------------
Summary of changes:
circle.yml | 21 ---------------------
docs/DeveloperGuide.rst | 9 +++------
docs/News.rst | 4 ++--
sqlobject/mysql/mysqlconnection.py | 15 +++++++++------
tox.ini | 2 +-
5 files changed, 15 insertions(+), 36 deletions(-)
delete mode 100644 circle.yml
hooks/post-receive
--
SQLObject development repository
|
