From 026aa903d2f2375d3823797427c48bd49f30a0eb Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 20 Aug 2018 17:39:40 +0200 Subject: [PATCH 1/6] Drop support for Python 3.3 Setuptools and Tox no longer support or work on Python 3.3. --- .travis.yml | 5 ----- setup.py | 1 - tox.ini | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2c2327..5320336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - 2.7 - - 3.3 - 3.4 - 3.5 - 3.6 @@ -18,13 +17,9 @@ matrix: - { python: 3.5, env: DJANGO=1.7 } - { python: 3.6, env: DJANGO=1.7 } - { python: 3.6, env: DJANGO=1.8 } - - { python: 3.3, env: DJANGO=1.9 } - { python: 3.6, env: DJANGO=1.9 } - - { python: 3.3, env: DJANGO=1.10 } - { python: 3.6, env: DJANGO=1.10 } - - { python: 3.3, env: DJANGO=1.11 } - { python: 2.7, env: DJANGO=2.0 } - - { python: 3.3, env: DJANGO=2.0 } include: - { python: 3.6, env: TOXENV=flake8 } - { python: 3.6, env: TOXENV=readme } diff --git a/setup.py b/setup.py index 39d485c..b5b84b4 100644 --- a/setup.py +++ b/setup.py @@ -89,7 +89,6 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', diff --git a/tox.ini b/tox.ini index 309a875..23884ac 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = # Python/Django combinations that are officially supported - py{27,33,34}-django17 - py{27,33,34,35}-django18 + py{27,34}-django17 + py{27,34,35}-django18 py{27,34,35}-django19 py{27,34,35}-django110 py{27,34,35,36}-django111 From db2f78567c7f242a4c055ed104b904487f378d0d Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 20 Aug 2018 17:47:21 +0200 Subject: [PATCH 2/6] Tox / Travis: Add Python 3.7 and Django 2.1 --- .travis.yml | 2 ++ setup.py | 2 ++ tox.ini | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5320336..7836e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ python: - 3.4 - 3.5 - 3.6 + - 3.7 env: - DJANGO=1.7 - DJANGO=1.8 @@ -11,6 +12,7 @@ env: - DJANGO=1.10 - DJANGO=1.11 - DJANGO=2.0 + - DJANGO=2.1 matrix: exclude: # Python/Django combinations that aren't officially supported diff --git a/setup.py b/setup.py index b5b84b4..a078f51 100644 --- a/setup.py +++ b/setup.py @@ -80,6 +80,7 @@ setup( 'Framework :: Django :: 1.10', 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', @@ -92,6 +93,7 @@ setup( 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', ], platforms=['any'], url='https://github.com/jcassee/django-analytical', diff --git a/tox.ini b/tox.ini index 23884ac..6462cce 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,9 @@ envlist = py{27,34,35}-django18 py{27,34,35}-django19 py{27,34,35}-django110 - py{27,34,35,36}-django111 - py{34,35,36}-django20 + py{27,34,35,36,37}-django111 + py{34,35,36,37}-django20 + py{34,35,36,37}-django21 flake8 readme @@ -23,6 +24,7 @@ deps = django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH whitelist_externals = sh @@ -42,6 +44,7 @@ DJANGO = 1.10: django110 1.11: django111 2.0: django20 + 2.1: django21 [flake8] max-line-length = 100 From b7151350b6d6413b482e3053f78025fde46b6626 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 20 Aug 2018 18:03:30 +0200 Subject: [PATCH 3/6] Tox: Django 2.1 drops support for Python 3.4 --- .travis.yml | 2 ++ tox.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7836e53..00cc6b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ matrix: - { python: 3.6, env: DJANGO=1.9 } - { python: 3.6, env: DJANGO=1.10 } - { python: 2.7, env: DJANGO=2.0 } + - { python: 2.7, env: DJANGO=2.1 } + - { python: 3.4, env: DJANGO=2.1 } include: - { python: 3.6, env: TOXENV=flake8 } - { python: 3.6, env: TOXENV=readme } diff --git a/tox.ini b/tox.ini index 6462cce..383fdba 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = py{27,34,35}-django110 py{27,34,35,36,37}-django111 py{34,35,36,37}-django20 - py{34,35,36,37}-django21 + py{35,36,37}-django21 flake8 readme From 4237a953596970d9b3c302e658789e2ebc2cd246 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 20 Aug 2018 18:04:10 +0200 Subject: [PATCH 4/6] Travis: Add workaround for Python 3.7 Upstream issue: https://github.com/travis-ci/travis-ci/issues/9815 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00cc6b1..6a1640c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - 3.4 - 3.5 - 3.6 - - 3.7 env: - DJANGO=1.7 - DJANGO=1.8 @@ -27,6 +26,10 @@ matrix: include: - { python: 3.6, env: TOXENV=flake8 } - { python: 3.6, env: TOXENV=readme } + # Work around Travis Python 3.7 issue: https://github.com/travis-ci/travis-ci/issues/9815 + - { python: '3.7', env: DJANGO=1.11, dist: xenial, sudo: true } + - { python: '3.7', env: DJANGO=2.0, dist: xenial, sudo: true } + - { python: '3.7', env: DJANGO=2.1, dist: xenial, sudo: true } install: - pip install tox-travis From 27422a64277f5986fd418af50e9838ddfee35e0c Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 20 Aug 2018 18:06:31 +0200 Subject: [PATCH 5/6] Travis: Enable pip caching --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6a1640c..c92c78e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: python +cache: pip + python: - 2.7 - 3.4 From 2c8908dc207bc24363d009a8a1173a5aa395030e Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Wed, 22 Aug 2018 12:36:55 +0200 Subject: [PATCH 6/6] (Travis: Remove version quotes, for consistency) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c92c78e..69a13a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,9 @@ matrix: - { python: 3.6, env: TOXENV=flake8 } - { python: 3.6, env: TOXENV=readme } # Work around Travis Python 3.7 issue: https://github.com/travis-ci/travis-ci/issues/9815 - - { python: '3.7', env: DJANGO=1.11, dist: xenial, sudo: true } - - { python: '3.7', env: DJANGO=2.0, dist: xenial, sudo: true } - - { python: '3.7', env: DJANGO=2.1, dist: xenial, sudo: true } + - { python: 3.7, env: DJANGO=1.11, dist: xenial, sudo: true } + - { python: 3.7, env: DJANGO=2.0, dist: xenial, sudo: true } + - { python: 3.7, env: DJANGO=2.1, dist: xenial, sudo: true } install: - pip install tox-travis