From 87be940822f42c0cd17d166630b3ea0aebaa4e27 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Sun, 6 Dec 2015 11:38:58 -0300 Subject: [PATCH] Drop support for unsupported django versions Since django 1.8 is an LTS release, we're dropping support for older versions. Since django 1.7 is still relatively recent, we'll be keeping support for it for now. --- .travis.yml | 33 +++++++++++---------------------- requirements.txt | 2 +- setup.py | 2 +- tox.ini | 10 +++------- 4 files changed, 16 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3494bac..2a24126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,25 +4,14 @@ install: script: - tox env: # generate list with: $ tox -l | xargs -I ITEM echo " - TOXENV="ITEM - - TOXENV=py26-django14 - - TOXENV=py26-django15 - - TOXENV=py26-django16 - - TOXENV=py27-django14 - - TOXENV=py27-django15 - - TOXENV=py27-django16 - - TOXENV=py32-django15 - - TOXENV=py32-django16 - - TOXENV=py32-django17 - - TOXENV=py32-django18 - - TOXENV=py33-django15 - - TOXENV=py33-django16 - - TOXENV=py33-django17 - - TOXENV=py33-django18 - - TOXENV=py27-django17 - - TOXENV=py27-django18 - - TOXENV=py27-django19 - - TOXENV=py34-django17 - - TOXENV=py34-django18 - - TOXENV=py34-django19 - - TOXENV=py35-django18 - - TOXENV=py35-django19 + - TOXENV=py27-django17 + - TOXENV=py27-django18 + - TOXENV=py27-django19 + - TOXENV=py32-django17 + - TOXENV=py33-django17 + - TOXENV=py33-django18 + - TOXENV=py34-django17 + - TOXENV=py34-django18 + - TOXENV=py34-django19 + - TOXENV=py35-django18 + - TOXENV=py35-django19 diff --git a/requirements.txt b/requirements.txt index 94a0e83..fa56c66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Django +Django>=1.7.0 diff --git a/setup.py b/setup.py index 214b84d..5e988c2 100644 --- a/setup.py +++ b/setup.py @@ -98,6 +98,6 @@ setup( download_url='https://github.com/jcassee/django-analytical/archive/master.zip', cmdclass=cmdclass, install_requires=[ - 'Django>=1.4', + 'Django>=1.7.0', ], ) diff --git a/tox.ini b/tox.ini index fb4ed53..affba1d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] envlist = - py{26,27}-django{14,15,16}, - py{32,33}-django{15,16,17,18}, - py{27,34}-django{17,18,19}, - py{35}-django{18,19} + py{27,32,33,34}-django17 + py33-django18 + py{27,34,35}-django{18,19} [testenv] commands = @@ -12,9 +11,6 @@ commands = deps = coverage==3.7.1 coveralls - django14: Django>=1.4,<1.5 - django15: Django>=1.5,<1.6 - django16: Django>=1.6,<1.7 django17: Django>=1.7,<1.8 django18: Django>=1.8,<1.9 django19: Django>=1.9,<1.10