Skip to content

Commit

Permalink
Merge pull request #18 from heavenshell/topic/0.15.0
Browse files Browse the repository at this point in the history
Bump version and tidy tox's version
  • Loading branch information
Surgo authored Feb 14, 2022
2 parents 29acf11 + c81dd88 commit 5d5f624
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 32 deletions.
34 changes: 14 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@ cache:
matrix:
fast_finish: true
include:
- env: TOX_ENV=py27-dj111
python: 2.7
- env: TOX_ENV=py34-dj111
python: 3.4
- env: TOX_ENV=py35-dj111
python: 3.5
- env: TOX_ENV=py36-dj111
python: 3.6
- env: TOX_ENV=py37-dj111
python: 3.7
- env: TOX_ENV=py35-dj22
python: 3.5
- env: TOX_ENV=py36-dj22
Expand All @@ -25,26 +15,30 @@ matrix:
python: 3.7
- env: TOX_ENV=py38-dj22
python: 3.8
- env: TOX_ENV=py36-dj30
python: 3.6
- env: TOX_ENV=py37-dj30
python: 3.7
- env: TOX_ENV=py39-dj22
python: 3.9
- env: TOX_ENV=py38-dj30
python: 3.8
- env: TOX_ENV=py36-djmaster
python: 3.6
- env: TOX_ENV=py37-djmaster
python: 3.7
- env: TOX_ENV=py39-dj30
python: 3.9
- env: TOX_ENV=py310-dj30
python: 3.10
- env: TOX_ENV=py38-dj40
python: 3.8
- env: TOX_ENV=py39-dj40
python: 3.9
- env: TOX_ENV=py310-dj40
python: 3.10
- env: TOX_ENV=py38-djmaster
python: 3.8
- env: TOX_ENV=py39-djmaster
python: 3.9
- env: TOX_ENV=py310-djmaster
python: 3.10
allow_failures:
- env: TOX_ENV=py36-djmaster
- env: TOX_ENV=py37-djmaster
- env: TOX_ENV=py38-djmaster
- env: TOX_ENV=py39-djmaster
- env: TOX_ENV=py310-djmaster
install:
- pip install -U pip setuptools tox wheel
script:
Expand Down
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ Contributors

Changelog
---------
- 0.15.0 Add support for Django 4.0. Drop support for Django 1.11.
- 0.14.0 Add support for Django 2.2, 3.0. Drop support for Django 2.0, 2.1.
- 0.13 Fixed error for Python 3 on PyPi.
- 0.12 Add support for Django 2.1. Support Python 3.7. Drop support for Django 1.8.
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 4.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Topic :: Database',
'Topic :: Software Development :: Libraries',
],
Expand Down
2 changes: 1 addition & 1 deletion timezone_utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = (0, 14, 0)
__version__ = (0, 15, 0)
VERSION = '.'.join(map(str, __version__))
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
skipsdist = true
skip_missing_interpreters = true
envlist =
py{27,34,35,36,37}-dj111,
py{35,36,37,38}-dj22,
py{36,37,38}-dj30,
py{36,37,38}-djmaster
py{35,36,37,38,39}-dj22,
py{36,37,38,39,310}-dj30,
py{38,39,310}-dj40,
py{38,39,310}-djmaster
[testenv]
basepython =
py35: python3.5
Expand All @@ -15,13 +15,13 @@ basepython =
py39: python3.9
py310: python3.10
deps =
dj111: Django>=1.11,<2.0
dj22: Django>=2.2,<3.0
dj30: Django>=3.0,<3.1
dj30: Django>=3.0,<3.2
dj40: Django>=4.0,<4.1
djmaster: https://github.com/django/django/archive/master.tar.gz
py38-dj30: codecov
py310-dj40: codecov
pytz
coverage
commands =
coverage run --source=timezone_utils run_tests.py
py38-dj30: codecov
py310-dj40: codecov

0 comments on commit 5d5f624

Please sign in to comment.