openstack/taskflow
Code Issues Proposed changes

SQLAlchemy requirements put in order

Browse Source 
- require SQLAlchemy>=0.7.8 if no stricter requirement present;
- allow SQLAlhchemy 0.9.x in python 3.3 and pypy test environments.

Change-Id: I8ee29c66612e8051a26a1633c0973d0dfa048fc4
This commit is contained in:
Ivan A. Melnikov
2014-03-26 14:35:22 +04:00
parent 57c83a5c5d
commit d9e2e202dd
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
optional-requirements.txt
View File

@@ -5,7 +5,7 @@
# so they don't go to requirements.txt. # so they don't go to requirements.txt.
# Database (sqlalchemy) persistence: # Database (sqlalchemy) persistence:
SQLAlchemy<=0.7.99,<=0.9.99 SQLAlchemy>=0.7.8,<=0.9.99
alembic>=0.4.1 alembic>=0.4.1
# Database (sqlalchemy) persistence with MySQL: # Database (sqlalchemy) persistence with MySQL:

6
tox-tmpl.ini
View File

@@ -57,13 +57,13 @@ commands =
[testenv:py33] [testenv:py33]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy>=0.7.8,<=0.8.99 SQLAlchemy>=0.7.8,<=0.9.99
# NOTE(imelnikov): psycopg2 is not supported on pypy # NOTE(imelnikov): psycopg2 is not supported on pypy
[testenv:pypy] [testenv:pypy]
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
SQLAlchemy>=0.7.8,<=0.8.99 SQLAlchemy>=0.7.8,<=0.9.99
alembic>=0.4.1 alembic>=0.4.1
kazoo>=1.3.1 kazoo>=1.3.1
kombu>=2.4.8 kombu>=2.4.8
@@ -88,7 +88,7 @@ deps =
[axis:sqlalchemy:sa7] [axis:sqlalchemy:sa7]
deps = deps =
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
[axis:sqlalchemy:sa8] [axis:sqlalchemy:sa8]
deps = deps =

20
tox.ini
View File

@@ -84,39 +84,39 @@ commands =
[testenv:py33] [testenv:py33]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy>=0.7.8,<=0.8.99 SQLAlchemy>=0.7.8,<=0.9.99
[testenv:pypy] [testenv:pypy]
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
SQLAlchemy>=0.7.8,<=0.8.99 SQLAlchemy>=0.7.8,<=0.9.99
alembic>=0.4.1 alembic>=0.4.1
kazoo>=1.3.1 kazoo>=1.3.1
kombu>=2.4.8 kombu>=2.4.8
[testenv:py26-sa7-mysql-ev] [testenv:py26-sa7-mysql-ev]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
MySQL-python MySQL-python
eventlet>=0.13.0 eventlet>=0.13.0
basepython = python2.6 basepython = python2.6
[testenv:py26-sa7-mysql] [testenv:py26-sa7-mysql]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
MySQL-python MySQL-python
basepython = python2.6 basepython = python2.6
[testenv:py26-sa7-pymysql-ev] [testenv:py26-sa7-pymysql-ev]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
pyMySQL pyMySQL
eventlet>=0.13.0 eventlet>=0.13.0
basepython = python2.6 basepython = python2.6
[testenv:py26-sa7-pymysql] [testenv:py26-sa7-pymysql]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
pyMySQL pyMySQL
basepython = python2.6 basepython = python2.6
@@ -174,27 +174,27 @@ basepython = python2.6
[testenv:py27-sa7-mysql-ev] [testenv:py27-sa7-mysql-ev]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
MySQL-python MySQL-python
eventlet>=0.13.0 eventlet>=0.13.0
basepython = python2.7 basepython = python2.7
[testenv:py27-sa7-mysql] [testenv:py27-sa7-mysql]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
MySQL-python MySQL-python
basepython = python2.7 basepython = python2.7
[testenv:py27-sa7-pymysql-ev] [testenv:py27-sa7-pymysql-ev]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
pyMySQL pyMySQL
eventlet>=0.13.0 eventlet>=0.13.0
basepython = python2.7 basepython = python2.7
[testenv:py27-sa7-pymysql] [testenv:py27-sa7-pymysql]
deps = {[testenv]deps} deps = {[testenv]deps}
SQLAlchemy<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
pyMySQL pyMySQL
basepython = python2.7 basepython = python2.7