From c81dd885d546faed0c4a8e96992e375ff4cdc616 Mon Sep 17 00:00:00 2001
From: Shinya Ohyanagi <heavenshell.jp@gmail.com>
Date: Tue, 15 Feb 2022 00:11:27 +0900
Subject: [PATCH] Bump version and tidy tox's version

---
 .travis.yml                | 34 ++++++++++++++--------------------
 README.rst                 |  1 +
 setup.py                   |  6 +++---
 timezone_utils/__init__.py |  2 +-
 tox.ini                    | 16 ++++++++--------
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 98b3574..7470e57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
@@ -25,16 +15,20 @@ 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
@@ -42,9 +36,9 @@ matrix:
   - 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:
diff --git a/README.rst b/README.rst
index 35c466b..caf498b 100644
--- a/README.rst
+++ b/README.rst
@@ -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.
diff --git a/setup.py b/setup.py
index 37bfde4..41353c3 100644
--- a/setup.py
+++ b/setup.py
@@ -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',
     ],
diff --git a/timezone_utils/__init__.py b/timezone_utils/__init__.py
index 262c35d..d0776a4 100644
--- a/timezone_utils/__init__.py
+++ b/timezone_utils/__init__.py
@@ -1,2 +1,2 @@
-__version__ = (0, 14, 0)
+__version__ = (0, 15, 0)
 VERSION = '.'.join(map(str, __version__))
diff --git a/tox.ini b/tox.ini
index 0b0fb7a..e268791 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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
@@ -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