Use Pypy 3.10, drop Python 3.7 and Django 2

Upgrade pypy to 3.10 Drop support for Python 3.7 and django 2,3.0,3.1 Update history file
jazzband · Nov 28, 2023 · bc2a5f5 · bc2a5f5
1 parent e459d87
commit bc2a5f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 41 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,39 +9,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8']
-        django-version: ['2.2', '3.0', '3.1', '3.2', '4.0', '4.1', '4.2', 'main']
+        python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.10']
+        django-version: ['3.2', '4.1', '4.2', 'main']
         exclude:
-          - python-version: '3.7'
-            django-version: '4.0'
-          - python-version: '3.7'
-            django-version: '4.1'
           - python-version: '3.8'
             django-version: '4.1'
-          - python-version: '3.7'
-            django-version: '4.2'
           - python-version: '3.8'
             django-version: '4.2'
-          - python-version: '3.7'
-            django-version: 'main'
           - python-version: '3.8'
             django-version: 'main'
-          - python-version: 'pypy-3.8'
+          - python-version: 'pypy-3.10'
+            django-version: '4.1'
+          - python-version: 'pypy-3.10'
+            django-version: '4.2'
+          - python-version: 'pypy-3.10'
             django-version: 'main'
-          - python-version: '3.10'
-            django-version: '2.2'
-          - python-version: '3.10'
-            django-version: '3.0'
-          - python-version: '3.10'
-            django-version: '3.1'
           - python-version: '3.10'
             django-version: '3.2'
-          - python-version: '3.11'
-            django-version: '2.2'
-          - python-version: '3.11'
-            django-version: '3.0'
-          - python-version: '3.11'
-            django-version: '3.1'
           - python-version: '3.11'
             django-version: '3.2'
 

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,12 @@
 History
 =======
 
+Unreleased
+==========
+* Use Pypy 3.10
+* Drop support for Python 3.7
+* Drop support for Django 2
+
 2.1.0
 =====
 

diff --git a/setup.py b/setup.py
@@ -22,19 +22,16 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        '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
@@ -1,15 +1,12 @@
 [tox]
 envlist =
-  pypy3-dj{22,30,31,32}
-  py{37,38,39}-dj{22,30,31}
-  py{37,38,39,310,311}-dj32
-  py{38,39,310,311}-dj40
+  pypy3-dj{32,41,42}
+  py{38,39,310,311}-dj32
   py{39,310,311}-dj{41,42,main}
   docs
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38, docs
     3.9: py39
     3.10: py310
@@ -18,30 +15,21 @@ python =
 
 [gh-actions:env]
 DJANGO =
-    2.2: dj22
-    3.0: dj30
-    3.1: dj31
     3.2: dj32
-    4.0: dj40
     4.1: dj41
     4.2: dj42
     main: djmain
 
 [testenv]
 basepython =
   pypy3: pypy3
-  py37: python3.7
   py38: python3.8
   py39: python3.9
   py310: python3.10
   py311: python3.11
 deps =
   pypy3: mock
-  dj22: Django>=2.2.1,<2.3
-  dj30: Django>=3.0,<3.1
-  dj31: Django>=3.1,<3.2
   dj32: Django>=3.2,<3.3
-  dj40: Django>=4.0,<4.1
   dj41: Django>=4.1,<4.2
   dj42: Django>=4.2,<4.3
   djmain: https://github.com/django/django/archive/main.tar.gz