|
From: Oleg B. <no...@so...> - 2016-08-08 00:35:31
|
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 e37b03a019184e9258e67da1716c4898c9d2b429 (commit)
via 4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc (commit)
via 936732a0e84496343e2d357706e25b112c3221a3 (commit)
via d0f2abc7ce2011f2943f11a40ec7f71a72a2473f (commit)
via 53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3 (commit)
via 2476dfb15cf3f6c62f4c0c2c25ad59847687d496 (commit)
via dbfad29c3ab865a69d4661e3b2be96f3255e82db (commit)
via c5b45491c256f3d1bdbfce9775472c59faf8dde2 (commit)
from 9785f246ee72d20f77fd5e9290bb59f587a49287 (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/e37b03a019184e9258e67da1716c4898c9d2b429
commit e37b03a019184e9258e67da1716c4898c9d2b429
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 03:00:21 2016 +0300
Simplify flake8 tox.ini commands
diff --git a/tox.ini b/tox.ini
index cdc9809..e46c895 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,11 +81,11 @@ basepython = python2.7
deps =
flake8
changedir =
-commands = flake8 {posargs:sqlobject/}
+commands = flake8 sqlobject
[testenv:py34-flake8]
basepython = python3.4
deps =
flake8
changedir =
-commands = flake8 {posargs:sqlobject/}
+commands = flake8 sqlobject
http://sourceforge.net/p/sqlobject/sqlobject/ci/4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc
commit 4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 02:42:04 2016 +0300
Refactoring tox.ini
Refactoring common commands for MySQL, PostgreSQL and SQLite.
diff --git a/tox.ini b/tox.ini
index bd5a210..cdc9809 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,49 +27,47 @@ install_command=./pip-wrapper {opts} {packages}
passenv = CI TRAVIS TRAVIS_*
# MySQL test environments
-[testenv:py26-mysql]
+[mysql]
commands =
mysql -e 'create database sqlobject_test;'
py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
mysql -e 'drop database sqlobject_test;'
+[testenv:py26-mysql]
+commands = {[mysql]commands}
+
[testenv:py27-mysql]
-commands =
- mysql -e 'create database sqlobject_test;'
- py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
- mysql -e 'drop database sqlobject_test;'
+commands = {[mysql]commands}
# PostgreSQL test environments
-[testenv:py26-postgres]
+[postgresql]
commands =
psql -c 'create database sqlobject_test;' -U postgres
py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
psql -c 'drop database sqlobject_test;' -U postgres
+[testenv:py26-postgres]
+commands = {[postgresql]commands}
+
[testenv:py27-postgres]
-commands =
- psql -c 'create database sqlobject_test;' -U postgres
- py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
- psql -c 'drop database sqlobject_test;' -U postgres
+commands = {[postgresql]commands}
[testenv:py34-postgres]
-commands =
- psql -c 'create database sqlobject_test;' -U postgres
- py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
- psql -c 'drop database sqlobject_test;' -U postgres
+commands = {[postgresql]commands}
# SQLite test environments
-[testenv:py26-sqlite]
+[sqlite]
commands =
py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+[testenv:py26-sqlite]
+commands = {[sqlite]commands}
+
[testenv:py27-sqlite]
-commands =
- py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+commands = {[sqlite]commands}
[testenv:py34-sqlite]
-commands =
- py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+commands = {[sqlite]commands}
# Special test environments
[testenv:py34-mysqlclient]
http://sourceforge.net/p/sqlobject/sqlobject/ci/936732a0e84496343e2d357706e25b112c3221a3
commit 936732a0e84496343e2d357706e25b112c3221a3
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 02:32:13 2016 +0300
Add 'requires' setup keyword
diff --git a/setup.py b/setup.py
index b54068e..a5c4b88 100755
--- a/setup.py
+++ b/setup.py
@@ -117,6 +117,7 @@ and `GitHub <https://github.com/sqlobject>`_.
],
"sqlobject.maxdb": ["readme.txt"],
},
+ requires=['FormEncode', 'PyDispatcher'],
**kw
)
http://sourceforge.net/p/sqlobject/sqlobject/ci/d0f2abc7ce2011f2943f11a40ec7f71a72a2473f
commit d0f2abc7ce2011f2943f11a40ec7f71a72a2473f
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 02:30:57 2016 +0300
Different versions of FormEncode in install_requires
Different versions of FormEncode for different python versions.
diff --git a/setup.py b/setup.py
index 309a2e5..b54068e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+import sys
from imp import load_source
from os.path import abspath, dirname, join
@@ -28,7 +29,15 @@ if is_setuptools:
[paste.filter_app_factory]
main = sqlobject.wsgi_middleware:make_middleware
"""
- kw['install_requires'] = ["FormEncode>=1.1.1", "PyDispatcher>=2.0.4"]
+ install_requires = []
+ if (sys.version_info[0] == 2) and (sys.version_info[:2] >= (2, 6)):
+ install_requires.append("FormEncode>=1.1.1")
+ elif (sys.version_info[0] == 3) and (sys.version_info[:2] >= (3, 4)):
+ install_requires.append("FormEncode>=1.3.0")
+ else:
+ raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
+ install_requires.append("PyDispatcher>=2.0.4")
+ kw['install_requires'] = install_requires
kw['extras_require'] = {
'mysql': ['MySQLdb'],
'postgresql': ['psycopg'], # or pgdb from PyGreSQL
http://sourceforge.net/p/sqlobject/sqlobject/ci/53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3
commit 53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 00:51:06 2016 +0300
Run on Circle CI
Circle CI allows caching, but broken FormEncode wheel must be removed
for every major python version.
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..c699d8b
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,8 @@
+dependencies:
+ cache_directories:
+ - ~/.cache/pip
+ override:
+ - sudo apt-get update && sudo apt-get install python-mysqldb python-psycopg2
+ - pip install -U pip
+ - pip install -U tox tox-pyenv
+ - pyenv local 2.6.8 2.7.10 3.4.3
diff --git a/pip-wrapper b/pip-wrapper
new file mode 100755
index 0000000..096e3b7
--- /dev/null
+++ b/pip-wrapper
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+# Remove broken FormEncode wheel
+rm -f ~/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
+
+exec pip install "$@"
diff --git a/tox.ini b/tox.ini
index e8b36e3..bd5a210 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,7 @@ deps =
mysql: mysql-python
mysqlclient: mysqlclient
postgres: psycopg2
+install_command=./pip-wrapper {opts} {packages}
passenv = CI TRAVIS TRAVIS_*
# MySQL test environments
http://sourceforge.net/p/sqlobject/sqlobject/ci/2476dfb15cf3f6c62f4c0c2c25ad59847687d496
commit 2476dfb15cf3f6c62f4c0c2c25ad59847687d496
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 01:30:11 2016 +0300
Group postgres test environments
diff --git a/tox.ini b/tox.ini
index 2ebbadf..e8b36e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,8 @@ envlist = {py26,py27}-mysql,{py26,py27,py34}-postgres,{py26,py27,py34}-sqlite,{p
[testenv]
# Don't fail or warn on uninstalled commands
whitelist_externals =
- psql
mysql
+ psql
# Ensure we cd into sqlobject before running the tests
changedir = ./sqlobject/
basepython =
@@ -51,7 +51,13 @@ commands =
py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
psql -c 'drop database sqlobject_test;' -U postgres
-# sqlite test environments
+[testenv:py34-postgres]
+commands =
+ psql -c 'create database sqlobject_test;' -U postgres
+ py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
+ psql -c 'drop database sqlobject_test;' -U postgres
+
+# SQLite test environments
[testenv:py26-sqlite]
commands =
py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
@@ -64,12 +70,7 @@ commands =
commands =
py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
-[testenv:py34-postgres]
-commands =
- psql -c 'create database sqlobject_test;' -U postgres
- py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
- psql -c 'drop database sqlobject_test;' -U postgres
-
+# Special test environments
[testenv:py34-mysqlclient]
commands =
mysql -e 'create database sqlobject_test;'
http://sourceforge.net/p/sqlobject/sqlobject/ci/dbfad29c3ab865a69d4661e3b2be96f3255e82db
commit dbfad29c3ab865a69d4661e3b2be96f3255e82db
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 01:35:15 2016 +0300
Python 2.6, 2.7 and 3.4 require different minimal versions of FormEncode
diff --git a/tox.ini b/tox.ini
index ce9db44..2ebbadf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,8 @@ basepython =
deps =
pytest
pytest-cov
- FormEncode >= 1.1.1
+ py26,py27: FormEncode >= 1.1.1
+ py34: FormEncode >= 1.3.0
PyDispatcher>=2.0.4
mysql: mysql-python
mysqlclient: mysqlclient
http://sourceforge.net/p/sqlobject/sqlobject/ci/c5b45491c256f3d1bdbfce9775472c59faf8dde2
commit c5b45491c256f3d1bdbfce9775472c59faf8dde2
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 01:25:33 2016 +0300
Require tox >= 1.8
diff --git a/requirements_dev.txt b/requirements_dev.txt
index a3e423e..ca2ff5d 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -2,4 +2,4 @@
pytest
pytest-cov
-tox
+tox >= 1.8
-----------------------------------------------------------------------
Summary of changes:
circle.yml | 8 +++++++
pip-wrapper | 6 +++++
requirements_dev.txt | 2 +-
setup.py | 12 ++++++++++-
tox.ini | 53 +++++++++++++++++++++++++------------------------
5 files changed, 53 insertions(+), 28 deletions(-)
create mode 100644 circle.yml
create mode 100755 pip-wrapper
hooks/post-receive
--
SQLObject development repository
|
