From fa3cdf108c8351fc41d6d700768cfb5f38b72a1a Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Mon, 20 Apr 2015 22:36:59 +0200 Subject: [PATCH 1/6] Also test with Django 1.8 (Travis-CI) Plus white-space changes to match typically used YAML syntax (indentation of lists). This commit may close issue #54 if all goes well. --- .travis.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 794786d..9000c9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,26 @@ language: python python: -- "2.6" -- "2.7" -- "3.3" -- "3.4" + - "2.6" + - "2.7" + - "3.3" + - "3.4" env: -- DJANGO="Django>=1.4,<1.5" -- DJANGO="Django>=1.5,<1.6" -- DJANGO="Django>=1.6,<1.7" -- DJANGO="Django>=1.7,<1.8" + - DJANGO="Django>=1.4,<1.5" + - DJANGO="Django>=1.5,<1.6" + - DJANGO="Django>=1.6,<1.7" + - DJANGO="Django>=1.7,<1.8" + - DJANGO="Django>=1.8,<1.9" matrix: exclude: - python: "2.6" env: DJANGO="Django>=1.7,<1.8" + - python: "2.6" + env: DJANGO="Django>=1.8,<1.9" - python: "3.3" env: DJANGO="Django>=1.4,<1.5" - python: "3.4" env: DJANGO="Django>=1.4,<1.5" install: -- pip install $DJANGO + - pip install $DJANGO script: -- python setup.py test + - python setup.py test From 8103e5d94aec413ee21c3bba2acc032dea80a0a3 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Mon, 20 Apr 2015 23:59:19 +0200 Subject: [PATCH 2/6] Refactor tox.ini with conditional settings see https://testrun.org/tox/latest/config.html#generating-environments-conditional-settings Also test Django 1.8 with tox --- tox.ini | 71 ++++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 57 deletions(-) diff --git a/tox.ini b/tox.ini index bb082ea..8621a6c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,62 +1,19 @@ [tox] envlist = - py2.6-django1.4,py2.6-django1.5,py2.6-django1.6, - py2.7-django1.4,py2.7-django1.5,py2.7-django1.6, - py2.7-django1.7, - py3.3-django1.5,py3.3-django1.6,py3.3-django1.7, - py3.4-django1.5,py3.4-django1.6,py3.4-django1.7, + py{26}-django{14,15,16}, + py{27}-django{14,15,16,17,18}, + py{33,34}-django{15,16,17,18}, [testenv] commands = python -Wall setup.py test - -[testenv:py2.6-django1.4] -basepython = python2.6 -deps = Django>=1.4,<1.5 - -[testenv:py2.6-django1.5] -basepython = python2.6 -deps = Django>=1.5,<1.6 - -[testenv:py2.6-django1.6] -basepython = python2.6 -deps = Django>=1.6,<1.7 - -[testenv:py2.7-django1.4] -basepython = python2.7 -deps = Django>=1.4,<1.5 - -[testenv:py2.7-django1.5] -basepython = python2.7 -deps = Django>=1.5,<1.6 - -[testenv:py2.7-django1.6] -basepython = python2.7 -deps = Django>=1.6,<1.7 - -[testenv:py2.7-django1.7] -basepython = python2.7 -deps = Django>=1.7,<1.8 - -[testenv:py3.3-django1.5] -basepython = python3.3 -deps = Django>=1.7,<1.8 - -[testenv:py3.3-django1.6] -basepython = python3.3 -deps = Django>=1.6,<1.7 - -[testenv:py3.3-django1.7] -basepython = python3.3 -deps = Django>=1.7,<1.8 - -[testenv:py3.4-django1.5] -basepython = python3.4 -deps = Django>=1.7,<1.8 - -[testenv:py3.4-django1.6] -basepython = python3.4 -deps = Django>=1.6,<1.7 - -[testenv:py3.4-django1.7] -basepython = python3.4 -deps = Django>=1.7,<1.8 +basepython = + py26: python2.6 + py27: python2.7 + py33: python3.3 + py34: python3.4 +deps = + 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 From 001d44b10fc9e82733539fafd76c2fc5fb7895d8 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Tue, 21 Apr 2015 00:20:02 +0200 Subject: [PATCH 3/6] Make Travis-CI use Tox for test matrix execution see http://jsatt.com/blog/using-tox-with-travis-ci-to-test-django-apps/ --- .travis.yml | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9000c9d..16701ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,22 @@ language: python -python: - - "2.6" - - "2.7" - - "3.3" - - "3.4" -env: - - DJANGO="Django>=1.4,<1.5" - - DJANGO="Django>=1.5,<1.6" - - DJANGO="Django>=1.6,<1.7" - - DJANGO="Django>=1.7,<1.8" - - DJANGO="Django>=1.8,<1.9" -matrix: - exclude: - - python: "2.6" - env: DJANGO="Django>=1.7,<1.8" - - python: "2.6" - env: DJANGO="Django>=1.8,<1.9" - - python: "3.3" - env: DJANGO="Django>=1.4,<1.5" - - python: "3.4" - env: DJANGO="Django>=1.4,<1.5" install: - - pip install $DJANGO + - pip install tox script: - - python setup.py test + - 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=py27-django17 + - TOXENV=py27-django18 + - TOXENV=py33-django15 + - TOXENV=py33-django16 + - TOXENV=py33-django17 + - TOXENV=py33-django18 + - TOXENV=py34-django15 + - TOXENV=py34-django16 + - TOXENV=py34-django17 + - TOXENV=py34-django18 From 4fc1f74319e8c0b10b738bddf8c6a9c73799cb65 Mon Sep 17 00:00:00 2001 From: Joost Cassee Date: Tue, 21 Apr 2015 01:15:06 +0200 Subject: [PATCH 4/6] Update changelog with Django 1.8 compatibility --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8cab77a..25b69d3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,7 @@ Development ----------- * Fix Clickmap tracker id regular expression +* Test with Django 1.8 Version 0.21.0 -------------- From b968f12c4e24e98a940db474e76d1341e1fdb618 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Thu, 23 Apr 2015 01:33:41 +0200 Subject: [PATCH 5/6] Add beautiful badges to README Clickable badges: * current PyPI package version number * Travis-CI build status * downloads per month from PyPI * license info --- README.rst | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 9304eaa..a740ac0 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,7 @@ -django-analytical -================= +django-analytical |latest-version| +================================== + +|travis-ci| |downloads| |license| The django-analytical application integrates analytics services into a Django_ project. @@ -17,6 +19,18 @@ set-up very simple, while allowing advanced users to customize tracking. Each service is set up as recommended by the services themselves, using an asynchronous version of the Javascript code if possible. +.. |latest-version| image:: https://img.shields.io/pypi/v/django-analytical.svg + :alt: Latest version on PyPI + :target: https://pypi.python.org/pypi/django-analytical +.. |travis-ci| image:: https://travis-ci.org/jcassee/django-analytical.svg?branch=master + :alt: Build status - develop branch + :target: https://travis-ci.org/jcassee/django-analytical +.. |downloads| image:: https://img.shields.io/pypi/dm/django-analytical.svg + :alt: Monthly downloads from PyPI + :target: https://pypi.python.org/porypi/django-analytical +.. |license| image:: https://img.shields.io/pypi/l/django-analytical.svg + :alt: Software license + :target: https://github.com/jcassee/django-analytical/blob/master/LICENSE.txt .. _`Django`: http://www.djangoproject.com/ Currently Supported Services From 7c02c9364c238ed92681d3651ecc02e2ee5d8bef Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Thu, 23 Apr 2015 01:38:00 +0200 Subject: [PATCH 6/6] Fix typo --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a740ac0..1dff476 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ an asynchronous version of the Javascript code if possible. :target: https://travis-ci.org/jcassee/django-analytical .. |downloads| image:: https://img.shields.io/pypi/dm/django-analytical.svg :alt: Monthly downloads from PyPI - :target: https://pypi.python.org/porypi/django-analytical + :target: https://pypi.python.org/pypi/django-analytical .. |license| image:: https://img.shields.io/pypi/l/django-analytical.svg :alt: Software license :target: https://github.com/jcassee/django-analytical/blob/master/LICENSE.txt