From: Stephen Finucane Date: Tue, 7 Apr 2015 21:20:51 +0000 (+0100) Subject: docs: Use 'prod' and 'dev' requirements files X-Git-Tag: v1.0.0~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4f6578b4d4961a3f759eea7767941e2cce65f6;p=thirdparty%2Fpatchwork.git 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 Signed-off-by: Jeremy Kerr --- diff --git a/docs/requirements-base.txt b/docs/requirements-base.txt new file mode 100644 index 00000000..77dc8295 --- /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 00000000..eee64632 --- /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 ea9a77e4..00000000 --- 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 6d395110..00000000 --- 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 21fa438f..00000000 --- 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 00000000..24f97ceb --- /dev/null +++ b/docs/requirements-prod.txt @@ -0,0 +1,2 @@ +MySQL-python==1.2.5 +-r requirements-base.txt