From 5b24518b10a842dcceb4236860ac3e80839f1789 Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Tue, 28 May 2013 10:06:10 +0200 Subject: [PATCH] Renames 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: Iac3c680dd19cabd8ea38598a6e2bb27238030a2d Fixes: bug #1179008 --- MANIFEST.in | 4 ++-- README.rst | 2 +- doc/source/quickstart.rst | 2 +- tools/pip-requires => requirements.txt | 0 run_tests.sh | 2 +- tools/test-requires => test-requirements.txt | 0 tools/install_venv.py | 4 ++-- tox.ini | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename tools/pip-requires => requirements.txt (100%) rename tools/test-requires => test-requirements.txt (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 52a5b08c22..87b5b4fec2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -15,7 +15,7 @@ include tox.ini include bin/less/lessc include doc/Makefile include doc/source/_templates/.placeholder -include tools/pip-requires -include tools/test-requires +include requirements.txt +include test-requirements.txt exclude openstack_dashboard/local/local_settings.py diff --git a/README.rst b/README.rst index edda2b7760..df895d289b 100644 --- a/README.rst +++ b/README.rst @@ -90,7 +90,7 @@ For development, start with the getting started instructions above. Once you have a working virtualenv and all the necessary packages, read on. If dependencies are added to either ``horizon`` or ``openstack-dashboard``, -they should be added to ``tools/pip-requires``. +they should be added to ``requirements.txt``. The ``run_tests.sh`` script invokes tests and analyses on both of these components in its process, and it is what Jenkins uses to verify the diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst index 8aea833681..3c7156c6b2 100644 --- a/doc/source/quickstart.rst +++ b/doc/source/quickstart.rst @@ -74,7 +74,7 @@ built with the ``tools/install_venv.py`` script. That script creates a virtualenv and installs all the necessary packages. If dependencies are added to either ``horizon`` or ``openstack_dashboard``, -they should be added to ``tools/pip-requires``. +they should be added to ``requirements.txt``. .. important:: diff --git a/tools/pip-requires b/requirements.txt similarity index 100% rename from tools/pip-requires rename to requirements.txt diff --git a/run_tests.sh b/run_tests.sh index f921a2c118..0d75951a52 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -6,7 +6,7 @@ set -o errexit # Increment me any time the environment should be rebuilt. # This includes dependncy changes, directory renames, etc. # Simple integer secuence: 1, 2, 3... -environment_version=34 +environment_version=35 #--------------------------------------------------------# function usage { diff --git a/tools/test-requires b/test-requirements.txt similarity index 100% rename from tools/test-requires rename to test-requirements.txt diff --git a/tools/install_venv.py b/tools/install_venv.py index ca245644c8..6e824e78a7 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -32,8 +32,8 @@ import sys ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) VENV = os.path.join(ROOT, '.venv') WITH_VENV = os.path.join(ROOT, 'tools', 'with_venv.sh') -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') def die(message, *args): diff --git a/tox.ini b/tox.ini index 974ba9dbc5..82d2d571e9 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_RED=0.05 NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 -deps = -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = /bin/bash run_tests.sh -N [testenv:pep8]