From eca92d788ac9454b0e80aeda4453f8a74e83e5a6 Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Wed, 10 Sep 2014 14:36:05 +0200 Subject: [PATCH] Drop support for Django 1.5 --- .travis.yml | 3 --- docs/releases/2.6.0-rc1.rst | 2 +- docs/server/installation.rst | 2 +- pootle/depcheck.py | 2 +- requirements/base.txt | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7986f9dd69..1983869cce6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ python: - 2.7 env: matrix: - - DJANGO_VERSION=1.5.8 DATABASE_BACKEND=sqlite - - DJANGO_VERSION=1.5.8 DATABASE_BACKEND=postgres - - DJANGO_VERSION=1.5.8 DATABASE_BACKEND=mysql - DJANGO_VERSION=1.6.2 DATABASE_BACKEND=sqlite - DJANGO_VERSION=1.6.2 DATABASE_BACKEND=postgres - DJANGO_VERSION=1.6.2 DATABASE_BACKEND=mysql diff --git a/docs/releases/2.6.0-rc1.rst b/docs/releases/2.6.0-rc1.rst index 3edab2b7762..335cf18541f 100644 --- a/docs/releases/2.6.0-rc1.rst +++ b/docs/releases/2.6.0-rc1.rst @@ -9,7 +9,7 @@ on our :ref:`roadmap `. Changes in Requirements ======================= -- Django >= 1.5.8 < 1.7 +- Django >= 1.6.2 < 1.7 - `Translate Toolkit `_ >= 1.12.0-rc1 - Python >= 2.6 diff --git a/docs/server/installation.rst b/docs/server/installation.rst index ecd4e65ab36..a6eb130da89 100644 --- a/docs/server/installation.rst +++ b/docs/server/installation.rst @@ -119,7 +119,7 @@ line tool within your environment. (env) $ pootle --version Pootle 2.5.1 Translate Toolkit 1.11.0 - Django 1.5.8 + Django 1.6.2 .. _installation#initializing_the_configuration: diff --git a/pootle/depcheck.py b/pootle/depcheck.py index 1f388e6e5ab..1fc8efe601e 100644 --- a/pootle/depcheck.py +++ b/pootle/depcheck.py @@ -28,7 +28,7 @@ TTK_MINIMUM_REQUIRED_VERSION = (1, 12, 0) # Minimum Django version required for Pootle to run. -DJANGO_MINIMUM_REQUIRED_VERSION = (1, 5, 8) +DJANGO_MINIMUM_REQUIRED_VERSION = (1, 6, 2) # Minimum lxml version required for Pootle to run. LXML_MINIMUM_REQUIRED_VERSION = (2, 2, 0, 0) diff --git a/requirements/base.txt b/requirements/base.txt index 44af111db98..e832a4d2926 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # - docs/server/installation.rst # - release notes in docs/releases/$next # when bumping Django versions and dependencies. -Django>=1.5.8,<1.7 +Django>=1.6.2,<1.7 # Django apps django-allauth==0.16.1