From 0de3ffa891cabfe8b68cb06de12a98687eec9a33 Mon Sep 17 00:00:00 2001
From: "Ivan A. Melnikov" <imelnikov@griddynamics.com>
Date: Fri, 14 Feb 2014 15:02:06 +0400
Subject: [PATCH] Reduce test and optional requirements to global requirements

Currently SQLAlchemy 0.9 and pyMySQL are not available on OpenStack
PyPi mirror, which means we can't run tests with them at gating.

Related-bug: 1280008
Change-Id: I23a8b7ab31d7fb9f6ae7454c242a2ba854484cea
---
 optional-requirements.txt |  5 ++++-
 tox-tmpl.ini              | 12 +++---------
 tox.ini                   | 24 ++----------------------
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 4c0d387e..aa805d62 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -9,9 +9,12 @@ SQLAlchemy<=0.7.99,<=0.9.99
 alembic>=0.4.1
 
 # Database (sqlalchemy) persistence with MySQL:
-pyMySQL
 MySQL-python
 
+# NOTE(imelnikov): pyMySQL should be here, but for now it's commented out
+# because of https://bugs.launchpad.net/openstack-ci/+bug/1280008
+# pyMySQL
+
 # Database (sqlalchemy) persistence with PostgreSQL:
 psycopg2
 
diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index d8d0a1d1..35d90414 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -58,10 +58,11 @@ deps = -r{toxinidir}/requirements.txt
 
 [testenv:py33]
 basepython = python3.3
-deps = {[testenv:py33-sa9-pymysql]deps}
+deps = {[testenv]deps}
+       SQLAlchemy>=0.7.8,<=0.8.99
 
 [axes]
-python = py26,py27,py33
+python = py26,py27
 sqlalchemy = sa7,sa8,sa9
 mysql = mysql,pymysql
 eventlet = ev,*
@@ -74,15 +75,9 @@ deps = {[testenv]deps}
 basepython = python2.7
 deps = {[testenv]deps}
 
-[axis:python:py33]
-basepython = python3.3
-deps = {[testenv]deps}
-
 [axis:eventlet:ev]
 deps =
     eventlet>=0.13.0
-constraints =
-    !python:py33
 
 [axis:sqlalchemy:sa7]
 deps =
@@ -99,7 +94,6 @@ deps =
 [axis:mysql:mysql]
 deps =
     MySQL-python
-constraints = !python:py33
 
 [axis:mysql:pymysql]
 deps =
diff --git a/tox.ini b/tox.ini
index c463057e..0c21aca7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,9 +32,6 @@ envlist = cover,
     py27-sa9-pymysql,
     py27-sa9-pymysql-ev,
     py33,
-    py33-sa7-pymysql,
-    py33-sa8-pymysql,
-    py33-sa9-pymysql,
     pylint
 
 [testenv]
@@ -84,7 +81,8 @@ deps = -r{toxinidir}/requirements.txt
 
 [testenv:py33]
 basepython = python3.3
-deps = {[testenv:py33-sa9-pymysql]deps}
+deps = {[testenv]deps}
+    SQLAlchemy>=0.7.8,<=0.8.99
 
 [testenv:py26-sa7-mysql-ev]
 deps = {[testenv]deps}
@@ -242,21 +240,3 @@ deps = {[testenv]deps}
     pyMySQL
 basepython = python2.7
 
-[testenv:py33-sa7-pymysql]
-deps = {[testenv]deps}
-    SQLAlchemy<=0.7.99
-    pyMySQL
-basepython = python3.3
-
-[testenv:py33-sa8-pymysql]
-deps = {[testenv]deps}
-    SQLAlchemy>=0.8,<=0.8.99
-    pyMySQL
-basepython = python3.3
-
-[testenv:py33-sa9-pymysql]
-deps = {[testenv]deps}
-    SQLAlchemy>=0.9,<=0.9.99
-    pyMySQL
-basepython = python3.3
-