From 4ada8ff81aa01f6d0d44849f8db7832b2780e7b0 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Tue, 17 Oct 2017 13:35:38 +0200 Subject: [PATCH 1/6] Test settings: Add TEMPLATES for Django 1.10+ --- analytical/tests/settings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/analytical/tests/settings.py b/analytical/tests/settings.py index ecb42e4..ccd75a6 100644 --- a/analytical/tests/settings.py +++ b/analytical/tests/settings.py @@ -22,3 +22,10 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', ) + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'APP_DIRS': True, + }, +] From 4157c55e268f7c90abdede7c5edd0fff0d40eef4 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Tue, 17 Oct 2017 14:07:20 +0200 Subject: [PATCH 2/6] Tox, Travis: Update for Python 3.6, Django 1.10 & 1.11 --- .travis.yml | 14 +++++++++++--- tox.ini | 8 ++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index be4166b..7ddf2b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,19 +4,27 @@ python: - 3.3 - 3.4 - 3.5 -# - 3.6 + - 3.6 env: - DJANGO=1.7 - DJANGO=1.8 - DJANGO=1.9 -# - DJANGO=1.10 -# - DJANGO=1.11 + - DJANGO=1.10 + - DJANGO=1.11 matrix: exclude: + # Django 1.7 does not support Python 3.5+ - python: 3.5 env: DJANGO=1.7 + - python: 3.6 + env: DJANGO=1.7 + # Django 1.9+ does not support Python 3.3 - python: 3.3 env: DJANGO=1.9 + - python: 3.3 + env: DJANGO=1.10 + - python: 3.3 + env: DJANGO=1.11 include: - python: 2.7 env: TOXENV=flake8 diff --git a/tox.ini b/tox.ini index dfb8fb9..6c8f898 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] envlist = + # Django 1.7 does not support Python 3.5+ py{27,33,34}-django17 - py{27,33,34,35}-django18 - py{27,34,35}-django19 -# py{27,34,35}-django110 -# py{27,34,35,36}-django111 + # Django 1.9+ does not support Python 3.3 + py{27,34,35,36}-django19 + py{27,33,34,35,36}-django1{8,10,11} flake8 [testenv] From 2ee99a656ba9d2cbeedb1c7b54a7be4d388869a3 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Tue, 17 Oct 2017 14:12:35 +0200 Subject: [PATCH 3/6] (Update my name, while here) --- AUTHORS.rst | 4 ++-- CHANGELOG.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 9c8b416..f3854d2 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,6 +1,6 @@ The django-analytical package was written by `Joost Cassee`_, with contributions from `Eric Davis`_, `Paul Oswald`_, `Uros Trebec`_, -`Steven Skoczen`_, `Piet Delport`_, `Sandra Mau`_, `Simon Ye`_, +`Steven Skoczen`_, `Pi Delport`_, `Sandra Mau`_, `Simon Ye`_, `Tinnet Coronam`_, `Philippe O. Wagner`_, `Max Arnold`_ , `Martín Gaitán`_, `Craig Bruce`_, `Peter Bittner`_, `Scott Adams`_, `Eric Amador`_, `Alexandre Pocquet`_, `Brad Pitcher`_, `Hugo Osvaldo Barrera`_, @@ -20,7 +20,7 @@ The work on Intercom was made possible by `GreenKahuna`_. .. _`Paul Oswald`: https://github.com/poswald .. _`Uros Trebec`: https://github.com/failedguidedog .. _`Steven Skoczen`: https://github.com/skoczen -.. _`Piet Delport`: https://github.com/pjdelport +.. _`Pi Delport`: https://github.com/pjdelport .. _`Sandra Mau`: https://github.com/xthepoet .. _`Simon Ye`: https://github.com/yesimon .. _`Tinnet Coronam`: https://github.com/tinnet diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e3dd110..3bea2cf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -78,7 +78,7 @@ Version 0.14.0 Version 0.13.0 -------------- * Add support for the KISSmetrics alias feature (Sandra Mau) -* Update testing code for Django 1.4 (Piet Delport) +* Update testing code for Django 1.4 (Pi Delport) Version 0.12.0 -------------- From d19e1bfdb76c136685e465f79b98955db423af52 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Tue, 17 Oct 2017 16:02:40 +0200 Subject: [PATCH 4/6] Package classifiers: Add Python 3.6, Django 1.10 & 1.11 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 9c5d6a5..365771e 100644 --- a/setup.py +++ b/setup.py @@ -84,8 +84,8 @@ setup( 'Framework :: Django :: 1.7', 'Framework :: Django :: 1.8', 'Framework :: Django :: 1.9', - # 'Framework :: Django :: 1.10', - # 'Framework :: Django :: 1.11', + 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', @@ -98,7 +98,7 @@ setup( 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', - # 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.6', ], platforms=['any'], url='https://github.com/jcassee/django-analytical', From 969377b39a660c1d1a6e0584e32b0d13b7237c91 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Tue, 17 Oct 2017 17:29:11 +0200 Subject: [PATCH 5/6] Tox: Expand Django versions in envlist --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6c8f898..6d89c3f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,11 @@ envlist = # Django 1.7 does not support Python 3.5+ py{27,33,34}-django17 + py{27,33,34,35,36}-django18 # Django 1.9+ does not support Python 3.3 py{27,34,35,36}-django19 - py{27,33,34,35,36}-django1{8,10,11} + py{27,34,35,36}-django110 + py{27,34,35,36}-django111 flake8 [testenv] From 621d207944ac21392324e4df191cf4d41cefe9e0 Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Wed, 18 Oct 2017 10:47:59 +0200 Subject: [PATCH 6/6] (Use more compact format, for readability) --- .travis.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ddf2b3..cf4d1d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,20 +14,14 @@ env: matrix: exclude: # Django 1.7 does not support Python 3.5+ - - python: 3.5 - env: DJANGO=1.7 - - python: 3.6 - env: DJANGO=1.7 + - { python: 3.5, env: DJANGO=1.7 } + - { python: 3.6, env: DJANGO=1.7 } # Django 1.9+ does not support Python 3.3 - - python: 3.3 - env: DJANGO=1.9 - - python: 3.3 - env: DJANGO=1.10 - - python: 3.3 - env: DJANGO=1.11 + - { python: 3.3, env: DJANGO=1.9 } + - { python: 3.3, env: DJANGO=1.10 } + - { python: 3.3, env: DJANGO=1.11 } include: - - python: 2.7 - env: TOXENV=flake8 + - { python: 2.7, env: TOXENV=flake8 } install: - pip install tox-travis