mirror of
https://github.com/jazzband/django-analytical.git
synced 2026-03-16 22:20:25 +00:00
Merge branch 'master' into flake8-code-not-tests
This commit is contained in:
Peter Bittner
commit
99ce2f5fcb
4 changed files with 50 additions and 79 deletions
39
.travis.yml
39
.travis.yml
|
|
@ -1,23 +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"
|
||||
matrix:
|
||||
exclude:
|
||||
- python: "2.6"
|
||||
env: DJANGO="Django>=1.7,<1.8"
|
||||
- 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
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
Development
|
||||
-----------
|
||||
* Fix Clickmap tracker id regular expression
|
||||
* Test with Django 1.8
|
||||
|
||||
Version 0.21.0
|
||||
--------------
|
||||
|
|
|
|||
18
README.rst
18
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/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
|
||||
.. _`Django`: http://www.djangoproject.com/
|
||||
|
||||
Currently Supported Services
|
||||
|
|
|
|||
71
tox.ini
71
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue