From aea387bcb33188a5bed5e3f32f5e2e1682cb5f69 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Thu, 12 Jun 2014 16:10:12 -0700 Subject: [PATCH] Add script for creating test virtualenv so that tests are not reliant on /home/vineet/.virtualenvs/equimapper --- .gitignore | 1 + tests/pipdeptree_tests.py | 4 +-- .../{pkgs.pickle => virtualenvs/dummy.pickle} | 34 +++++++++---------- tests/virtualenvs/dummy_requirements.txt | 16 +++++++++ tox.ini | 13 ++++++- 5 files changed, 48 insertions(+), 20 deletions(-) rename tests/{pkgs.pickle => virtualenvs/dummy.pickle} (87%) create mode 100644 tests/virtualenvs/dummy_requirements.txt diff --git a/.gitignore b/.gitignore index 56032d1..ced7f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ __pycache__ build/ dist/ .tox/ +tests/virtualenvs/equimapper/ diff --git a/tests/pipdeptree_tests.py b/tests/pipdeptree_tests.py index fb592ba..f081eba 100644 --- a/tests/pipdeptree_tests.py +++ b/tests/pipdeptree_tests.py @@ -5,7 +5,7 @@ from pipdeptree import (req_version, render_tree, top_pkg_src, non_top_pkg_src) -with open('tests/pkgs.pickle', 'rb') as f: +with open('tests/virtualenvs/dummy.pickle', 'rb') as f: pkgs = pickle.load(f) @@ -70,5 +70,5 @@ def test_render_tree_freeze(): lines = set(tree_str.split('\n')) assert 'Flask-Script==0.6.6' in lines assert ' - SQLAlchemy==0.9.1' in lines - assert '-e git+git@github.com:naiquevin/lookupy.git@cdbe30c160e1c29802df75e145ea4ad903c05386#egg=Lookupy-master' in lines + assert '-e git+https://github.com/naiquevin/lookupy.git@cdbe30c160e1c29802df75e145ea4ad903c05386#egg=Lookupy-master' in lines assert 'itsdangerous==0.23' not in lines diff --git a/tests/pkgs.pickle b/tests/virtualenvs/dummy.pickle similarity index 87% rename from tests/pkgs.pickle rename to tests/virtualenvs/dummy.pickle index e711218..784cc03 100644 --- a/tests/pkgs.pickle +++ b/tests/virtualenvs/dummy.pickle @@ -30,7 +30,7 @@ sS'platform' p14 NsS'location' p15 -S'/home/vineet/.virtualenvs/equimapper/src/lookupy' +S'.tox/dummy/src/lookupy' p16 sS'py_version' p17 @@ -45,7 +45,7 @@ p21 g16 sS'egg_info' p22 -S'/home/vineet/.virtualenvs/equimapper/src/lookupy/Lookupy.egg-info' +S'.tox/dummy/src/lookupy/Lookupy.egg-info' p23 sbsbag1 (g2 @@ -66,7 +66,7 @@ S'2.5.2' p29 sg14 Nsg15 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages' +S'.tox/dummy/lib/python2.7/site-packages' p30 sg17 S'2.7' @@ -79,7 +79,7 @@ p32 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/psycopg2-2.5.2-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/psycopg2-2.5.2-py2.7.egg-info' p34 sbsbag1 (g2 @@ -112,7 +112,7 @@ p42 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/Werkzeug-0.9.4-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/Werkzeug-0.9.4-py2.7.egg-info' p44 sbsbag1 (g2 @@ -145,7 +145,7 @@ p52 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/Flask-0.10.1-py2.7.egg-info' p54 sbsbag1 (g2 @@ -178,7 +178,7 @@ p62 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/Mako-0.9.1-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/Mako-0.9.1-py2.7.egg-info' p64 sbsbag1 (g2 @@ -211,7 +211,7 @@ p72 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/MarkupSafe-0.18-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/MarkupSafe-0.18-py2.7.egg-info' p74 sbsbag1 (g2 @@ -244,7 +244,7 @@ p82 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/Flask_Script-0.6.6-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/Flask_Script-0.6.6-py2.7.egg-info' p84 sbsbag1 (g2 @@ -277,7 +277,7 @@ p92 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/alembic-0.6.2-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/alembic-0.6.2-py2.7.egg-info' p94 sbsbag1 (g2 @@ -1360,7 +1360,7 @@ p501 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/ipython-2.0.0-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/ipython-2.0.0-py2.7.egg-info' p503 sbsbag1 (g2 @@ -1393,7 +1393,7 @@ p511 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/itsdangerous-0.23-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/itsdangerous-0.23-py2.7.egg-info' p513 sbsbag1 (g2 @@ -1426,7 +1426,7 @@ p521 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/SQLAlchemy-0.9.1-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/SQLAlchemy-0.9.1-py2.7.egg-info' p523 sbsbag1 (g2 @@ -1459,7 +1459,7 @@ p531 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/slugify-0.0.1-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/slugify-0.0.1-py2.7.egg-info' p533 sbsbag1 (g2 @@ -1492,7 +1492,7 @@ p541 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/Jinja2-2.7.2-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/Jinja2-2.7.2-py2.7.egg-info' p543 sbsbag1 (g2 @@ -1525,6 +1525,6 @@ p551 g21 g30 sg22 -S'/home/vineet/.virtualenvs/equimapper/lib/python2.7/site-packages/redis-2.9.1-py2.7.egg-info' +S'.tox/dummy/lib/python2.7/site-packages/redis-2.9.1-py2.7.egg-info' p553 -sbsba. \ No newline at end of file +sbsba. diff --git a/tests/virtualenvs/dummy_requirements.txt b/tests/virtualenvs/dummy_requirements.txt new file mode 100644 index 0000000..e30a0d0 --- /dev/null +++ b/tests/virtualenvs/dummy_requirements.txt @@ -0,0 +1,16 @@ +Flask==0.10.1 +Flask-Script==0.6.6 +Jinja2==2.7.2 +-e git+https://github.com/naiquevin/lookupy.git@cdbe30c160e1c29802df75e145ea4ad903c05386#egg=Lookupy +Mako==0.9.1 +MarkupSafe==0.18 +SQLAlchemy==0.9.1 +Werkzeug==0.9.4 +alembic==0.6.2 +gnureadline==6.3.3 +ipython==2.0.0 +itsdangerous==0.23 +psycopg2==2.5.2 +redis==2.9.1 +slugify==0.0.1 +wsgiref==0.1.2 diff --git a/tox.ini b/tox.ini index c3c1844..4db0a70 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,20 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py32 +envlist = dummy, py27, py32 [testenv] commands = nosetests tests/ deps = nose + + +# --------------------------------------------------------------------------- +# Dummy virtualenvs that get created and used by the tests +# These have no test commands +# These virtualenvs simply get created and use in other testenvs +# --------------------------------------------------------------------------- + +[testenv:dummy] +deps = -r{toxinidir}/tests/virtualenvs/dummy_requirements.txt +commands =