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 4d9d438a43d28cc346a1995dc744d00265cb2c29 (commit)
via e0f1af959b656206643223aa4bb56a5c8798c1a1 (commit)
via c766c7920291c6f69ea49b7840aa33a7508ae0f9 (commit)
from cf45abf77b98bc0d7a34a6da8b6d3697165bf962 (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/4d9d438a43d28cc346a1995dc744d00265cb2c29
commit 4d9d438a43d28cc346a1995dc744d00265cb2c29
Author: Oleg Broytman <ph...@ph...>
Date: Sat Sep 24 08:22:40 2016 +0300
Use createdb/dropdb for Postgres
diff --git a/tox.ini b/tox.ini
index a0b0473..161b285 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,6 @@ envlist = {py26,py27}-mysql,{py26,py27,py34,py35}-postgres,{py26,py27,py34,py35}
# Base test environment settings
[testenv]
-# Don't fail or warn on uninstalled commands
-whitelist_externals =
- mysql
- psql
# Ensure we cd into sqlobject before running the tests
changedir = ./sqlobject/
deps =
@@ -21,6 +17,12 @@ deps =
mysqlclient: mysqlclient
postgres: psycopg2
passenv = CI TRAVIS TRAVIS_*
+# Don't fail or warn on uninstalled commands
+whitelist_externals =
+ mysql
+ psql
+ createdb
+ dropdb
# MySQL test environments
[mysql]
@@ -38,9 +40,9 @@ commands = {[mysql]commands}
# PostgreSQL test environments
[postgresql]
commands =
- psql -c 'create database sqlobject_test;' -U postgres
+ createdb -U postgres sqlobject_test
py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test tests include/tests inheritance/tests versioning/test
- psql -c 'drop database sqlobject_test;' -U postgres
+ dropdb -U postgres sqlobject_test
[testenv:py26-postgres]
commands = {[postgresql]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/e0f1af959b656206643223aa4bb56a5c8798c1a1
commit e0f1af959b656206643223aa4bb56a5c8798c1a1
Author: Oleg Broytman <ph...@ph...>
Date: Sat Sep 24 08:21:29 2016 +0300
Remove basepython from tox.ini
tox is quite good at guessing Python versions from environment names.
diff --git a/tox.ini b/tox.ini
index 9d3ee6d..a0b0473 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,11 +10,6 @@ whitelist_externals =
psql
# Ensure we cd into sqlobject before running the tests
changedir = ./sqlobject/
-basepython =
- py26: python2.6
- py27: python2.7
- py34: python3.4
- py35: python3.5
deps =
pytest
pytest-cov
http://sourceforge.net/p/sqlobject/sqlobject/ci/c766c7920291c6f69ea49b7840aa33a7508ae0f9
commit c766c7920291c6f69ea49b7840aa33a7508ae0f9
Author: Oleg Broytman <ph...@ph...>
Date: Sat Sep 24 01:44:10 2016 +0300
Reorder .gitignore alphabetically
diff --git a/.gitignore b/.gitignore
index d726343..8647366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
/.cache/
/.tox/
-*~
-*.tmp
-*.py[co]
-/MANIFEST
/SQLObject.egg-info/
/build/
/data/
/dist/
+/MANIFEST
+*.py[co]
+*.tmp
+*~
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 8 ++++----
tox.ini | 19 ++++++++-----------
2 files changed, 12 insertions(+), 15 deletions(-)
hooks/post-receive
--
SQLObject development repository
|