diff --git a/.travis.yml b/.travis.yml index d8248552..f5de449e 100644 --- a/.travis.yml +++ b/.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 diff --git a/README b/README index b416697f..c1f6e9d2 100644 --- a/README +++ b/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 diff --git a/requirements-packaging.txt b/requirements-packaging.txt deleted file mode 100644 index b8ec2680..00000000 --- a/requirements-packaging.txt +++ /dev/null @@ -1,3 +0,0 @@ --r requirements.txt -wheel -twine diff --git a/requirements-test-cpython.txt b/requirements-test-cpython.txt deleted file mode 100644 index ed1fe5fc..00000000 --- a/requirements-test-cpython.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements-test.txt -psycopg2 diff --git a/requirements-test-pypy.txt b/requirements-test-pypy.txt deleted file mode 100644 index 30cf14ff..00000000 --- a/requirements-test-pypy.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements-test.txt -psycopg2cffi diff --git a/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index 50f80ce8..00000000 --- a/requirements-test.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements.txt -unittest2 diff --git a/requirements-doc.txt b/requirements/doc.txt similarity index 72% rename from requirements-doc.txt rename to requirements/doc.txt index 17ca0bdc..f0abd14a 100644 --- a/requirements-doc.txt +++ b/requirements/doc.txt @@ -1,4 +1,4 @@ --r requirements.txt +-r install.txt sphinx sphinxcontrib-httpdomain>=1.3.0 sphinx-issues diff --git a/requirements.txt b/requirements/install.txt similarity index 100% rename from requirements.txt rename to requirements/install.txt diff --git a/requirements/packaging.txt b/requirements/packaging.txt new file mode 100644 index 00000000..1d168034 --- /dev/null +++ b/requirements/packaging.txt @@ -0,0 +1,3 @@ +-r install.txt +wheel +twine diff --git a/requirements/test-cpython.txt b/requirements/test-cpython.txt new file mode 100644 index 00000000..29fa16cc --- /dev/null +++ b/requirements/test-cpython.txt @@ -0,0 +1,2 @@ +-r test.txt +psycopg2 diff --git a/requirements/test-pypy.txt b/requirements/test-pypy.txt new file mode 100644 index 00000000..bf9bd541 --- /dev/null +++ b/requirements/test-pypy.txt @@ -0,0 +1,2 @@ +-r test.txt +psycopg2cffi diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 00000000..893c49f0 --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1,2 @@ +-r install.txt +unittest2