|
From: Oleg B. <no...@so...> - 2017-02-09 13:07:35
|
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 0fee3500a949c3d0021786792082483caa82920d (commit)
via 60b412218b53f2443e1e3f701c82b223e6d7509e (commit)
via ffcdbe970272a35b40e4f78d05170d83e47010c6 (commit)
via 50ae1a7da60555e7da80bf10c4b5e6cfebfa8a9d (commit)
via 347e63397079d08ad78ba6e616bdad93fa7bed1f (commit)
via 882e147c9c5c04faf6ea7d8b9f5bae9898d36afa (commit)
via 23332ccd1bd6b8c2b3bc1c0682fc8ade0e41c289 (commit)
from b06003c4189912aae186244e90ed950cc641f19d (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/0fee3500a949c3d0021786792082483caa82920d
commit 0fee3500a949c3d0021786792082483caa82920d
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 9 14:45:18 2017 +0300
Run createdb/dropdb with option -w
These are non-interactive tests.
diff --git a/tox.ini b/tox.ini
index 4837f8f..3cd1677 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,10 +116,10 @@ commands = {[pymysql]commands}
# PostgreSQL test environments
[psycopg]
commands =
- -dropdb -U postgres sqlobject_test
- createdb -U postgres sqlobject_test
+ -dropdb -U postgres -w sqlobject_test
+ createdb -U postgres -w sqlobject_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
+ dropdb -U postgres -w sqlobject_test
[testenv:py26-postgres-psycopg]
commands = {[psycopg]commands}
@@ -135,10 +135,10 @@ commands = {[psycopg]commands}
[pygresql]
commands =
- -dropdb -U postgres sqlobject_test
- createdb -U postgres sqlobject_test
+ -dropdb -U postgres -w sqlobject_test
+ createdb -U postgres -w sqlobject_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
+ dropdb -U postgres -w sqlobject_test
[testenv:py26-postgres-pygresql]
commands = {[pygresql]commands}
@@ -154,10 +154,10 @@ commands = {[pygresql]commands}
[pypostgresql]
commands =
- -dropdb -U postgres sqlobject_test
- createdb -U postgres sqlobject_test
+ -dropdb -U postgres -w sqlobject_test
+ createdb -U postgres -w sqlobject_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
+ dropdb -U postgres -w sqlobject_test
[testenv:py34-pypostgresql]
commands = {[pypostgresql]commands}
@@ -281,10 +281,10 @@ commands = {[mysql-connector-w32]commands}
[psycopg-w32]
commands =
- -dropdb -w -U postgres sqlobject_test
- createdb -w -U postgres sqlobject_test
+ -dropdb -U postgres -w sqlobject_test
+ createdb -U postgres -w sqlobject_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
+ dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-psycopg-w32]
commands = {[psycopg-w32]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/60b412218b53f2443e1e3f701c82b223e6d7509e
commit 60b412218b53f2443e1e3f701c82b223e6d7509e
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 9 04:41:12 2017 +0300
Run tests at AppVeyor with Python-x64
diff --git a/appveyor.yml b/appveyor.yml
index 930c9c2..3d95e3b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,24 +32,45 @@ environment:
- PYTHON: "C:\\Python27"
db: postgresql
TOX_ENV: "py27-postgres-psycopg-w32"
+ - PYTHON: "C:\\Python27-x64"
+ db: postgresql
+ TOX_ENV: "py27-postgres-psycopg-w32"
- PYTHON: "C:\\Python34"
db: postgresql
TOX_ENV: "py34-postgres-psycopg-w32"
+ - PYTHON: "C:\\Python34-x64"
+ db: postgresql
+ TOX_ENV: "py34-postgres-psycopg-w32"
- PYTHON: "C:\\Python35"
db: postgresql
TOX_ENV: "py35-postgres-psycopg-w32"
+ - PYTHON: "C:\\Python35-x64"
+ db: postgresql
+ TOX_ENV: "py35-postgres-psycopg-w32"
- PYTHON: "C:\\Python27"
TOX_ENV: "py27-sqlite-w32"
+ - PYTHON: "C:\\Python27-x64"
+ TOX_ENV: "py27-sqlite-w32"
- PYTHON: "C:\\Python34"
TOX_ENV: "py34-sqlite-w32"
+ - PYTHON: "C:\\Python34-x64"
+ TOX_ENV: "py34-sqlite-w32"
- PYTHON: "C:\\Python35"
TOX_ENV: "py35-sqlite-w32"
+ - PYTHON: "C:\\Python35-x64"
+ TOX_ENV: "py35-sqlite-w32"
- PYTHON: "C:\\Python27"
TOX_ENV: "py27-sqlite-memory-w32"
+ - PYTHON: "C:\\Python27-x64"
+ TOX_ENV: "py27-sqlite-memory-w32"
- PYTHON: "C:\\Python34"
TOX_ENV: "py34-sqlite-memory-w32"
+ - PYTHON: "C:\\Python34-x64"
+ TOX_ENV: "py34-sqlite-memory-w32"
- PYTHON: "C:\\Python35"
TOX_ENV: "py35-sqlite-memory-w32"
+ - PYTHON: "C:\\Python35-x64"
+ TOX_ENV: "py35-sqlite-memory-w32"
install:
# Ensure we use the right python version
diff --git a/docs/News.rst b/docs/News.rst
index 6e757d3..7cce01d 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -99,8 +99,8 @@ Tests
drivers fdb and firebirdsql). There are problems with tests.
* Run tests at AppVeyor for windows testing. Run tests with MS SQL,
- MySQL, Postgres and SQLite backends; use Python 2.7, 3.4 and 3.5.
- There are problems with MS SQL and MySQL.
+ MySQL, Postgres and SQLite backends; use Python 2.7, 3.4 and 3.5,
+ x86 and x64. There are problems with MS SQL and MySQL.
SQLObject 3.1.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/ffcdbe970272a35b40e4f78d05170d83e47010c6
commit ffcdbe970272a35b40e4f78d05170d83e47010c6
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 9 04:31:57 2017 +0300
Rename pywin-* test envs to py-*-w32
diff --git a/appveyor.yml b/appveyor.yml
index 5d91470..930c9c2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,37 +19,37 @@ environment:
# from https://www.appveyor.com/docs/installed-software/#python
- PYTHON: "C:\\Python27"
db: mssql2014
- TOX_ENV: "pywin27-mssql"
+ TOX_ENV: "py27-mssql-w32"
- PYTHON: "C:\\Python34"
db: mssql2014
- TOX_ENV: "pywin34-mssql"
+ TOX_ENV: "py34-mssql-w32"
- PYTHON: "C:\\Python27"
db: mysql
- TOX_ENV: "pywin27-mysql-connector"
+ TOX_ENV: "py27-mysql-connector-w32"
- PYTHON: "C:\\Python34"
db: mysql
- TOX_ENV: "pywin34-mysql-connector"
+ TOX_ENV: "py34-mysql-connector-w32"
- PYTHON: "C:\\Python27"
db: postgresql
- TOX_ENV: "pywin27-postgres-psycopg"
+ TOX_ENV: "py27-postgres-psycopg-w32"
- PYTHON: "C:\\Python34"
db: postgresql
- TOX_ENV: "pywin34-postgres-psycopg"
+ TOX_ENV: "py34-postgres-psycopg-w32"
- PYTHON: "C:\\Python35"
db: postgresql
- TOX_ENV: "pywin35-postgres-psycopg"
+ TOX_ENV: "py35-postgres-psycopg-w32"
- PYTHON: "C:\\Python27"
- TOX_ENV: "pywin27-sqlite"
+ TOX_ENV: "py27-sqlite-w32"
- PYTHON: "C:\\Python34"
- TOX_ENV: "pywin34-sqlite"
+ TOX_ENV: "py34-sqlite-w32"
- PYTHON: "C:\\Python35"
- TOX_ENV: "pywin35-sqlite"
+ TOX_ENV: "py35-sqlite-w32"
- PYTHON: "C:\\Python27"
- TOX_ENV: "pywin27-sqlite-memory"
+ TOX_ENV: "py27-sqlite-memory-w32"
- PYTHON: "C:\\Python34"
- TOX_ENV: "pywin34-sqlite-memory"
+ TOX_ENV: "py34-sqlite-memory-w32"
- PYTHON: "C:\\Python35"
- TOX_ENV: "pywin35-sqlite-memory"
+ TOX_ENV: "py35-sqlite-memory-w32"
install:
# Ensure we use the right python version
diff --git a/tox.ini b/tox.ini
index 59d4946..4837f8f 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,pywin{27,34,35}-{mssql,mysql-connector,postgres-psycopg,sqlite,sqlite-memory}
+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
# Base test environment settings
[testenv]
@@ -254,13 +254,13 @@ commands =
pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&timeout=30&debug=1"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
-[testenv:pywin27-mssql]
+[testenv:py27-mssql-w32]
commands = {[mssql-w32]commands}
-[testenv:pywin34-mssql]
+[testenv:py34-mssql-w32]
commands = {[mssql-w32]commands}
-[testenv:pywin35-mssql]
+[testenv:py35-mssql-w32]
commands = {[mssql-w32]commands}
[mysql-connector-w32]
@@ -270,13 +270,13 @@ commands =
pytest --cov=sqlobject -D "mysql://root:Password12!@localhost/sqlobject_test?driver=connector&debug=1"
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
-[testenv:pywin27-mysql-connector]
+[testenv:py27-mysql-connector-w32]
commands = {[mysql-connector-w32]commands}
-[testenv:pywin34-mysql-connector]
+[testenv:py34-mysql-connector-w32]
commands = {[mysql-connector-w32]commands}
-[testenv:pywin35-mysql-connector]
+[testenv:py35-mysql-connector-w32]
commands = {[mysql-connector-w32]commands}
[psycopg-w32]
@@ -286,37 +286,37 @@ commands =
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]
+[testenv:py27-postgres-psycopg-w32]
commands = {[psycopg-w32]commands}
-[testenv:pywin34-postgres-psycopg]
+[testenv:py34-postgres-psycopg-w32]
commands = {[psycopg-w32]commands}
-[testenv:pywin35-postgres-psycopg]
+[testenv:py35-postgres-psycopg-w32]
commands = {[psycopg-w32]commands}
[sqlite-w32]
commands =
pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb?debug=1
-[testenv:pywin27-sqlite]
+[testenv:py27-sqlite-w32]
commands = {[sqlite-w32]commands}
-[testenv:pywin34-sqlite]
+[testenv:py34-sqlite-w32]
commands = {[sqlite-w32]commands}
-[testenv:pywin35-sqlite]
+[testenv:py35-sqlite-w32]
commands = {[sqlite-w32]commands}
[sqlite-memory-w32]
commands =
pytest --cov=sqlobject -D sqlite:/:memory:?debug=1
-[testenv:pywin27-sqlite-memory]
+[testenv:py27-sqlite-memory-w32]
commands = {[sqlite-memory-w32]commands}
-[testenv:pywin34-sqlite-memory]
+[testenv:py34-sqlite-memory-w32]
commands = {[sqlite-memory-w32]commands}
-[testenv:pywin35-sqlite-memory]
+[testenv:py35-sqlite-memory-w32]
commands = {[sqlite-memory-w32]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/50ae1a7da60555e7da80bf10c4b5e6cfebfa8a9d
commit 50ae1a7da60555e7da80bf10c4b5e6cfebfa8a9d
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 9 04:28:13 2017 +0300
Run Pg and SQLite tests with Py3.5-win
diff --git a/appveyor.yml b/appveyor.yml
index efa3097..5d91470 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,53 +20,36 @@ environment:
- PYTHON: "C:\\Python27"
db: mssql2014
TOX_ENV: "pywin27-mssql"
- - PYTHON: "C:\\Python27"
- db: mysql
- TOX_ENV: "pywin27-mysql-connector"
- - PYTHON: "C:\\Python27"
- db: postgresql
- TOX_ENV: "pywin27-postgres-psycopg"
- #- PYTHON: "C:\\Python27-x64"
- # db: mssql2014
- #- PYTHON: "C:\\Python27-x64"
- # db: postgresql
- PYTHON: "C:\\Python34"
db: mssql2014
TOX_ENV: "pywin34-mssql"
+ - PYTHON: "C:\\Python27"
+ db: mysql
+ TOX_ENV: "pywin27-mysql-connector"
- PYTHON: "C:\\Python34"
db: mysql
TOX_ENV: "pywin34-mysql-connector"
+ - PYTHON: "C:\\Python27"
+ db: postgresql
+ TOX_ENV: "pywin27-postgres-psycopg"
- PYTHON: "C:\\Python34"
db: postgresql
TOX_ENV: "pywin34-postgres-psycopg"
- #- PYTHON: "C:\\Python34-x64"
- # db: mssql2014
- #- PYTHON: "C:\\Python34-x64"
- # db: postgresql
- #- PYTHON: "C:\\Python35"
- # db: mssql2014
- #- PYTHON: "C:\\Python35"
- # db: postgresql
- #- PYTHON: "C:\\Python35-x64"
- # db: mssql2014
- #- PYTHON: "C:\\Python35-x64"
- # db: postgresql
- #- PYTHON: "C:\\Python36"
- # db: mssql2014
- #- PYTHON: "C:\\Python36"
- # db: postgresql
- #- PYTHON: "C:\\Python36-x64"
- # db: mssql2014
- #- PYTHON: "C:\\Python36-x64"
- # db: postgresql
+ - PYTHON: "C:\\Python35"
+ db: postgresql
+ TOX_ENV: "pywin35-postgres-psycopg"
- PYTHON: "C:\\Python27"
TOX_ENV: "pywin27-sqlite"
- PYTHON: "C:\\Python34"
TOX_ENV: "pywin34-sqlite"
+ - PYTHON: "C:\\Python35"
+ TOX_ENV: "pywin35-sqlite"
- PYTHON: "C:\\Python27"
TOX_ENV: "pywin27-sqlite-memory"
- PYTHON: "C:\\Python34"
TOX_ENV: "pywin34-sqlite-memory"
+ - PYTHON: "C:\\Python35"
+ TOX_ENV: "pywin35-sqlite-memory"
install:
# Ensure we use the right python version
diff --git a/docs/News.rst b/docs/News.rst
index df02ff6..6e757d3 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -95,11 +95,12 @@ Tests
* Drop ``Circle CI``.
-* Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
- and firebirdsql). There are problems with tests.
+* Run at Travis CI tests with Firebird backend (server version 2.5;
+ drivers fdb and firebirdsql). There are problems with tests.
-* Run tests at AppVeyor for windows testing. Run tests with MS SQL, MySQL,
- Postgres and SQLite. There are problems with MS SQL and MySQL.
+* Run tests at AppVeyor for windows testing. Run tests with MS SQL,
+ MySQL, Postgres and SQLite backends; use Python 2.7, 3.4 and 3.5.
+ There are problems with MS SQL and MySQL.
SQLObject 3.1.0
===============
diff --git a/tox.ini b/tox.ini
index 3e604d6..59d4946 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,pywin{27,34}-{mssql,mysql-connector,postgres-psycopg,sqlite,sqlite-memory}
+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,pywin{27,34,35}-{mssql,mysql-connector,postgres-psycopg,sqlite,sqlite-memory}
# Base test environment settings
[testenv]
@@ -260,6 +260,9 @@ commands = {[mssql-w32]commands}
[testenv:pywin34-mssql]
commands = {[mssql-w32]commands}
+[testenv:pywin35-mssql]
+commands = {[mssql-w32]commands}
+
[mysql-connector-w32]
commands =
-mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
@@ -273,6 +276,9 @@ commands = {[mysql-connector-w32]commands}
[testenv:pywin34-mysql-connector]
commands = {[mysql-connector-w32]commands}
+[testenv:pywin35-mysql-connector]
+commands = {[mysql-connector-w32]commands}
+
[psycopg-w32]
commands =
-dropdb -w -U postgres sqlobject_test
@@ -286,6 +292,9 @@ commands = {[psycopg-w32]commands}
[testenv:pywin34-postgres-psycopg]
commands = {[psycopg-w32]commands}
+[testenv:pywin35-postgres-psycopg]
+commands = {[psycopg-w32]commands}
+
[sqlite-w32]
commands =
pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb?debug=1
@@ -296,6 +305,9 @@ commands = {[sqlite-w32]commands}
[testenv:pywin34-sqlite]
commands = {[sqlite-w32]commands}
+[testenv:pywin35-sqlite]
+commands = {[sqlite-w32]commands}
+
[sqlite-memory-w32]
commands =
pytest --cov=sqlobject -D sqlite:/:memory:?debug=1
@@ -305,3 +317,6 @@ commands = {[sqlite-memory-w32]commands}
[testenv:pywin34-sqlite-memory]
commands = {[sqlite-memory-w32]commands}
+
+[testenv:pywin35-sqlite-memory]
+commands = {[sqlite-memory-w32]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/347e63397079d08ad78ba6e616bdad93fa7bed1f
commit 347e63397079d08ad78ba6e616bdad93fa7bed1f
Author: Oleg Broytman <ph...@ph...>
Date: Thu Feb 9 01:59:00 2017 +0300
Run tests at AppVeyor with MySQL
diff --git a/appveyor.yml b/appveyor.yml
index a92631c..efa3097 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,9 +7,11 @@ version: 3.2.{build}
clone_depth: 50
services:
+ - mysql
- postgresql
environment:
+ MYSQL_PWD: "Password12!"
PGUSER: "postgres"
PGPASSWORD: "Password12!"
... 166 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
