From 5740920bb392ec6e0bc5f2e3949a37b3bf8519d9 Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Wed, 22 May 2013 20:12:08 +0000 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. Change-Id: I68ece8406fb1d4e082a42db8e76e17b1aaa7e775 Fixes: bug #1179008 --- doc/source/devref/development.environment.rst | 2 +- doc/source/devref/unit_tests.rst | 2 +- requirements.txt | 33 +++++++++++++++++++++++++++ test-requirements.txt | 22 ++++++++++++++++++ tools/install_venv.py | 4 ++-- tools/patch_tox_venv.py | 4 ++-- tools/pip-requires | 33 --------------------------- tools/test-requires | 22 ------------------ tox.ini | 4 ++-- 9 files changed, 63 insertions(+), 63 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/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index 8c6e03323..79c368d3a 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -123,7 +123,7 @@ You can manually install the virtual environment instead of having python tools/install_venv.py This will install all of the Python packages listed in the -``tools/pip-requires`` file into your virtualenv. There will also be some +``requirements.txt`` file into your virtualenv. There will also be some additional packages (pip, distribute, greenlet) that are installed by the ``tools/install_venv.py`` file into the virutalenv. diff --git a/doc/source/devref/unit_tests.rst b/doc/source/devref/unit_tests.rst index 8033406f0..b6549bd00 100644 --- a/doc/source/devref/unit_tests.rst +++ b/doc/source/devref/unit_tests.rst @@ -100,7 +100,7 @@ If you wish to recreate the virtualenv, call ``run_tests.sh`` with the flag:: -f, --force Recreating the virtualenv is useful if the package dependencies have changed -since the virtualenv was last created. If the ``tools/pip-requires`` or +since the virtualenv was last created. If the ``requirements.txt`` or ``tools/install_venv.py`` files have changed, it's a good idea to recreate the virtualenv. diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..7db3a2a0b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,33 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 +SQLAlchemy>=0.7.8,<0.7.99 +Cheetah>=2.4.4 +amqplib>=0.6.1 +anyjson>=0.2.4 +argparse +boto +eventlet>=0.9.17 +kombu>=1.0.4 +lxml>=2.3 +routes>=1.12.3 +WebOb==1.2.3 +greenlet>=0.3.1 +PasteDeploy>=1.5.0 +paste +sqlalchemy-migrate>=0.7.2 +netaddr>=0.7.6 +suds>=0.4 +paramiko +pyasn1 +Babel>=0.9.6 +iso8601>=0.1.4 +httplib2 +requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271 +python-cinderclient>=1.0.1 +python-quantumclient>=2.2.0,<3.0.0 +python-glanceclient>=0.5.0,<2 +python-keystoneclient>=0.2.0 +six +stevedore>=0.7 +websockify<0.4 +oslo.config>=1.1.0 diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 000000000..1bf372b69 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,22 @@ +# Packages needed for dev testing +distribute>=0.6.24 + +# Install bounded pep8/pyflakes first, then let flake8 install +pep8==1.4.5 +pyflakes==0.7.2 +flake8==2.0 +hacking>=0.5.3,<0.6 + +coverage>=3.6 +discover +feedparser +fixtures>=0.3.12 +mox==0.5.3 +MySQL-python +psycopg2 +pylint==0.25.2 +python-subunit +setuptools_git>=0.4 +sphinx>=1.1.2 +testrepository>=0.0.13 +testtools>=0.9.27 diff --git a/tools/install_venv.py b/tools/install_venv.py index dbc7333ec..8d30676df 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -56,8 +56,8 @@ def main(argv): if os.environ.get('venv'): venv = os.environ['venv'] - pip_requires = os.path.join(root, 'tools', 'pip-requires') - test_requires = os.path.join(root, 'tools', 'test-requires') + pip_requires = os.path.join(root, 'requirements.txt') + test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) project = 'Nova' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index 6ae6c2e7f..ebbf766bb 100644 --- a/tools/patch_tox_venv.py +++ b/tools/patch_tox_venv.py @@ -25,8 +25,8 @@ def main(argv): venv = os.environ['VIRTUAL_ENV'] - pip_requires = os.path.join(root, 'tools', 'pip-requires') - test_requires = os.path.join(root, 'tools', 'test-requires') + pip_requires = os.path.join(root, 'requirements.txt') + test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) project = 'nova' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, diff --git a/tools/pip-requires b/tools/pip-requires deleted file mode 100644 index 7db3a2a0b..000000000 --- a/tools/pip-requires +++ /dev/null @@ -1,33 +0,0 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 -SQLAlchemy>=0.7.8,<0.7.99 -Cheetah>=2.4.4 -amqplib>=0.6.1 -anyjson>=0.2.4 -argparse -boto -eventlet>=0.9.17 -kombu>=1.0.4 -lxml>=2.3 -routes>=1.12.3 -WebOb==1.2.3 -greenlet>=0.3.1 -PasteDeploy>=1.5.0 -paste -sqlalchemy-migrate>=0.7.2 -netaddr>=0.7.6 -suds>=0.4 -paramiko -pyasn1 -Babel>=0.9.6 -iso8601>=0.1.4 -httplib2 -requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271 -python-cinderclient>=1.0.1 -python-quantumclient>=2.2.0,<3.0.0 -python-glanceclient>=0.5.0,<2 -python-keystoneclient>=0.2.0 -six -stevedore>=0.7 -websockify<0.4 -oslo.config>=1.1.0 diff --git a/tools/test-requires b/tools/test-requires deleted file mode 100644 index 1bf372b69..000000000 --- a/tools/test-requires +++ /dev/null @@ -1,22 +0,0 @@ -# Packages needed for dev testing -distribute>=0.6.24 - -# Install bounded pep8/pyflakes first, then let flake8 install -pep8==1.4.5 -pyflakes==0.7.2 -flake8==2.0 -hacking>=0.5.3,<0.6 - -coverage>=3.6 -discover -feedparser -fixtures>=0.3.12 -mox==0.5.3 -MySQL-python -psycopg2 -pylint==0.25.2 -python-subunit -setuptools_git>=0.4 -sphinx>=1.1.2 -testrepository>=0.0.13 -testtools>=0.9.27 diff --git a/tox.ini b/tox.ini index 4d6f3b0a7..2515581ed 100644 --- a/tox.ini +++ b/tox.ini @@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=C -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 python setup.py testr --slowest --testr-args='{posargs}' -- cgit