From a3fe9615223808223091448285c059bbc285642b Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Mon, 8 Aug 2016 14:52:44 +0100 Subject: [PATCH 1/3] Enable Django 1.10 testing --- .travis.yml | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a40b77..301dee0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ env: - DJANGO_VERSION=1.7 - DJANGO_VERSION=1.8 - DJANGO_VERSION=1.9 + - DJANGO_VERSION=1.10 python: - "2.7" - "3.3" @@ -14,6 +15,8 @@ matrix: env: "DJANGO_VERSION=1.7" - python: "3.3" env: "DJANGO_VERSION=1.9" + - python: "3.3" + env: "DJANGO_VERSION=1.10" install: - pip install django==$DJANGO_VERSION --use-mirrors - pip install . --use-mirrors diff --git a/setup.py b/setup.py index b08d9e9..0f5ba3e 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( packages = find_packages(), install_requires = [ "sphinx-me >= 0.1.2", - "django >= 1.7, < 1.10", + "django >= 1.7, < 1.11", ], classifiers = [ "Development Status :: 5 - Production/Stable", From fd4c4f52967391a336e0a6aa4aaa48acfd922213 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Mon, 8 Aug 2016 14:56:24 +0100 Subject: [PATCH 2/3] Drop Django 1.7 support --- .travis.yml | 3 --- setup.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 301dee0..89bae98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python env: - - DJANGO_VERSION=1.7 - DJANGO_VERSION=1.8 - DJANGO_VERSION=1.9 - DJANGO_VERSION=1.10 @@ -11,8 +10,6 @@ python: - "3.5" matrix: exclude: - - python: "3.5" - env: "DJANGO_VERSION=1.7" - python: "3.3" env: "DJANGO_VERSION=1.9" - python: "3.3" diff --git a/setup.py b/setup.py index 0f5ba3e..4d51074 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( packages = find_packages(), install_requires = [ "sphinx-me >= 0.1.2", - "django >= 1.7, < 1.11", + "django >= 1.8, < 1.11", ], classifiers = [ "Development Status :: 5 - Production/Stable", From 85f3869cbb9bb141a1fb6bc2d3ebb84db3b0d083 Mon Sep 17 00:00:00 2001 From: Dwayne Bailey Date: Mon, 8 Aug 2016 15:02:40 +0100 Subject: [PATCH 3/3] pip --use-mirrors deprecated in v7 https://pip.pypa.io/en/stable/news/ So installation on Python 3.5 is broken with this option. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89bae98..7400d98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ matrix: - python: "3.3" env: "DJANGO_VERSION=1.10" install: - - pip install django==$DJANGO_VERSION --use-mirrors - - pip install . --use-mirrors + - pip install django==$DJANGO_VERSION + - pip install . script: ./test_project/manage.py test