Dropped support for EOL Python 3.6 and 3.7

django · Sep 23, 2023 · 9887af4 · 9887af4
1 parent c539612
commit 9887af4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,29 +39,11 @@ jobs:
       - name: Run prospector linting
         run: tox -e prospector
 
-  test_python_36:
-    runs-on: ubuntu-20.04
-    name: Python 3.6
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.6
-          architecture: x64
-      - name: Install tox
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade tox tox-py
-      - name: Run tests
-        run: tox --py 36
-
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - 3.7
           - 3.8
           - 3.9
           - '3.10'

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -37,19 +37,19 @@ the ``-l`` option::
     $ tox -l
     docs
     ...
-    py36-master
+    py311-master
 
 You can run each environment with the ``-e`` option::
 
-    $ tox -e py36-1.11  # runs the tests only on Python 3.6 and Django 1.11.x
+    $ tox -e py311-4.2  # runs the tests only on Python 3.11 and Django 4.2.x
 
 Optionally you can also specify a country whose tests you want to run::
 
     $ COUNTRY=us tox
 
 And combine both options::
 
-    $ COUNTRY=us tox -e py36-1.11
+    $ COUNTRY=us tox -e py311-4.2
 
 __ https://github.com/django/django-localflavor/issues
 __ https://tox.readthedocs.io/en/latest/install.html
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -19,7 +19,7 @@ Modifications to existing flavors:
 
 Other changes:
 
-- None
+- Dropped support for Python 3.6 and 3.7.
 
 
 4.0   (2023-04-22)

diff --git a/setup.py b/setup.py
@@ -135,8 +135,6 @@ def find_package_data(where='.', package='',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        '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',

diff --git a/tox.ini b/tox.ini
@@ -2,16 +2,14 @@
 args_are_paths = false
 envlist =
     docs,prospector
-    {py36,py37,py38,py39,py310,pypy39}-django-3.2
+    {py38,py39,py310,pypy39}-django-3.2
     {py38,py39,py310,pypy39}-django-4.0
     {py38,py39,py310,py311,pypy39}-django-4.1
     {py38,py39,py310,py311,pypy39}-django-4.2
     {py310,py311}-django-main
 
 [testenv]
 basepython =
-    py36: python3.6
-    py37: python3.7
     py38: python3.8
     py39: python3.9
     py310: python3.10
@@ -27,7 +25,7 @@ deps =
     django-3.2: Django>=3.2,<3.3
     django-4.0: Django>=4.0,<4.1
     django-4.1: Django>=4.1,<4.2
-    django-4.2: Django>=4.2b1,<4.3
+    django-4.2: Django>=4.2,<4.3
     django-main: https://github.com/django/django/archive/main.tar.gz
     -r{toxinidir}/tests/requirements.txt