summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJiri Tomasek <jtomasek@redhat.com>2013-05-28 10:06:10 +0200
committerJiri Tomasek <jtomasek@redhat.com>2013-05-29 12:07:35 +0200
commit5b24518b10a842dcceb4236860ac3e80839f1789 (patch)
tree12eb893281318018f401e96b5cc0715a09f3ba2a /tools
parent4b9cd0040dc6a77fbc1e91e3bec71b5bf515e1c1 (diff)
downloadtuskar-ui-5b24518b10a842dcceb4236860ac3e80839f1789.tar.gz
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
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py4
-rw-r--r--tools/pip-requires20
-rw-r--r--tools/test-requires22
3 files changed, 2 insertions, 44 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py
index ca245644..6e824e78 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/tools/pip-requires b/tools/pip-requires
deleted file mode 100644
index eb6e617a..00000000
--- a/tools/pip-requires
+++ /dev/null
@@ -1,20 +0,0 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
-
-# Horizon Core Requirements
-Django>=1.4,<1.6
-django_compressor
-django_openstack_auth>=1.0.8
-iso8601>=0.1.4
-netaddr
-python-cinderclient>=1.0.2,<2.0.0
-python-glanceclient<2
-python-heatclient>=0.2.2
-python-keystoneclient>=0.2,<0.3
-python-novaclient>=2.12.0,<3
-python-quantumclient>=2.2.0,<3.0.0
-python-swiftclient>1.1,<2
-pytz
-
-# Horizon Utility Requirements
-lockfile # for SECURE_KEY generation
diff --git a/tools/test-requires b/tools/test-requires
deleted file mode 100644
index e027cee3..00000000
--- a/tools/test-requires
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-
-# Testing Requirements
-coverage
-django-nose
-mox
-nose
-nose-exclude
-nosexcover
-openstack.nose_plugin
-nosehtmloutput
-selenium
-
-# Docs Requirements
-sphinx
-docutils==0.9.1 # for bug 1091333, remove after sphinx >1.1.3 is released.