Skip to content

Commit

Permalink
merging
Browse files Browse the repository at this point in the history
  • Loading branch information
wolph committed Jun 9, 2021
2 parents 1cb20d2 + 2b05cad commit 209b6be
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 18 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@ python: 3.6

env:
- TOX_ENV=coveralls
- TOX_ENV=py35-django22
- TOX_ENV=py35-django30
- TOX_ENV=py36-django22
- TOX_ENV=py36-django30
- TOX_ENV=py37-django22
- TOX_ENV=py37-django30
- TOX_ENV=py37-django31
- TOX_ENV=py37-django32
- TOX_ENV=py38-django22
- TOX_ENV=py38-django30
- TOX_ENV=py38-django31
- TOX_ENV=py38-django32
- TOX_ENV=py39-django22
- TOX_ENV=py39-django31
- TOX_ENV=py39-django32
- TOX_ENV=py310-django22
- TOX_ENV=py310-django31
- TOX_ENV=py310-django32
- TOX_ENV=flake8
- TOX_ENV=docs

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ How to install

Installing this module only takes a couple of minutes.

Currently Django 2.2 and 3.0 are supported and tested in combination with Python 3.5, 3.6, 3.7 and 3.8.
Currently Django 2.2, 3.1 and 3.2 are supported and tested in combination with Python 3.7, 3.8, 3.9 and 3.10.

For Django below 2.2 and Python 2.7 up to version 4.6.0 should work.

Expand Down
2 changes: 1 addition & 1 deletion tags_input/__about__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__package_name__ = 'django-tags-input'
__version__ = '5.0.0'
__version__ = '5.1.0'
__author__ = 'Rick van Hattem'
__author_email__ = 'wolph@wol.ph'
__description__ = ' '.join('''
Expand Down
19 changes: 8 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
[tox]
envlist =
py35-django{22,30},
py36-django{22,30},
py37-django{22,30},
py38-django{22,30},
py36-django{22},
py3{7,8,9,10}-django{22,31,32},
flake8,
docs

skip_missing_interpreters = True
usedevelop = True

[testenv]
deps =
deps =
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
-r{toxinidir}/example/requirements.txt

envlist =
py35-django{22,30},
py36-django{22,30},
py37-django{22,30},
py38-django{22,30}
py3{5,6}-django{22},
py3{7,8,9,10}-django{22,30,31}

commands =
python setup.py test
Expand Down Expand Up @@ -51,7 +48,7 @@ commands =
coveralls

deps =
Django>=3.0,<3.1
Django>=3.2,<3.3
-r{toxinidir}/example/requirements.txt
coveralls

0 comments on commit 209b6be

Please sign in to comment.