Skip to content

Commit 5d5f624

Browse files
authored
Merge pull request #18 from heavenshell/topic/0.15.0
Bump version and tidy tox's version
2 parents 29acf11 + c81dd88 commit 5d5f624

File tree

5 files changed

+27
-32
lines changed

5 files changed

+27
-32
lines changed

.travis.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ cache:
77
matrix:
88
fast_finish: true
99
include:
10-
- env: TOX_ENV=py27-dj111
11-
python: 2.7
12-
- env: TOX_ENV=py34-dj111
13-
python: 3.4
14-
- env: TOX_ENV=py35-dj111
15-
python: 3.5
16-
- env: TOX_ENV=py36-dj111
17-
python: 3.6
18-
- env: TOX_ENV=py37-dj111
19-
python: 3.7
2010
- env: TOX_ENV=py35-dj22
2111
python: 3.5
2212
- env: TOX_ENV=py36-dj22
@@ -25,26 +15,30 @@ matrix:
2515
python: 3.7
2616
- env: TOX_ENV=py38-dj22
2717
python: 3.8
28-
- env: TOX_ENV=py36-dj30
29-
python: 3.6
30-
- env: TOX_ENV=py37-dj30
31-
python: 3.7
18+
- env: TOX_ENV=py39-dj22
19+
python: 3.9
3220
- env: TOX_ENV=py38-dj30
3321
python: 3.8
34-
- env: TOX_ENV=py36-djmaster
35-
python: 3.6
36-
- env: TOX_ENV=py37-djmaster
37-
python: 3.7
22+
- env: TOX_ENV=py39-dj30
23+
python: 3.9
24+
- env: TOX_ENV=py310-dj30
25+
python: 3.10
26+
- env: TOX_ENV=py38-dj40
27+
python: 3.8
28+
- env: TOX_ENV=py39-dj40
29+
python: 3.9
30+
- env: TOX_ENV=py310-dj40
31+
python: 3.10
3832
- env: TOX_ENV=py38-djmaster
3933
python: 3.8
4034
- env: TOX_ENV=py39-djmaster
4135
python: 3.9
4236
- env: TOX_ENV=py310-djmaster
4337
python: 3.10
4438
allow_failures:
45-
- env: TOX_ENV=py36-djmaster
46-
- env: TOX_ENV=py37-djmaster
4739
- env: TOX_ENV=py38-djmaster
40+
- env: TOX_ENV=py39-djmaster
41+
- env: TOX_ENV=py310-djmaster
4842
install:
4943
- pip install -U pip setuptools tox wheel
5044
script:

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.15.0 Add support for Django 4.0. Drop support for Django 1.11.
112113
- 0.14.0 Add support for Django 2.2, 3.0. Drop support for Django 2.0, 2.1.
113114
- 0.13 Fixed error for Python 3 on PyPi.
114115
- 0.12 Add support for Django 2.1. Support Python 3.7. Drop support for Django 1.8.

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@
3030
'Development Status :: 5 - Production/Stable',
3131
'Environment :: Web Environment',
3232
'Framework :: Django',
33-
'Framework :: Django :: 1.11',
3433
'Framework :: Django :: 2.2',
3534
'Framework :: Django :: 3.0',
35+
'Framework :: Django :: 4.0',
3636
'Intended Audience :: Developers',
3737
'License :: OSI Approved :: MIT License',
3838
'Natural Language :: English',
3939
'Operating System :: OS Independent',
4040
'Programming Language :: Python',
41-
'Programming Language :: Python :: 2',
42-
'Programming Language :: Python :: 2.7',
4341
'Programming Language :: Python :: 3',
4442
'Programming Language :: Python :: 3.4',
4543
'Programming Language :: Python :: 3.5',
4644
'Programming Language :: Python :: 3.6',
4745
'Programming Language :: Python :: 3.7',
4846
'Programming Language :: Python :: 3.8',
47+
'Programming Language :: Python :: 3.9',
48+
'Programming Language :: Python :: 3.10',
4949
'Topic :: Database',
5050
'Topic :: Software Development :: Libraries',
5151
],

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, 14, 0)
1+
__version__ = (0, 15, 0)
22
VERSION = '.'.join(map(str, __version__))

tox.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
skipsdist = true
33
skip_missing_interpreters = true
44
envlist =
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
5+
py{35,36,37,38,39}-dj22,
6+
py{36,37,38,39,310}-dj30,
7+
py{38,39,310}-dj40,
8+
py{38,39,310}-djmaster
99
[testenv]
1010
basepython =
1111
py35: python3.5
@@ -15,13 +15,13 @@ basepython =
1515
py39: python3.9
1616
py310: python3.10
1717
deps =
18-
dj111: Django>=1.11,<2.0
1918
dj22: Django>=2.2,<3.0
20-
dj30: Django>=3.0,<3.1
19+
dj30: Django>=3.0,<3.2
20+
dj40: Django>=4.0,<4.1
2121
djmaster: https://github.com/django/django/archive/master.tar.gz
22-
py38-dj30: codecov
22+
py310-dj40: codecov
2323
pytz
2424
coverage
2525
commands =
2626
coverage run --source=timezone_utils run_tests.py
27-
py38-dj30: codecov
27+
py310-dj40: codecov

0 commit comments

Comments
 (0)