Move requirements into base directory

These are documentation and therefore don't belong in the documentation
directory. The base directory is the usual location for these files, so
move them there.

Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>

diff --git a/docs/development.md b/docs/development.md
index 65f66a13dd584f58394c0035295c73358b8fa899..3bb5da9964d5db1d8e5692e416e358f3020a1521 100644 (file)
--- a/docs/development.md
+++ b/docs/development.md
@@ -36,7 +36,7 @@ used to test patchwork against several versions of Django.
    text file and install them in one go. One can maintain such a list of
    dependencies per interesting configuration.
 
-        (django-1.8)$ pip install -r docs/requirements-dev.txt
+        (django-1.8)$ pip install -r requirements-dev.txt
 
    You will also need to install a version of Django - we don't install this
    by default to allow development against multiple versions of Django. This

diff --git a/docs/installation.md b/docs/installation.md
index 121917e81ca420ba811bcfa2dc5cb975d05d491b..b1219faeb9b0dd95b5de207bd7c13603de7a3541 100644 (file)
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -21,7 +21,7 @@ in brackets):
 [mod_python]: http://modpython.org/
 [Gunicorn]: http://gunicorn.org/
 [nginx]: http://nginx.org/
-[requirements.txt]: ./docs
+[requirements.txt]: ./requirements-prod.txt
 
 ## Database Configuration
 

diff --git a/docs/requirements-base.txt b/requirements-base.txt
similarity index 100%
rename from docs/requirements-base.txt
rename to requirements-base.txt

diff --git a/docs/requirements-dev.txt b/requirements-dev.txt
similarity index 100%
rename from docs/requirements-dev.txt
rename to requirements-dev.txt

diff --git a/docs/requirements-prod.txt b/requirements-prod.txt
similarity index 100%
rename from docs/requirements-prod.txt
rename to requirements-prod.txt

diff --git a/tox.ini b/tox.ini
index 823d1dc8e3f741d005374f03b5699f52d30edc0b..eaad4498bf8dce1ca793be52175a667a865d21d4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ skipsdist = True
 basepython =
     py27: python2.7
 deps =
-    -r{toxinidir}/docs/requirements-dev.txt
+    -r{toxinidir}/requirements-dev.txt
     django16: django>=1.6,<1.7
     django17: django>=1.7,<1.8
     django18: django>=1.8,<1.9
@@ -34,14 +34,14 @@ exclude = ./patchwork/tests
 basepython = python2.7
 deps =
     pylint
-    -r{toxinidir}/docs/requirements-prod.txt
+    -r{toxinidir}/requirements-prod.txt
 commands = pylint patchwork --rcfile=pylint.rc
 
 [testenv:coverage]
 basepython = python2.7
 deps =
     coverage
-    -r{toxinidir}/docs/requirements-prod.txt
+    -r{toxinidir}/requirements-prod.txt
 setenv =
     DJANGO_SETTINGS_MODULE = patchwork.settings.dev
 commands =