From: Stephen Finucane <stephen.finucane@intel.com>
Date: Thu, 12 Nov 2015 04:48:29 +0000 (+0000)
Subject: Move requirements into base directory
X-Git-Tag: v1.1.0~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59e47314f6311f2ce03749ab4bb1cb1cafd99222;p=thirdparty%2Fpatchwork.git

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 65f66a13..3bb5da99 100644
--- 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 121917e8..b1219fae 100644
--- 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 823d1dc8..eaad4498 100644
--- 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 =