diff mbox

[v5,4/8] docs: Use 'prod' and 'dev' requirements files

Message ID BLU437-SMTP6382E95DFB83A775796AAEA3FD0@phx.gbl
State Accepted
Headers show

Commit Message

Stephen Finucane April 7, 2015, 9:20 p.m. UTC
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>
---
 docs/requirements-base.txt             | 2 ++
 docs/requirements-dev.txt              | 1 +
 docs/requirements-django-1.5-mysql.txt | 3 ---
 docs/requirements-django-1.6-mysql.txt | 3 ---
 docs/requirements-django-1.7-mysql.txt | 3 ---
 docs/requirements-prod.txt             | 2 ++
 6 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 docs/requirements-base.txt
 create mode 100644 docs/requirements-dev.txt
 delete mode 100644 docs/requirements-django-1.5-mysql.txt
 delete mode 100644 docs/requirements-django-1.6-mysql.txt
 delete mode 100644 docs/requirements-django-1.7-mysql.txt
 create mode 100644 docs/requirements-prod.txt
diff mbox

Patch

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