From 70747145f9cd8e19280ea9958f6fccc8f95fbe44 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Thu, 30 May 2013 10:40:43 +0800 Subject: Rename requires files to standard names. Rename tools/pip-requires to requirements.txt and tools/test-requires to test-requirements.txt. These are standard files, and tools in the general world are growing intelligence about them. Fixes: bug #1179008 Change-Id: I033876ec304fea97c66365c16bcf0cccaa1d810e --- README.rst | 2 +- requirements.txt | 17 +++++++++++++++++ test-requirements.txt | 24 ++++++++++++++++++++++++ tools/pip-requires | 17 ----------------- tools/test-requires | 24 ------------------------ tox.ini | 4 ++-- 6 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 requirements.txt create mode 100644 test-requirements.txt delete mode 100644 tools/pip-requires delete mode 100644 tools/test-requires diff --git a/README.rst b/README.rst index 33b88ab..c115054 100644 --- a/README.rst +++ b/README.rst @@ -27,5 +27,5 @@ To run tests in virtualenvs (preferred): To run tests in the current environment: - sudo pip install -r tools/pip-requires + sudo pip install -r requirements.txt nosetests diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..067af58 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,17 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 +PasteDeploy==1.5.0 +WebOb==1.2.3 +eventlet>=0.12.0 +greenlet>=0.3.2 +lxml +routes==1.12.3 +iso8601>=0.1.4 +anyjson==0.2.4 +kombu==1.0.4 +argparse +stevedore +SQLAlchemy>=0.7.8,<=0.7.9 +oslo.config>=1.1.0 +qpid-python +six diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000..62c0eea --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,24 @@ +# Packages needed for dev testing +distribute>=0.6.24 + +coverage +fixtures>=0.3.12 +flake8==2.0 +hacking>=0.5.3,<0.6 +mock +mox==0.5.3 +mysql-python +nose +nose-exclude +nosexcover +openstack.nose_plugin +nosehtmloutput +pep8==1.4.5 +pyflakes==0.7.2 +pylint +pyzmq==2.2.0.1 +redis +setuptools-git>=0.4 +sphinx +testtools>=0.9.22 +webtest diff --git a/tools/pip-requires b/tools/pip-requires deleted file mode 100644 index 067af58..0000000 --- a/tools/pip-requires +++ /dev/null @@ -1,17 +0,0 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 -PasteDeploy==1.5.0 -WebOb==1.2.3 -eventlet>=0.12.0 -greenlet>=0.3.2 -lxml -routes==1.12.3 -iso8601>=0.1.4 -anyjson==0.2.4 -kombu==1.0.4 -argparse -stevedore -SQLAlchemy>=0.7.8,<=0.7.9 -oslo.config>=1.1.0 -qpid-python -six diff --git a/tools/test-requires b/tools/test-requires deleted file mode 100644 index 62c0eea..0000000 --- a/tools/test-requires +++ /dev/null @@ -1,24 +0,0 @@ -# Packages needed for dev testing -distribute>=0.6.24 - -coverage -fixtures>=0.3.12 -flake8==2.0 -hacking>=0.5.3,<0.6 -mock -mox==0.5.3 -mysql-python -nose -nose-exclude -nosexcover -openstack.nose_plugin -nosehtmloutput -pep8==1.4.5 -pyflakes==0.7.2 -pylint -pyzmq==2.2.0.1 -redis -setuptools-git>=0.4 -sphinx -testtools>=0.9.22 -webtest diff --git a/tox.ini b/tox.ini index 93ccb1e..946decd 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,8 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_STDOUT=1 -deps = -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python tools/patch_tox_venv.py nosetests --with-doctest --exclude-dir=tests/testmods {posargs} -- cgit