Skip to content

Commit bc2a5f5

Browse files
committed
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
1 parent e459d87 commit bc2a5f5

File tree

4 files changed

+16
-41
lines changed

4 files changed

+16
-41
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,23 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8']
13-
django-version: ['2.2', '3.0', '3.1', '3.2', '4.0', '4.1', '4.2', 'main']
12+
python-version: ['3.8', '3.9', '3.10', '3.11', 'pypy-3.10']
13+
django-version: ['3.2', '4.1', '4.2', 'main']
1414
exclude:
15-
- python-version: '3.7'
16-
django-version: '4.0'
17-
- python-version: '3.7'
18-
django-version: '4.1'
1915
- python-version: '3.8'
2016
django-version: '4.1'
21-
- python-version: '3.7'
22-
django-version: '4.2'
2317
- python-version: '3.8'
2418
django-version: '4.2'
25-
- python-version: '3.7'
26-
django-version: 'main'
2719
- python-version: '3.8'
2820
django-version: 'main'
29-
- python-version: 'pypy-3.8'
21+
- python-version: 'pypy-3.10'
22+
django-version: '4.1'
23+
- python-version: 'pypy-3.10'
24+
django-version: '4.2'
25+
- python-version: 'pypy-3.10'
3026
django-version: 'main'
31-
- python-version: '3.10'
32-
django-version: '2.2'
33-
- python-version: '3.10'
34-
django-version: '3.0'
35-
- python-version: '3.10'
36-
django-version: '3.1'
3727
- python-version: '3.10'
3828
django-version: '3.2'
39-
- python-version: '3.11'
40-
django-version: '2.2'
41-
- python-version: '3.11'
42-
django-version: '3.0'
43-
- python-version: '3.11'
44-
django-version: '3.1'
4529
- python-version: '3.11'
4630
django-version: '3.2'
4731

HISTORY.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
History
44
=======
55

6+
Unreleased
7+
==========
8+
* Use Pypy 3.10
9+
* Drop support for Python 3.7
10+
* Drop support for Django 2
11+
612
2.1.0
713
=====
814

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,16 @@
2222
'Development Status :: 5 - Production/Stable',
2323
'Environment :: Web Environment',
2424
'Framework :: Django',
25-
'Framework :: Django :: 2.2',
26-
'Framework :: Django :: 3.0',
27-
'Framework :: Django :: 3.1',
2825
'Framework :: Django :: 3.2',
2926
'Framework :: Django :: 4.0',
3027
'Framework :: Django :: 4.1',
28+
'Framework :: Django :: 4.2',
3129
'Intended Audience :: Developers',
3230
'License :: OSI Approved :: MIT License',
3331
'Operating System :: OS Independent',
3432
'Programming Language :: Python',
3533
'Programming Language :: Python :: 3',
3634
'Programming Language :: Python :: 3 :: Only',
37-
'Programming Language :: Python :: 3.7',
3835
'Programming Language :: Python :: 3.8',
3936
'Programming Language :: Python :: 3.9',
4037
'Programming Language :: Python :: 3.10',

tox.ini

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
[tox]
22
envlist =
3-
pypy3-dj{22,30,31,32}
4-
py{37,38,39}-dj{22,30,31}
5-
py{37,38,39,310,311}-dj32
6-
py{38,39,310,311}-dj40
3+
pypy3-dj{32,41,42}
4+
py{38,39,310,311}-dj32
75
py{39,310,311}-dj{41,42,main}
86
docs
97

108
[gh-actions]
119
python =
12-
3.7: py37
1310
3.8: py38, docs
1411
3.9: py39
1512
3.10: py310
@@ -18,30 +15,21 @@ python =
1815

1916
[gh-actions:env]
2017
DJANGO =
21-
2.2: dj22
22-
3.0: dj30
23-
3.1: dj31
2418
3.2: dj32
25-
4.0: dj40
2619
4.1: dj41
2720
4.2: dj42
2821
main: djmain
2922

3023
[testenv]
3124
basepython =
3225
pypy3: pypy3
33-
py37: python3.7
3426
py38: python3.8
3527
py39: python3.9
3628
py310: python3.10
3729
py311: python3.11
3830
deps =
3931
pypy3: mock
40-
dj22: Django>=2.2.1,<2.3
41-
dj30: Django>=3.0,<3.1
42-
dj31: Django>=3.1,<3.2
4332
dj32: Django>=3.2,<3.3
44-
dj40: Django>=4.0,<4.1
4533
dj41: Django>=4.1,<4.2
4634
dj42: Django>=4.2,<4.3
4735
djmain: https://github.com/django/django/archive/main.tar.gz

0 commit comments

Comments
 (0)