Permalink
Browse files

merged manually

  • Loading branch information...
igorkramaric committed Oct 2, 2017
2 parents 1089235 + 8a31049 commit 74ea3227b2e3a039d877977e95e5c87fe2403fb1
Showing with 33 additions and 44 deletions.
  1. +1 −0 .travis.yml
  2. +2 −2 setup.py
  3. +30 −42 tox.ini
View
@@ -7,6 +7,7 @@ python:
env:
- DJANGO_VERSION=1.9
- DJANGO_VERSION=1.10
- DJANGO_VERSION=dev
matrix:
allow_failures:
View
@@ -8,7 +8,7 @@
setup(
name='django-badges',
version='0.2.0',
version='0.3.0',
author='James Robert',
author_email='jiaaro@gmail.com',
description=('An easy to use app that provides Stack Overflow style badges'
@@ -19,7 +19,7 @@
packages=['badges', 'badges.templatetags', 'badges.migrations'],
package_data={'badges': ['badges/templates/badges/*.html']},
install_requires=[
"django >= 1.6",
"django >= 1.7",
"Pillow",
"future"
],
View
72 tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py34-dev,py33-dev,py27-dev,py34-1.8,py33-1.8,py27-1.8,py34-1.7,py33-1.7,py27-1.7,py34-1.6,py33-1.6,py27-1.6,py26-1.6,py34-1.5,py33-1.5,py27-1.5,py26-1.5,docs
envlist = py34-dev,py33-dev,py27-dev,py34-1.10,py33-1.10,py27-1.10,py34-1.9,py33-1.9,py27-1.9,py34-1.8,py33-1.8,py27-1.8,py34-1.7,py33-1.7,py27-1.7
[testenv]
commands =
@@ -17,98 +17,86 @@ deps =
{[testenv]deps-py3}
https://github.com/django/django/zipball/master
[testenv:py34-1.8]
[testenv:py34-1.10]
basepython = python3.4
deps =
{[testenv]deps-py3}
django==1.8
[testenv:py34-1.7]
django==1.10
[testenv:py34-1.9]
basepython = python3.4
deps =
{[testenv]deps-py3}
django==1.7
django==1.9
[testenv:py34-1.6]
[testenv:py34-1.8]
basepython = python3.4
deps =
{[testenv]deps-py3}
django==1.6.5
[testenv:py34-1.5]
django==1.8
[testenv:py34-1.7]
basepython = python3.4
deps =
{[testenv]deps-py3}
django==1.5.5
django==1.7
[testenv:py33-dev]
basepython = python3.3
deps =
{[testenv]deps-py3}
https://github.com/django/django/zipball/master
[testenv:py33-1.8]
[testenv:py33-1.10]
basepython = python3.3
deps =
{[testenv]deps-py3}
django==1.8
[testenv:py33-1.7]
django==1.10
[testenv:py33-1.9]
basepython = python3.3
deps =
{[testenv]deps-py3}
django==1.7
django==1.9
[testenv:py33-1.6]
[testenv:py33-1.8]
basepython = python3.3
deps =
{[testenv]deps-py3}
django==1.6.2
[testenv:py33-1.5]
django==1.8
[testenv:py33-1.7]
basepython = python3.3
deps =
{[testenv]deps-py3}
django==1.5.5
django==1.7
[testenv:py27-dev]
basepython = python2.7
deps =
{[testenv]deps-py2}
https://github.com/django/django/zipball/master
[testenv:py27-1.7]
[testenv:py27-1.10]
basepython = python2.7
deps =
{[testenv]deps-py2}
django==1.7
django==1.10
[testenv:py27-1.8]
[testenv:py27-1.9]
basepython = python2.7
deps =
{[testenv]deps-py2}
django==1.8
[testenv:py27-1.6]
django==1.9
[testenv:py27-1.8]
basepython = python2.7
deps =
{[testenv]deps-py2}
django==1.6.2
django==1.8
[testenv:py27-1.5]
[testenv:py27-1.7]
basepython = python2.7
deps =
{[testenv]deps-py2}
django==1.5.5
[testenv:py26-1.6]
basepython = python2.6
deps =
{[testenv]deps-py2}
django==1.6.2
[testenv:py26-1.5]
basepython = python2.6
deps =
{[testenv]deps-py2}
django==1.5.5
django==1.7

0 comments on commit 74ea322

Please sign in to comment.