Skip to content

Commit

Permalink
Merge pull request #28 from sergei-maertens/develop
Browse files Browse the repository at this point in the history
Minor repo badges tweaks from develop
  • Loading branch information
sergei-maertens committed Dec 11, 2015
2 parents c6a7014 + fdea31b commit 38f14a4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
10 changes: 10 additions & 0 deletions .travis.yml
Expand Up @@ -20,6 +20,7 @@ env:
- TOXENV=py27-django16
- TOXENV=py27-django17
- TOXENV=py27-django18
- TOXENV=py27-django19
- TOXENV=py27-djangolatest

- TOXENV=py33-django15
Expand All @@ -32,10 +33,19 @@ env:
- TOXENV=py34-django16
- TOXENV=py34-django17
- TOXENV=py34-django18
- TOXENV=py34-django19
- TOXENV=py34-djangolatest

- TOXENV=py35-django15
- TOXENV=py35-django16
- TOXENV=py35-django17
- TOXENV=py35-django18
- TOXENV=py35-django19
- TOXENV=py35-djangolatest

- TOXENV=pypy-django15
- TOXENV=pypy-django16
- TOXENV=pypy-django17
- TOXENV=pypy-django18
- TOXENV=pypy-django19
- TOXENV=pypy-djangolatest
3 changes: 3 additions & 0 deletions README.rst
Expand Up @@ -12,6 +12,9 @@ Django-Choices
:target: http://django-choices.readthedocs.org/en/latest/
:alt: Documentation Status

.. image:: https://img.shields.io/pypi/v/django-choices.svg
:target: https://pypi.python.org/pypi/django-choices

Order and sanity for django model choices.
------------------------------------------------------

Expand Down
3 changes: 3 additions & 0 deletions docs/index.rst
Expand Up @@ -16,6 +16,9 @@ Django-Choices
.. image:: https://coveralls.io/repos/bigjason/django-choices/badge.svg
:target: https://coveralls.io/github/bigjason/django-choices?branch=master

.. image:: https://img.shields.io/pypi/v/django-choices.svg
:target: https://pypi.python.org/pypi/django-choices


Contents:

Expand Down
3 changes: 2 additions & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py{26,27}-django{13,14,15,16},py27-django{17,18,latest},py{33,34,py}-django{15,16,17,18,latest}
envlist = py{26,27}-django{13,14,15,16},py27-django{17,18,19,latest},py{33,34,35,py}-django{15,16,17,18,19,latest}
skip_missing_interpreters = true

[testenv]
Expand All @@ -10,6 +10,7 @@ deps=
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
py26: unittest2
django13,django14: six
coverage
Expand Down

0 comments on commit 38f14a4

Please sign in to comment.