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 9d4af66987f77054c307c417dbdd786d6bfb5012 (commit)
via 9084e6f3a27fcf24e5fd02010319cfacf5a015dc (commit)
via ed65656d57475b9cdcac7fe45a47581b95c4f375 (commit)
via 37ec639c362949356a01a7fb1a8c700178b80237 (commit)
via 16925142461dd707162cc23ba57add3794aa4647 (commit)
from ee26d9787b276686f5be9a19229134f3256e24a3 (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/9d4af66987f77054c307c417dbdd786d6bfb5012
commit 9d4af66987f77054c307c417dbdd786d6bfb5012
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jun 30 18:27:22 2019 +0300
Tests(tox): Exclude tests from the list of auto tests
Exclude ODBC tests and py27-pygresql.
diff --git a/devscripts/tox-select-envs b/devscripts/tox-select-envs
index 34ff4b2..f1e9a81 100755
--- a/devscripts/tox-select-envs
+++ b/devscripts/tox-select-envs
@@ -2,7 +2,7 @@
pattern="$1"
shift
-envs="`tox --listenvs-all | grep -F $pattern | sed 's/$/,/'`"
+envs="`tox --listenvs-all | grep -F $pattern | grep -v 'noauto\|w32' | sed 's/$/,/'`"
if [ -n "$envs" ]; then
exec tox -e "$envs" "$@"
diff --git a/devscripts/tox-select-envs.cmd b/devscripts/tox-select-envs.cmd
index 4ea6114..03d8b4e 100644
--- a/devscripts/tox-select-envs.cmd
+++ b/devscripts/tox-select-envs.cmd
@@ -6,7 +6,7 @@ shift
set "envs="
for /f "usebackq" %%e in (
- `tox --listenvs-all ^| find "%pattern%" ^| find "-w32"`
+ `tox --listenvs-all ^| find "%pattern%" ^| find "-w32" ^| find /v "noauto"`
) do (
if defined envs (set "envs=!envs!,%%e") else (set "envs=%%e")
)
diff --git a/tox.ini b/tox.ini
index f3f2bfc..7dac706 100644
--- a/tox.ini
+++ b/tox.ini
@@ -182,21 +182,21 @@ commands =
pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pyodbc&odbcdrv=MySQL&charset=utf8&debug=1
mysql -uroot -e 'drop database sqlobject_test;'
-[testenv:py27-mysql-pyodbc]
+[testenv:py27-mysql-pyodbc-noauto]
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mysql-pyodbc]commands}
-[testenv:py34-mysql-pyodbc]
+[testenv:py34-mysql-pyodbc-noauto]
commands = {[mysql-pyodbc]commands}
-[testenv:py35-mysql-pyodbc]
+[testenv:py35-mysql-pyodbc-noauto]
commands = {[mysql-pyodbc]commands}
-[testenv:py36-mysql-pyodbc]
+[testenv:py36-mysql-pyodbc-noauto]
commands = {[mysql-pyodbc]commands}
-[testenv:py37-mysql-pyodbc]
+[testenv:py37-mysql-pyodbc-noauto]
commands = {[mysql-pyodbc]commands}
[mysql-pypyodbc]
@@ -207,21 +207,21 @@ commands =
pytest --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=MySQL&charset=utf8&debug=1
mysql -uroot -e 'drop database sqlobject_test;'
-[testenv:py27-mysql-pypyodbc]
+[testenv:py27-mysql-pypyodbc-noauto]
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mysql-pypyodbc]commands}
-[testenv:py34-mysql-pypyodbc]
+[testenv:py34-mysql-pypyodbc-noauto]
commands = {[mysql-pypyodbc]commands}
-[testenv:py35-mysql-pypyodbc]
+[testenv:py35-mysql-pypyodbc-noauto]
commands = {[mysql-pypyodbc]commands}
-[testenv:py36-mysql-pypyodbc]
+[testenv:py36-mysql-pypyodbc-noauto]
commands = {[mysql-pypyodbc]commands}
-[testenv:py37-mysql-pypyodbc]
+[testenv:py37-mysql-pypyodbc-noauto]
commands = {[mysql-pypyodbc]commands}
# PostgreSQL test environments
@@ -333,21 +333,21 @@ commands =
pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pyodbc&odbcdrv=PostgreSQL%20ANSI&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
-[testenv:py27-postgres-pyodbc]
+[testenv:py27-postgres-pyodbc-noauto]
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[postgres-pyodbc]commands}
-[testenv:py34-postgres-pyodbc]
+[testenv:py34-postgres-pyodbc-noauto]
commands = {[postgres-pyodbc]commands}
-[testenv:py35-postgres-pyodbc]
+[testenv:py35-postgres-pyodbc-noauto]
commands = {[postgres-pyodbc]commands}
-[testenv:py36-postgres-pyodbc]
+[testenv:py36-postgres-pyodbc-noauto]
commands = {[postgres-pyodbc]commands}
-[testenv:py37-postgres-pyodbc]
+[testenv:py37-postgres-pyodbc-noauto]
commands = {[postgres-pyodbc]commands}
[postgres-pypyodbc]
@@ -358,21 +358,21 @@ commands =
pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=PostgreSQL%20ANSI&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
-[testenv:py27-postgres-pypyodbc]
+[testenv:py27-postgres-pypyodbc-noauto]
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[postgres-pypyodbc]commands}
-[testenv:py34-postgres-pypyodbc]
+[testenv:py34-postgres-pypyodbc-noauto]
commands = {[postgres-pypyodbc]commands}
-[testenv:py35-postgres-pypyodbc]
+[testenv:py35-postgres-pypyodbc-noauto]
commands = {[postgres-pypyodbc]commands}
-[testenv:py36-postgres-pypyodbc]
+[testenv:py36-postgres-pypyodbc-noauto]
commands = {[postgres-pypyodbc]commands}
-[testenv:py37-postgres-pypyodbc]
+[testenv:py37-postgres-pypyodbc-noauto]
commands = {[postgres-pypyodbc]commands}
@@ -501,25 +501,25 @@ commands =
pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
-[testenv:py27-mssql-pyodbc-w32]
+[testenv:py27-mssql-pyodbc-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mssql-pyodbc-w32]commands}
-[testenv:py34-mssql-pyodbc-w32]
+[testenv:py34-mssql-pyodbc-noauto-w32]
platform = win32
commands = {[mssql-pyodbc-w32]commands}
-[testenv:py35-mssql-pyodbc-w32]
+[testenv:py35-mssql-pyodbc-noauto-w32]
platform = win32
commands = {[mssql-pyodbc-w32]commands}
-[testenv:py36-mssql-pyodbc-w32]
+[testenv:py36-mssql-pyodbc-noauto-w32]
platform = win32
commands = {[mssql-pyodbc-w32]commands}
-[testenv:py37-mssql-pyodbc-w32]
+[testenv:py37-mssql-pyodbc-noauto-w32]
platform = win32
commands =
cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
@@ -601,25 +601,25 @@ commands =
pytest --cov=sqlobject -D mysql://root:Password12!@localhost/sqlobject_test?driver=pyodbc&odbcdrv=MySQL%20ODBC%205.3%20ANSI%20Driver&charset=utf8&debug=1
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
-[testenv:py27-mysql-pyodbc-w32]
+[testenv:py27-mysql-pyodbc-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mysql-pyodbc-w32]commands}
-[testenv:py34-mysql-pyodbc-w32]
+[testenv:py34-mysql-pyodbc-noauto-w32]
platform = win32
commands = {[mysql-pyodbc-w32]commands}
-[testenv:py35-mysql-pyodbc-w32]
+[testenv:py35-mysql-pyodbc-noauto-w32]
platform = win32
commands = {[mysql-pyodbc-w32]commands}
-[testenv:py36-mysql-pyodbc-w32]
+[testenv:py36-mysql-pyodbc-noauto-w32]
platform = win32
commands = {[mysql-pyodbc-w32]commands}
-[testenv:py37-mysql-pyodbc-w32]
+[testenv:py37-mysql-pyodbc-noauto-w32]
platform = win32
commands =
cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
@@ -635,25 +635,25 @@ commands =
pytest --cov=sqlobject -D mysql://root:Password12!@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=MySQL%20ODBC%205.3%20ANSI%20Driver&charset=utf8&debug=1
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
-[testenv:py27-mysql-pypyodbc-w32]
+[testenv:py27-mysql-pypyodbc-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mysql-pypyodbc-w32]commands}
-[testenv:py34-mysql-pypyodbc-w32]
+[testenv:py34-mysql-pypyodbc-noauto-w32]
platform = win32
commands = {[mysql-pypyodbc-w32]commands}
-[testenv:py35-mysql-pypyodbc-w32]
+[testenv:py35-mysql-pypyodbc-noauto-w32]
platform = win32
commands = {[mysql-pypyodbc-w32]commands}
-[testenv:py36-mysql-pypyodbc-w32]
+[testenv:py36-mysql-pypyodbc-noauto-w32]
platform = win32
commands = {[mysql-pypyodbc-w32]commands}
-[testenv:py37-mysql-pypyodbc-w32]
+[testenv:py37-mysql-pypyodbc-noauto-w32]
platform = win32
commands =
cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
@@ -701,7 +701,7 @@ commands =
pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pygresql&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
-[testenv:py27-postgres-pygresql-w32]
+[testenv:py27-postgres-pygresql-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
@@ -800,25 +800,25 @@ commands =
pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pyodbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
-[testenv:py27-postgres-pyodbc-w32]
+[testenv:py27-postgres-pyodbc-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[postgres-pyodbc-w32]commands}
-[testenv:py34-postgres-pyodbc-w32]
+[testenv:py34-postgres-pyodbc-noauto-w32]
platform = win32
commands = {[postgres-pyodbc-w32]commands}
-[testenv:py35-postgres-pyodbc-w32]
+[testenv:py35-postgres-pyodbc-noauto-w32]
platform = win32
commands = {[postgres-pyodbc-w32]commands}
-[testenv:py36-postgres-pyodbc-w32]
+[testenv:py36-postgres-pyodbc-noauto-w32]
platform = win32
commands = {[postgres-pyodbc-w32]commands}
-[testenv:py37-postgres-pyodbc-w32]
+[testenv:py37-postgres-pyodbc-noauto-w32]
platform = win32
commands =
cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
@@ -834,25 +834,25 @@ commands =
pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
-[testenv:py27-postgres-pypyodbc-w32]
+[testenv:py27-postgres-pypyodbc-noauto-w32]
platform = win32
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[postgres-pypyodbc-w32]commands}
-[testenv:py34-postgres-pypyodbc-w32]
+[testenv:py34-postgres-pypyodbc-noauto-w32]
platform = win32
commands = {[postgres-pypyodbc-w32]commands}
-[testenv:py35-postgres-pypyodbc-w32]
+[testenv:py35-postgres-pypyodbc-noauto-w32]
platform = win32
commands = {[postgres-pypyodbc-w32]commands}
-[testenv:py36-postgres-pypyodbc-w32]
+[testenv:py36-postgres-pypyodbc-noauto-w32]
platform = win32
commands = {[postgres-pypyodbc-w32]commands}
-[testenv:py37-postgres-pypyodbc-w32]
+[testenv:py37-postgres-pypyodbc-noauto-w32]
platform = win32
commands =
cmd /c "copy ..\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
http://sourceforge.net/p/sqlobject/sqlobject/ci/9084e6f3a27fcf24e5fd02010319cfacf5a015dc
commit 9084e6f3a27fcf24e5fd02010319cfacf5a015dc
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jun 30 17:52:29 2019 +0300
CI: Reduce the number of virtual machines/containers
One OS, one DB, one python version, many drivers per VM.
diff --git a/.travis.yml b/.travis.yml
index acd3e87..8fe81ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,132 +22,57 @@ addons:
matrix:
include:
- python: "2.7"
- env: TOXENV=py27-mysqldb
+ env: TESTS=py27-mysql
- python: "3.4"
- env: TOXENV=py34-mysqlclient
+ env: TESTS=py34-mysql
- python: "3.5"
- env: TOXENV=py35-mysqlclient
+ env: TESTS=py35-mysql
- python: "3.6"
- env: TOXENV=py36-mysqlclient
+ env: TESTS=py36-mysql
- python: "3.7"
dist: xenial
- env: TOXENV=py37-mysqlclient
+ env: TESTS=py37-mysql
- python: "2.7"
- env: TOXENV=py27-mysql-connector
+ env: TESTS=py27-postgres
- python: "3.4"
- env: TOXENV=py34-mysql-connector
+ env: TESTS=py34-postgres
- python: "3.5"
- env: TOXENV=py35-mysql-connector
+ env: TESTS=py35-postgres
- python: "3.6"
- env: TOXENV=py36-mysql-connector
+ env: TESTS=py36-postgres
- python: "3.7"
dist: xenial
- env: TOXENV=py37-mysql-connector
+ env: TESTS=py37-postgres
- python: "2.7"
- env: TOXENV=py27-mysql-oursql
+ env: TESTS=py27-sqlite
- python: "3.4"
- env: TOXENV=py34-mysql-oursql3
+ env: TESTS=py34-sqlite
- python: "3.5"
- env: TOXENV=py35-mysql-oursql3
+ env: TESTS=py35-sqlite
- python: "3.6"
- env: TOXENV=py36-mysql-oursql3
+ env: TESTS=py36-sqlite
- python: "3.7"
dist: xenial
- env: TOXENV=py37-mysql-oursql3
+ env: TESTS=py37-sqlite
- python: "2.7"
- env: TOXENV=py27-pymysql
- - python: "3.4"
- env: TOXENV=py34-pymysql
- - python: "3.5"
- env: TOXENV=py35-pymysql
- - python: "3.6"
- env: TOXENV=py36-pymysql
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-pymysql
- - python: "2.7"
- env: TOXENV=py27-postgres-psycopg
- - python: "3.4"
- env: TOXENV=py34-postgres-psycopg
- - python: "3.5"
- env: TOXENV=py35-postgres-psycopg
- - python: "3.6"
- env: TOXENV=py36-postgres-psycopg
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-postgres-psycopg
- - python: "2.7"
- env: TOXENV=py27-postgres-pygresql
- - python: "3.4"
- env: TOXENV=py34-postgres-pygresql
- - python: "3.5"
- env: TOXENV=py35-postgres-pygresql
- - python: "3.6"
- env: TOXENV=py36-postgres-pygresql
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-postgres-pygresql
- - python: "3.4"
- env: TOXENV=py34-pypostgresql
- - python: "3.5"
- env: TOXENV=py35-pypostgresql
- - python: "3.6"
- env: TOXENV=py36-pypostgresql
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-pypostgresql
- - python: "2.7"
- env: TOXENV=py27-postgres-pg8000
- - python: "3.4"
- env: TOXENV=py34-postgres-pg8000
- - python: "3.5"
- env: TOXENV=py35-postgres-pg8000
- - python: "3.6"
- env: TOXENV=py36-postgres-pg8000
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-postgres-pg8000
- - python: "2.7"
- env: TOXENV=py27-sqlite
- - python: "3.4"
- env: TOXENV=py34-sqlite
- - python: "3.5"
- env: TOXENV=py35-sqlite
- - python: "3.6"
- env: TOXENV=py36-sqlite
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-sqlite
- - python: "2.7"
- env: TOXENV=py27-sqlite-memory
- - python: "3.4"
- env: TOXENV=py34-sqlite-memory
- - python: "3.5"
- env: TOXENV=py35-sqlite-memory
- - python: "3.6"
- env: TOXENV=py36-sqlite-memory
- - python: "3.7"
- dist: xenial
- env: TOXENV=py37-sqlite-memory
- - python: "2.7"
- env: TOXENV=py27-flake8
+ env: TESTS=py27-flake8
- python: "3.7"
dist: xenial
- env: TOXENV=py37-flake8
+ env: TESTS=py37-flake8
- python: "2.7"
- env: TOXENV=py27-firebird-fdb
+ env: TESTS=py27-firebird
- python: "3.6"
- env: TOXENV=py36-firebird-fdb
+ env: TESTS=py36-firebird
- python: "2.7"
- env: TOXENV=py27-firebirdsql
+ env: TESTS=py27-firebird
- python: "3.6"
- env: TOXENV=py36-firebirdsql
+ env: TESTS=py36-firebird
allow_failures:
- - env: TOXENV=py27-firebird-fdb
- - env: TOXENV=py36-firebird-fdb
- - env: TOXENV=py27-firebirdsql
- - env: TOXENV=py36-firebirdsql
+ - env: TESTS=py27-firebird
+ - env: TESTS=py36-firebird
+ - env: TESTS=py27-firebird
+ - env: TESTS=py36-firebird
fast_finish: true
@@ -160,7 +85,7 @@ before_install:
# to create the test database.
# Copied password initializtion from
... 414 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|