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 <[email protected]> --- docs/development.md | 2 +- docs/installation.md | 2 +- docs/requirements-base.txt | 2 -- docs/requirements-dev.txt | 2 -- docs/requirements-prod.txt | 2 -- requirements-base.txt | 2 ++ requirements-dev.txt | 2 ++ requirements-prod.txt | 2 ++ tox.ini | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 docs/requirements-base.txt delete mode 100644 docs/requirements-dev.txt delete mode 100644 docs/requirements-prod.txt create mode 100644 requirements-base.txt create mode 100644 requirements-dev.txt create mode 100644 requirements-prod.txt diff --git a/docs/development.md b/docs/development.md index 65f66a1..3bb5da9 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 121917e..b1219fa 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/docs/requirements-base.txt deleted file mode 100644 index 58b34ec..0000000 --- a/docs/requirements-base.txt +++ /dev/null @@ -1,2 +0,0 @@ -MySQL-python==1.2.5 -python-dateutil==1.5 diff --git a/docs/requirements-dev.txt b/docs/requirements-dev.txt deleted file mode 100644 index 12b8bef..0000000 --- a/docs/requirements-dev.txt +++ /dev/null @@ -1,2 +0,0 @@ --r requirements-base.txt -selenium diff --git a/docs/requirements-prod.txt b/docs/requirements-prod.txt deleted file mode 100644 index f2c440a..0000000 --- a/docs/requirements-prod.txt +++ /dev/null @@ -1,2 +0,0 @@ -Django<1.9,>=1.8 --r requirements-base.txt diff --git a/requirements-base.txt b/requirements-base.txt new file mode 100644 index 0000000..58b34ec --- /dev/null +++ b/requirements-base.txt @@ -0,0 +1,2 @@ +MySQL-python==1.2.5 +python-dateutil==1.5 diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..12b8bef --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,2 @@ +-r requirements-base.txt +selenium diff --git a/requirements-prod.txt b/requirements-prod.txt new file mode 100644 index 0000000..f2c440a --- /dev/null +++ b/requirements-prod.txt @@ -0,0 +1,2 @@ +Django<1.9,>=1.8 +-r requirements-base.txt diff --git a/tox.ini b/tox.ini index 823d1dc..eaad449 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 = -- 2.0.0 _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
