Break requirements file into main and development requirements. Move from...

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

@@ -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
 

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::
 

dev-requirements.txt

+# Optional requirements used by test cases
+pycurl
+
+# For testing
+nose
+webtest
+coverage
+
+# For dev
+sphinx

tools/pip-requires → requirements.txt

@@ -6,11 +6,3 @@ simplejson
 webob
 pyOpenSSL
 psutil
-
-# For testing
-nose
-webtest
-coverage
-
-# For dev
-sphinx
\ No newline at end of file

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