From b58aae0e9f278f7e5b98d4fbee08fe2a13ead358 Mon Sep 17 00:00:00 2001
From: "Ivan A. Melnikov" <imelnikov@griddynamics.com>
Date: Mon, 17 Feb 2014 16:41:07 +0400
Subject: [PATCH] Add tox environment for pypy

Because some of our dependencies (notably psycopg2) are not supported
by pypy we have to add special tox evnironment explicitly.

Partial-bug: 1293585
Change-Id: I6e3fd38e05dc5a388894687b51234934cae6a6b7
---
 tox-tmpl.ini | 12 +++++++++---
 tox.ini      | 14 ++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tox-tmpl.ini b/tox-tmpl.ini
index 2419f495d..d14a562f1 100644
--- a/tox-tmpl.ini
+++ b/tox-tmpl.ini
@@ -45,11 +45,9 @@ exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools
 # NOTE(imelnikov): pyXY envs are considered to be default, so they must have
 # richest set of test requirements
 [testenv:py26]
-basepython = python2.6
 deps = {[testenv:py26-sa7-mysql-ev]deps}
 
 [testenv:py27]
-basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/optional-requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -58,10 +56,18 @@ commands =
     sphinx-build -b doctest doc/source doc/build
 
 [testenv:py33]
-basepython = python3.3
 deps = {[testenv]deps}
        SQLAlchemy>=0.7.8,<=0.8.99
 
+# NOTE(imelnikov): psycopg2 is not supported on pypy
+[testenv:pypy]
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+       SQLAlchemy>=0.7.8,<=0.8.99
+       alembic>=0.4.1
+       kazoo>=1.3.1
+       kombu>=2.4.8
+
 [axes]
 python = py26,py27
 sqlalchemy = sa7,sa8,sa9
diff --git a/tox.ini b/tox.ini
index 8e873e784..fc5afa1aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,8 @@ envlist = cover,
     py27-sa9-pymysql,
     py27-sa9-pymysql-ev,
     py33,
-    pylint
+    pylint,
+    pypy
 
 [testenv]
 usedevelop = True
@@ -71,11 +72,9 @@ builtins = _
 exclude = .venv,.tox,dist,doc,./taskflow/openstack/common,*egg,.git,build,tools
 
 [testenv:py26]
-basepython = python2.6
 deps = {[testenv:py26-sa7-mysql-ev]deps}
 
 [testenv:py27]
-basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
     -r{toxinidir}/optional-requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -84,10 +83,17 @@ commands =
     sphinx-build -b doctest doc/source doc/build
 
 [testenv:py33]
-basepython = python3.3
 deps = {[testenv]deps}
     SQLAlchemy>=0.7.8,<=0.8.99
 
+[testenv:pypy]
+deps = -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+    SQLAlchemy>=0.7.8,<=0.8.99
+    alembic>=0.4.1
+    kazoo>=1.3.1
+    kombu>=2.4.8
+
 [testenv:py26-sa7-mysql-ev]
 deps = {[testenv]deps}
     SQLAlchemy<=0.7.99