Drop Django 2.1 support (dj-stripe#1066)

Was EOL in December 2019
ryancausey · Jan 13, 2020 · f842e7f · f842e7f
1 parent 6c90910
commit f842e7f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,17 +12,11 @@ matrix:
 
   include:
     # Don't test postgres_native_json, mysql & sqlite vs all python versions to reduce combinations
-    - { python: "3.5", env: TOXENV=py35-django21-postgres }
     - { python: "3.5", env: TOXENV=py35-django22-postgres }
 
-    - { python: "3.6", env: TOXENV=py36-django21-postgres }
     - { python: "3.6", env: TOXENV=py36-django22-postgres }
     - { python: "3.6", env: TOXENV=py36-django30-postgres }
 
-    - { python: "3.7", env: TOXENV=py37-django21-postgres }
-    - { python: "3.7", env: TOXENV=py37-django21-postgres_native_json }
-    - { python: "3.7", env: TOXENV=py37-django21-mysql }
-    - { python: "3.7", env: TOXENV=py37-django21-sqlite }
     - { python: "3.7", env: TOXENV=py37-django22-postgres }
     - { python: "3.7", env: TOXENV=py37-django22-postgres_native_json }
     - { python: "3.7", env: TOXENV=py37-django22-mysql }

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 =======
 
+2.3.0 (unreleased)
+------------------
+
+- Dropped support for Django 2.1.
+
 2.2.0 (2020-01-13)
 ------------------
 

diff --git a/README.rst b/README.rst
@@ -34,7 +34,7 @@ Features
 Requirements
 ------------
 
-* Django >= 2.1
+* Django >= 2.2
 * Python >= 3.5
 * Supports Stripe exclusively. For PayPal, see `dj-paypal <https://github.com/HearthSim/dj-paypal>`_ instead.
 * PostgreSQL engine (recommended): >= 9.4

diff --git a/docs/index.rst b/docs/index.rst
@@ -4,7 +4,7 @@ Django + Stripe Made Easy
 * Subscription management
 * Designed for easy implementation of post-registration subscription forms
 * Single-unit purchases
-* Works with Django >= 2.1
+* Works with Django >= 2.2
 * Works with Python >= 3.5
 * Built-in migrations
 * Dead-Easy installation

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,7 +2,7 @@ pip>=10.0.1
 setuptools>=39.2.0
 wheel>=0.31.1
 six>=1.11.0
-django>=2.0.5
+django>=2.2.0
 stripe>=2.41.0
 python-doc-inherit>=0.3.0
 jsonfield2>=3.0.3

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dj-stripe
-version = 2.2.0
+version = 2.3.0dev
 description = Django + Stripe Made Easy
 author = Alexander Kavanaugh
 author_email = alex@kavdev.io
@@ -20,7 +20,6 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Framework :: Django
-    Framework :: Django :: 2.1
     Framework :: Django :: 2.2
     Framework :: Django :: 3.0
 
@@ -29,8 +28,8 @@ packages = find:
 include_package_data = True
 zip_safe = False
 install_requires =
-    Django >= 2.1
-    # >= 3.0.3 needed for Django 3, < 3.1 needed for Django 2.1
+    Django >= 2.2
+    # >= 3.0.3 needed for Django 3
     jsonfield2
     # >= 2.32.0 needed for stripe.SetupIntent
     # avoid 2.36.0, see https://github.com/dj-stripe/dj-stripe/issues/991

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    py35-django{21,22}-{postgres,postgres_native_json,mysql,sqlite}
-    py36-django{21,22,30}-{postgres,postgres_native_json,mysql,sqlite}
-    py37-django{21,22,30,master}-{postgres,postgres_native_json,mysql,sqlite}
+    py35-django{22}-{postgres,postgres_native_json,mysql,sqlite}
+    py36-django{22,30}-{postgres,postgres_native_json,mysql,sqlite}
+    py37-django{22,30,master}-{postgres,postgres_native_json,mysql,sqlite}
     py38-django{22,30,master}-{postgres,postgres_native_json,mysql,sqlite}
     py37-django22-checkmigrations
     lint
@@ -26,9 +26,6 @@ deps =
     postgres_native_json: psycopg2
     mysql: mysqlclient
 
-    django21: Django>=2.1,<2.2
-    # jsonfield2>=3.1 doesn't support Django 2.1
-    django21: jsonfield2<3.1
     django22: Django>=2.2,<2.3
     django30: Django>=3.0a1,<3.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,11 @@ @@
     History
     =======
+.3.0 (unreleased)
+    ------------------
+    - Dropped support for Django 2.1.
 .2.0 (2020-01-13)
     ------------------
@@ Expand Down @@