We can now use PyMySQL in py3.x tests

The requirement for PyMySQL got merged into the requirements
repo, so now instead of just testing sqlite (or postgres) in py3.x
we can now test against the mysql instance that should exist in the
test environments (just like we test with MySQL-python in py2.x).

Change-Id: I6e48df78d20389d65de8210c6157abb99f52d7dd
This commit is contained in:
Joshua Harlow 2014-10-14 12:56:00 -07:00
parent 1caaecc5d6
commit bcae66b21c
2 changed files with 7 additions and 0 deletions

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

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