From 284141e5ee8da57baadf5ee41e134cd831c9037a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 27 Aug 2013 13:33:04 -0500
Subject: [PATCH] Break requirements file into main and development
requirements. Move from tools/pip-requires to requirements.txt and
dev-requirements.txt. Update README and travis configuration to reflect
changes.
---
.travis.yml | 3 ++-
README.rst | 4 ++--
dev-requirements.txt | 10 ++++++++++
tools/pip-requires => requirements.txt | 8 --------
tools/install_venv.py | 2 +-
5 files changed, 15 insertions(+), 12 deletions(-)
create mode 100644 dev-requirements.txt
rename tools/pip-requires => requirements.txt (57%)
mode change 100755 => 100644
diff --git a/.travis.yml b/.travis.yml
index d2f210b0..f79eeab9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ python:
- 3.3
install:
- sudo apt-get install libxml2-dev libxslt1-dev libcurl3 python-pycurl
- - pip install -r tools/pip-requires --use-mirrors
+ - pip install -r requirements.txt --use-mirrors
+ - pip install -r dev-requirements.txt --use-mirrors
script: nosetests
diff --git a/README.rst b/README.rst
index a388f69e..137d04e0 100644
--- a/README.rst
+++ b/README.rst
@@ -78,7 +78,7 @@ From a Windows terminal::
4. Install required dependencies into this virtual environment::
- pip install -r tools/pip-requires
+ pip install -r requirements.txt
easy_install
------------
@@ -198,7 +198,7 @@ of your running LWR application)::
This project is distributed with unit tests, the following command
will install the needed python components to run these tests.::
- easy_install nose coverage webtest
+ pip install -r dev-requirements.txt
The following command will then run these tests::
diff --git a/dev-requirements.txt b/dev-requirements.txt
new file mode 100644
index 00000000..1a1dd5fc
--- /dev/null
+++ b/dev-requirements.txt
@@ -0,0 +1,10 @@
+# Optional requirements used by test cases
+pycurl
+
+# For testing
+nose
+webtest
+coverage
+
+# For dev
+sphinx
diff --git a/tools/pip-requires b/requirements.txt
old mode 100755
new mode 100644
similarity index 57%
rename from tools/pip-requires
rename to requirements.txt
index 5e4994a2..62f565d4
--- a/tools/pip-requires
+++ b/requirements.txt
@@ -6,11 +6,3 @@ simplejson
webob
pyOpenSSL
psutil
-
-# For testing
-nose
-webtest
-coverage
-
-# For dev
-sphinx
\ No newline at end of file
diff --git a/tools/install_venv.py b/tools/install_venv.py
index d387f1ad..18a20a2b 100755
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -29,7 +29,7 @@ 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')
+PIP_REQUIRES = os.path.join(ROOT, 'requirements.txt')
def die(message, *args):
print >> sys.stderr, message % args
--
GitLab