Skip to content

Commit e6a3da0

Browse files
authored
Merge pull request #16 from Surgo/master
Add support for Django 2.2 and 3.0. Drop support for Django 2.0, 2.1 …
2 parents 61c8b50 + 18620cc commit e6a3da0

File tree

5 files changed

+29
-32
lines changed

5 files changed

+29
-32
lines changed

.travis.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,32 @@ matrix:
1515
python: 3.5
1616
- env: TOX_ENV=py36-dj111
1717
python: 3.6
18-
- env: TOX_ENV=py34-dj20
19-
python: 3.4
20-
- env: TOX_ENV=py35-dj20
18+
- env: TOX_ENV=py37-dj111
19+
python: 3.7
20+
- env: TOX_ENV=py35-dj22
2121
python: 3.5
22-
- env: TOX_ENV=py36-dj20
22+
- env: TOX_ENV=py36-dj22
2323
python: 3.6
24-
- env: TOX_ENV=py37-dj20
25-
sudo: true # TODO Remove when supported
26-
dist: xenial
24+
- env: TOX_ENV=py37-dj22
2725
python: 3.7
28-
- env: TOX_ENV=py35-dj21
29-
python: 3.5
30-
- env: TOX_ENV=py36-dj21
26+
- env: TOX_ENV=py38-dj22
27+
python: 3.8
28+
- env: TOX_ENV=py36-dj30
3129
python: 3.6
32-
- env: TOX_ENV=py37-dj21
33-
sudo: true # TODO Remove when supported
34-
dist: xenial
30+
- env: TOX_ENV=py37-dj30
3531
python: 3.7
36-
- env: TOX_ENV=py35-djmaster
37-
python: 3.5
32+
- env: TOX_ENV=py38-dj30
33+
python: 3.8
3834
- env: TOX_ENV=py36-djmaster
3935
python: 3.6
4036
- env: TOX_ENV=py37-djmaster
41-
sudo: true # TODO Remove when supported
42-
dist: xenial
4337
python: 3.7
38+
- env: TOX_ENV=py38-djmaster
39+
python: 3.8
4440
allow_failures:
45-
- env: TOX_ENV=py35-djmaster
4641
- env: TOX_ENV=py36-djmaster
4742
- env: TOX_ENV=py37-djmaster
43+
- env: TOX_ENV=py38-djmaster
4844
install:
4945
- pip install -U pip setuptools tox wheel
5046
script:
@@ -58,6 +54,6 @@ deploy:
5854
on:
5955
repo: michaeljohnbarr/django-timezone-utils
6056
tags: true
61-
condition: "$TOX_ENV = py37-dj21"
57+
condition: "$TOX_ENV = py38-dj30"
6258
notifications:
6359
email: false

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Contributors
109109

110110
Changelog
111111
---------
112+
- 0.14.0 Add support for Django 2.2, 3.0. Drop support for Django 2.0, 2.1.
112113
- 0.13 Fixed error for Python 3 on PyPi.
113114
- 0.12 Add support for Django 2.1. Support Python 3.7. Drop support for Django 1.8.
114115
- 0.11 Removed reference to django.db.models.fields.subclassing.SubfieldBase, which means that only Django 1.8+ is now supported. Removed support for Python versions < 2.6. The Django 1.6 series was the last to support Python 2.6. Added testing support for Django 1.10. Changed development status from Beta to Production/Stable.

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
'Environment :: Web Environment',
3232
'Framework :: Django',
3333
'Framework :: Django :: 1.11',
34-
'Framework :: Django :: 2.0',
35-
'Framework :: Django :: 2.1',
34+
'Framework :: Django :: 2.2',
35+
'Framework :: Django :: 3.0',
3636
'Intended Audience :: Developers',
3737
'License :: OSI Approved :: MIT License',
3838
'Natural Language :: English',
@@ -45,6 +45,7 @@
4545
'Programming Language :: Python :: 3.5',
4646
'Programming Language :: Python :: 3.6',
4747
'Programming Language :: Python :: 3.7',
48+
'Programming Language :: Python :: 3.8',
4849
'Topic :: Database',
4950
'Topic :: Software Development :: Libraries',
5051
],

timezone_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = (0, 13)
1+
__version__ = (0, 14, 0)
22
VERSION = '.'.join(map(str, __version__))

tox.ini

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22
skipsdist = true
33
skip_missing_interpreters = true
44
envlist =
5-
py{27,34,35,36}-dj111,
6-
py{34,35,36,37}-dj20,
7-
py{35,36,37}-dj21,
8-
py{35,36,37}-djmaster
5+
py{27,34,35,36,37}-dj111,
6+
py{35,36,37,38}-dj22,
7+
py{36,37,38}-dj30,
8+
py{36,37,38}-djmaster
99
[testenv]
1010
basepython =
11-
py27: python2.7
12-
py34: python3.4
1311
py35: python3.5
1412
py36: python3.6
1513
py37: python3.7
14+
py38: python3.8
1615
deps =
1716
dj111: Django>=1.11,<2.0
18-
dj20: Django>=2.0,<2.1
19-
dj21: Django>=2.1,<2.2
17+
dj22: Django>=2.2,<3.0
18+
dj30: Django>=3.0,<3.1
2019
djmaster: https://github.com/django/django/archive/master.tar.gz
21-
py37-dj21: codecov
20+
py38-dj30: codecov
2221
pytz
2322
coverage
2423
commands =
2524
coverage run --source=timezone_utils run_tests.py
26-
py37-dj21: codecov
25+
py38-dj30: codecov

0 commit comments

Comments
 (0)