Merge 65da543 into eecba2a

.travis.yml

@@ -49,9 +49,9 @@ before_install:
   # file we will use.
   - |
     if [[ "$TRAVIS_PYTHON_VERSION" == "pypy" ]]; then
-        export REQUIREMENTS=requirements-test-pypy.txt
+        export REQUIREMENTS=requirements/test-pypy.txt
     else
-        export REQUIREMENTS=requirements-test-cpython.txt
+        export REQUIREMENTS=requirements/test-cpython.txt
     fi
 
 install:
@@ -70,7 +70,7 @@ install:
       pip install future
     fi
   # Install the requirements specific to Travis tests.
-  - pip install -r requirements-doc.txt
+  - pip install -r requirements/doc.txt
   - pip install coveralls
   # Install Flask-Restless so that it is available for the documentation build.
   - python setup.py install

README

@@ -87,10 +87,10 @@ This application requires the following libraries to be installed:
 * [mimerender][9] version 0.5.2 or greater
 
 These requirements (and some additional optional packages) are also listed in
-the `requirements.txt` file. Using `pip` is probably the easiest way to install
-these:
+the `requirements/install.txt` file. Using `pip` is probably the easiest way to
+install these:
 
-    pip install -r requirements.txt
+    pip install -r requirements/install.txt
 
 [8]: https://labix.org/python-dateutil
 [9]: https://github.com/martinblech/mimerender
@@ -111,11 +111,11 @@ For information on how to use this extension, build the documentation here or
 
 If your Python interpreter is `cpython`, run:
 
-    pip install -r requirements-test-cpython.txt
+    pip install -r requirements/test-cpython.txt
 
 Otherwise, if your Python interpreter is `pypy`, run:
 
-    pip install -r requirements-test-pypy.txt
+    pip install -r requirements/test-pypy.txt
 
 To run the tests:
 
@@ -129,10 +129,10 @@ the documentation:
 * [Sphinx][10]
 * [sphinxcontrib-httpdomain][11], version 1.1.7 or greater
 
-These requirements are also listed in the `requirements-doc.txt` file. Using
+These requirements are also listed in the `requirements/doc.txt` file. Using
 `pip` is probably the easiest way to install these:
 
-    pip install -r requirements-doc.txt
+    pip install -r requirements/doc.txt
 
 The documentation is written for Sphinx in [reStructuredText][12] files in the
 `docs/` directory. Documentation for each class and function is provided in the

requirements-doc.txt → requirements/doc.txt

@@ -1,4 +1,4 @@
--r requirements.txt
+-r install.txt
 sphinx
 sphinxcontrib-httpdomain>=1.3.0
 sphinx-issues

requirements/packaging.txt

@@ -0,0 +1,3 @@
+-r install.txt
+wheel
+twine

requirements/test-cpython.txt

@@ -0,0 +1,2 @@
+-r test.txt
+psycopg2

requirements/test-pypy.txt

@@ -0,0 +1,2 @@
+-r test.txt
+psycopg2cffi

requirements/test.txt

@@ -0,0 +1,2 @@
+-r install.txt
+unittest2