openstack/taskflow
Code Issues Proposed changes

Merge "We can now use PyMySQL in py3.x tests"

Browse Source
This commit is contained in:
Jenkins 2014-10-18 19:38:39 +00:00 committed by Gerrit Code Review
commit 45ba27ed1a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test-requirements.txt
View File

@ -19,6 +19,11 @@ kazoo>=1.3.1
# NOTE(harlowja): SQLAlchemy isn't listed here currently but is
# listed in our tox.ini files so that we can test multiple varying SQLAlchemy
# versions to ensure a wider range of compatibility.
#
# Explict mysql drivers are also not listed here so that we can test against
# PyMySQL or MySQL-python depending on the python version the tests are being
# ran in (MySQL-python is currently preferred for 2.x environments, since
# it has been used in openstack for the longest).
alembic>=0.6.4
psycopg2

2
tox.ini
View File

@ -84,11 +84,13 @@ commands =
deps = {[testenv]deps}
-r{toxinidir}/requirements-py3.txt
SQLAlchemy>=0.7.8,<=0.9.99
PyMySQL>=0.6.2
[testenv:py34]
deps = {[testenv]deps}
-r{toxinidir}/requirements-py3.txt
SQLAlchemy>=0.7.8,<=0.9.99
PyMySQL>=0.6.2
[testenv:py26-sa7-mysql]
basepython = python2.6