summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Finucane <stephenfinucane@hotmail.com>2015-04-07 22:20:51 +0100
committerJeremy Kerr <jk@ozlabs.org>2015-05-03 13:46:52 +0800
commitda4f6578b4d4961a3f759eea7767941e2cce65f6 (patch)
treedd37b317e67eb9310e8e510cc37a38d34f6c53d6
parent2c57a30465d96e6434f8715d650824c8ed8cfd5a (diff)
downloadpatchwork-da4f6578b4d4961a3f759eea7767941e2cce65f6.tar.bz2
patchwork-da4f6578b4d4961a3f759eea7767941e2cce65f6.tar.xz
docs: Use 'prod' and 'dev' requirements files
Django 1.5 and 1.6 are no longer supported. https://docs.djangoproject.com/en/dev/internals/release-process/ As a result, one should not encourage people to develop and/or deploy against these versions - the latest version of Django supported by patchwork (currently 1.7) should be used for both. In addition, rather than duplicating shared requirements for 'dev' and 'prod' environments, move all shared requirements to a "base" file. Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--docs/requirements-base.txt2
-rw-r--r--docs/requirements-dev.txt1
-rw-r--r--docs/requirements-django-1.5-mysql.txt3
-rw-r--r--docs/requirements-django-1.6-mysql.txt3
-rw-r--r--docs/requirements-django-1.7-mysql.txt3
-rw-r--r--docs/requirements-prod.txt2
6 files changed, 5 insertions, 9 deletions
diff --git a/docs/requirements-base.txt b/docs/requirements-base.txt
new file mode 100644
index 0000000..77dc829
--- /dev/null
+++ b/docs/requirements-base.txt
@@ -0,0 +1,2 @@
+python-dateutil==1.5
+Django<1.8,>=1.7
diff --git a/docs/requirements-dev.txt b/docs/requirements-dev.txt
new file mode 100644
index 0000000..eee6463
--- /dev/null
+++ b/docs/requirements-dev.txt
@@ -0,0 +1 @@
+-r requirements-base.txt
diff --git a/docs/requirements-django-1.5-mysql.txt b/docs/requirements-django-1.5-mysql.txt
deleted file mode 100644
index ea9a77e..0000000
--- a/docs/requirements-django-1.5-mysql.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-python-dateutil==1.5
-Django==1.5.10
-MySQL-python==1.2.5
diff --git a/docs/requirements-django-1.6-mysql.txt b/docs/requirements-django-1.6-mysql.txt
deleted file mode 100644
index 6d39511..0000000
--- a/docs/requirements-django-1.6-mysql.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-python-dateutil==1.5
-Django==1.6.7
-MySQL-python==1.2.5
diff --git a/docs/requirements-django-1.7-mysql.txt b/docs/requirements-django-1.7-mysql.txt
deleted file mode 100644
index 21fa438..0000000
--- a/docs/requirements-django-1.7-mysql.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-python-dateutil==1.5
-Django==1.7
-MySQL-python==1.2.5
diff --git a/docs/requirements-prod.txt b/docs/requirements-prod.txt
new file mode 100644
index 0000000..24f97ce
--- /dev/null
+++ b/docs/requirements-prod.txt
@@ -0,0 +1,2 @@
+MySQL-python==1.2.5
+-r requirements-base.txt