|
From: Oleg B. <no...@so...> - 2017-01-13 23:47:23
|
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 a02ae6f0c4823d55b556e0d692ea48b3ceb537f8 (commit)
via 6795deff456d99be97533b2292cc051d410fb6be (commit)
via f7765c9d1d4e9c75ef8f44239b6df00bd62af5fe (commit)
via 3c3ff7fc1d49db18db27ad24ce91f1910f7f6248 (commit)
via 1e0411e48a6a99f33d0f4df287bcf6e60e3d1289 (commit)
via a526639480b5943f6397c925be144e6271b793d7 (commit)
via 270599a9da489846534e14a665c380ad96f24815 (commit)
from 105482c683f49316620c7ff64396192c8abb3942 (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/a02ae6f0c4823d55b556e0d692ea48b3ceb537f8
commit a02ae6f0c4823d55b556e0d692ea48b3ceb537f8
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 01:56:14 2017 +0300
Force debugging output in tests: append debug=1 to DB URIs
diff --git a/tox.ini b/tox.ini
index 7276e95..8ef632a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,7 @@ whitelist_externals =
commands =
-mysql -e 'drop database sqlobject_test;'
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=mysqldb
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=mysqldb&debug=1
mysql -e 'drop database sqlobject_test;'
[testenv:py26-mysqldb]
@@ -55,7 +55,7 @@ commands = {[mysqldb]commands}
commands =
-mysql -e 'drop database sqlobject_test;'
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=mysqldb&charset=utf8
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=mysqldb&charset=utf8&debug=1
mysql -e 'drop database sqlobject_test;'
[testenv:py34-mysqlclient]
@@ -68,7 +68,7 @@ commands = {[mysqlclient]commands}
commands =
-mysql -e 'drop database sqlobject_test;'
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=connector&charset=utf8
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=connector&charset=utf8&debug=1
mysql -e 'drop database sqlobject_test;'
[testenv:py26-mysql-connector]
@@ -87,7 +87,7 @@ commands = {[mysql-connector]commands}
commands =
-mysql -e 'drop database sqlobject_test;'
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=oursql&charset=utf8
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=oursql&charset=utf8&debug=1
mysql -e 'drop database sqlobject_test;'
[testenv:py26-mysql-oursql]
@@ -100,7 +100,7 @@ commands = {[oursql]commands}
commands =
-mysql -e 'drop database sqlobject_test;'
mysql -e 'create database sqlobject_test;'
- pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pymysql&charset=utf8
+ pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pymysql&charset=utf8&debug=1
mysql -e 'drop database sqlobject_test;'
[testenv:py26-pymysql]
@@ -120,7 +120,7 @@ commands = {[pymysql]commands}
commands =
-dropdb -U postgres sqlobject_test
createdb -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=psycopg&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=psycopg&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres sqlobject_test
[testenv:py26-postgres-psycopg]
@@ -139,7 +139,7 @@ commands = {[psycopg]commands}
commands =
-dropdb -U postgres sqlobject_test
createdb -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pygresql&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pygresql&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres sqlobject_test
[testenv:py26-postgres-pygresql]
@@ -158,7 +158,7 @@ commands = {[pygresql]commands}
commands =
-dropdb -U postgres sqlobject_test
createdb -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pypostgresql&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pypostgresql&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres sqlobject_test
[testenv:py34-pypostgresql]
@@ -171,7 +171,7 @@ commands = {[pypostgresql]commands}
commands =
-dropdb -U postgres sqlobject_test
createdb -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pg8000&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pg8000&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres sqlobject_test
[testenv:py26-postgres-pg8000]
@@ -190,7 +190,7 @@ commands = {[pg8000]commands}
[sqlite]
commands =
-rm /tmp/sqlobject_test.sqdb
- pytest --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+ pytest --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb?debug=1
rm /tmp/sqlobject_test.sqdb
[testenv:py26-sqlite]
@@ -210,7 +210,7 @@ commands = {[sqlite]commands}
commands =
sudo rm -f /tmp/test.fdb
isql-fb -u test -p test -i /var/lib/firebird/create_test_db
- pytest --cov=sqlobject -D 'firebird://test:test@localhost/tmp/test.fdb'
+ pytest --cov=sqlobject -D 'firebird://test:test@localhost/tmp/test.fdb?debug=1'
sudo rm /tmp/test.fdb
[testenv:py27-firebird-fdb]
@@ -226,7 +226,7 @@ commands = {[fdb]commands}
commands =
sudo rm -f /tmp/test.fdb
isql-fb -u test -p test -i /var/lib/firebird/create_test_db
- pytest --cov=sqlobject -D 'firebird://test:test@localhost:3050/tmp/test.fdb?driver=firebirdsql&charset=utf8'
+ pytest --cov=sqlobject -D 'firebird://test:test@localhost:3050/tmp/test.fdb?driver=firebirdsql&charset=utf8&debug=1'
sudo rm /tmp/test.fdb
[testenv:py27-firebirdsql]
@@ -256,7 +256,7 @@ commands = flake8 .
commands =
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
- pytest --timeout=30 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql" tests include/tests inheritance/tests versioning/test
+ pytest --timeout=30 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&debug=1" tests include/tests inheritance/tests versioning/test
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
@@ -264,7 +264,7 @@ commands =
commands =
-dropdb -w -U postgres sqlobject_test
createdb -w -U postgres sqlobject_test
- pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=psycopg2&charset=utf-8" tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=psycopg2&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
dropdb -w -U postgres sqlobject_test
[testenv:pywin27-postgres-psycopg]
@@ -281,7 +281,7 @@ commands = {[winmssql]commands}
[sqlite-w32]
commands =
- pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb
+ pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb?debug=1
[testenv:pywin27-sqlite]
commands = {[sqlite-w32]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/6795deff456d99be97533b2292cc051d410fb6be
commit 6795deff456d99be97533b2292cc051d410fb6be
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 01:52:34 2017 +0300
Add debug print in _executeRetry in MySQLConnection
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 01d24c9..cffb7d5 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -165,6 +165,8 @@ class MySQLConnection(DBAPI):
conn.autocommit = auto
def _executeRetry(self, conn, cursor, query):
+ if self.debug:
+ self.printDebug(conn, query, 'QueryR')
dbEncoding = self.dbEncoding
if dbEncoding and not isinstance(query, bytes) and (
self.driver == 'connector'):
http://sourceforge.net/p/sqlobject/sqlobject/ci/f7765c9d1d4e9c75ef8f44239b6df00bd62af5fe
commit f7765c9d1d4e9c75ef8f44239b6df00bd62af5fe
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 00:37:07 2017 +0300
Update DeveloperGuide: we now use AppVeyor
Postgres and sqlite tests were fixed.
[skip ci]
diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index ce89c86..517bbcc 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -257,11 +257,14 @@ 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 to run tests. See the statuses:
+We now use Travis CI and AppVeyor 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://ci.appveyor.com/api/projects/status/github/sqlobject/sqlobject?branch=master
+ :target: https://ci.appveyor.com/project/phdru/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]`` anywhere in your commit messages for commits that don't change
diff --git a/docs/News.rst b/docs/News.rst
index 1ecee0a..a043ed6 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -80,7 +80,7 @@ Tests
and firebirdsql). There are problems with tests.
* Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
- are problems.
+ are problems with MS SQL.
* Run sqlite tests at AppVeyor.
http://sourceforge.net/p/sqlobject/sqlobject/ci/3c3ff7fc1d49db18db27ad24ce91f1910f7f6248
commit 3c3ff7fc1d49db18db27ad24ce91f1910f7f6248
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 00:09:41 2017 +0300
Skip test_sslmode on w32
diff --git a/sqlobject/tests/test_postgres.py b/sqlobject/tests/test_postgres.py
index 06c8835..b2b8895 100644
--- a/sqlobject/tests/test_postgres.py
+++ b/sqlobject/tests/test_postgres.py
@@ -1,3 +1,4 @@
+import os
import pytest
from sqlobject import SQLObject, StringCol
from sqlobject.tests.dbtest import getConnection, setupClass
@@ -16,8 +17,10 @@ def test_sslmode():
setupClass(SOTestSSLMode)
connection = SOTestSSLMode._connection
if (connection.dbName != 'postgres') or \
- (not connection.module.__name__.startswith('psycopg')):
- pytest.skip("The test requires PostgreSQL, psycopg and ssl mode")
+ (not connection.module.__name__.startswith('psycopg')) or \
+ (os.name == 'nt'):
+ pytest.skip("The test requires PostgreSQL, psycopg and ssl mode; "
+ "also it doesn't work on w32")
connection = getConnection(sslmode='require')
SOTestSSLMode._connection = connection
http://sourceforge.net/p/sqlobject/sqlobject/ci/1e0411e48a6a99f33d0f4df287bcf6e60e3d1289
commit 1e0411e48a6a99f33d0f4df287bcf6e60e3d1289
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 00:06:33 2017 +0300
Fix test_parse_uri.py on w32
diff --git a/sqlobject/tests/test_parse_uri.py b/sqlobject/tests/test_parse_uri.py
index bcb0671..8b68c64 100644
--- a/sqlobject/tests/test_parse_uri.py
+++ b/sqlobject/tests/test_parse_uri.py
@@ -88,7 +88,7 @@ def test_parse():
assert password is None
assert host is None
assert port is None
- assert path == "/C:/full/path/to/database"
+ assert path == "C:/full/path/to/database"
assert args == {}
user, password, host, port, path, args = \
@@ -97,7 +97,7 @@ def test_parse():
assert password is None
assert host is None
assert port is None
- assert path == "/C:/full/path/to/database"
+ assert path == "C:/full/path/to/database"
assert args == {}
@@ -144,4 +144,4 @@ def test_uri():
if os.name == 'nt':
connection.filename = 'C:/full/path/to/database'
- assert connection.uri() == "sqlite:///C:/full/path/to/database"
+ assert connection.uri() == "sqlite:///C%3A/full/path/to/database"
http://sourceforge.net/p/sqlobject/sqlobject/ci/a526639480b5943f6397c925be144e6271b793d7
commit a526639480b5943f6397c925be144e6271b793d7
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 14 00:03:55 2017 +0300
Run sqlite tests at AppVeyor
diff --git a/appveyor.yml b/appveyor.yml
index 3fb0c11..2cba27b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,6 +51,10 @@ environment:
# db: mssql2014
#- PYTHON: "C:\\Python36-x64"
# db: postgresql
+ - PYTHON: "C:\\Python27"
+ TOX_ENV: "pywin27-sqlite"
+ - PYTHON: "C:\\Python34"
+ TOX_ENV: "pywin34-sqlite"
install:
# Ensure we use the right python version
diff --git a/docs/News.rst b/docs/News.rst
index f83bee3..1ecee0a 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -79,9 +79,11 @@ Tests
* Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
and firebirdsql). There are problems with tests.
-* Add appveyor for windows testing. Run tests with Postgres and MS SQL. There
+* Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
are problems.
+* Run sqlite tests at AppVeyor.
+
SQLObject 3.1.0
===============
diff --git a/tox.ini b/tox.ini
index f79e283..7276e95 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,postgres-pg8000,sqlite},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{postgres-psycopg,mssql}
+envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35}-{mysqlclient,pypostgresql},py{26,27,34,35}-{mysql-connector,pymysql,postgres-psycopg,postgres-pygresql,postgres-pg8000,sqlite},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{mssql,postgres-psycopg,sqlite}
# Base test environment settings
[testenv]
@@ -278,3 +278,13 @@ commands = {[winpsycopg]commands}
[testenv:pywin34-mssql]
commands = {[winmssql]commands}
+
+[sqlite-w32]
+commands =
+ pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb
+
+[testenv:pywin27-sqlite]
+commands = {[sqlite-w32]commands}
+
+[testenv:pywin34-sqlite]
+commands = {[sqlite-w32]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/270599a9da489846534e14a665c380ad96f24815
commit 270599a9da489846534e14a665c380ad96f24815
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jan 13 23:44:58 2017 +0300
Remove excessive spaces and blank lines
diff --git a/appveyor.yml b/appveyor.yml
index 4f017cf..3fb0c11 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ version: 3.2.{build}
clone_depth: 50
services:
- - postgresql
+ - postgresql
environment:
PGUSER: "postgres"
@@ -52,16 +52,15 @@ environment:
#- PYTHON: "C:\\Python36-x64"
# db: postgresql
-
install:
- # Ensure we use the right python version
- - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\Program Files\\PostgreSQL\\9.5\\bin\\;%PATH%"
- - "python --version"
- - "pip install -r requirements.txt"
- - "pip install tox"
- # Enable TCP for mssql
- # (from appveyor documentation)
- - ps: |
+ # Ensure we use the right python version
+ - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\Program Files\\PostgreSQL\\9.5\\bin\\;%PATH%"
+ - "python --version"
+ - "pip install -r requirements.txt"
+ - "pip install tox"
+ # Enable TCP for mssql
+ # (from appveyor documentation)
+ - ps: |
[reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
[reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
$serverName = $env:COMPUTERNAME
@@ -80,4 +79,4 @@ install:
build: false
test_script:
- - "tox -e %TOX_ENV%"
+ - "tox -e %TOX_ENV%"
diff --git a/tox.ini b/tox.ini
index ed162c5..f79e283 100644
--- a/tox.ini
+++ b/tox.ini
@@ -251,7 +251,6 @@ deps =
flake8
commands = flake8 .
-
# Windows testing
[winmssql]
commands =
-----------------------------------------------------------------------
Summary of changes:
appveyor.yml | 25 ++++++++++++---------
docs/DeveloperGuide.rst | 5 +++-
docs/News.rst | 6 +++-
sqlobject/mysql/mysqlconnection.py | 2 +
sqlobject/tests/test_parse_uri.py | 6 ++--
sqlobject/tests/test_postgres.py | 7 ++++-
tox.ini | 41 ++++++++++++++++++++++--------------
7 files changed, 57 insertions(+), 35 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
