Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove EOL Python, Django and DRF versions #754

Merged
merged 2 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.0', '4.1', '4.2']
drf-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
python-version: [ '3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.1', '4.2']
drf-version: ['3.12', '3.13', '3.14']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does drf 3.14 support django 4.2?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, it does not officially. However, based on the conversations on DRF (encode/django-rest-framework#8942) it seems nothing breaks with Django 4.2 most of the times. Moreover, DRF 3.14 is already being tested with Django 4.2 here on master.

exclude:
# DRF 3.13 is not compatible with Django 4.2.
- django-version: '4.2'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ repos:
rev: 'v3.7.0'
hooks:
- id: pyupgrade
args: ['--py37-plus', '--keep-mock']
args: ['--py38-plus', '--keep-mock']

- repo: https://github.com/Lucas-C/pre-commit-hooks-markup
rev: v1.0.1
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Requirements
------------

* Python (3.8, 3.9, 3.10, 3.11)
* Django (3.2, 4.0, 4.1, 4.2)
* Django REST Framework (3.10, 3.11, 3.12, 3.13, 3.14)
* Django (3.2, 4.1, 4.2)
* Django REST Framework (3.12, 3.13, 3.14)

These are the officially supported python and package versions. Other versions
will probably work. You're free to modify the tox config and see what is
Expand Down
6 changes: 3 additions & 3 deletions rest_framework_simplejwt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pkg_resources import DistributionNotFound, get_distribution
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = get_distribution("djangorestframework_simplejwt").version
except DistributionNotFound:
__version__ = version("djangorestframework_simplejwt")
except PackageNotFoundError:

Check warning on line 5 in rest_framework_simplejwt/__init__.py

View check run for this annotation

Codecov / codecov/patch

rest_framework_simplejwt/__init__.py#L5

Added line #L5 was not covered by tests
# package is not installed
__version__ = None
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
author_email="[email protected]",
install_requires=[
"django>=3.2",
"djangorestframework>=3.10",
"djangorestframework>=3.12",
"pyjwt>=1.7.1,<3",
],
python_requires=">=3.7",
python_requires=">=3.8",
extras_require=extras_require,
packages=find_packages(exclude=["tests", "tests.*", "licenses", "requirements"]),
include_package_data=True,
Expand All @@ -69,15 +69,13 @@
"Environment :: Web Environment",
"Framework :: Django",
"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.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
11 changes: 2 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist=
py{37,38,39,310}-dj{32}-drf{311,312,313}-pyjwt{171,2}-tests
py{38,39,310}-dj{40,41,42}-drf313-pyjwt{171,2}-tests
py{38,39,310}-dj{32}-drf{312,313}-pyjwt{171,2}-tests
py{38,39,310}-dj{41,42}-drf313-pyjwt{171,2}-tests
py311-dj{41,42}-drf{313,314}-pyjwt{171,2}-tests
docs

[gh-actions]
python=
3.7: py37
3.8: py38, docs
3.9: py39
3.10: py310
Expand All @@ -16,12 +15,9 @@ python=
[gh-actions:env]
DJANGO=
3.2: dj32
4.0: dj40
4.1: dj41
4.2: dj42
DRF=
3.10: drf310
3.11: drf311
3.12: drf312
3.13: drf313
3.14: drf314
Expand All @@ -35,11 +31,8 @@ setenv=
PYTHONDONTWRITEBYTECODE=1
deps=
dj32: Django>=3.2,<3.3
dj40: Django>=4.0,<4.1
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<4.3
drf310: djangorestframework>=3.10,<3.11
drf311: djangorestframework>=3.11,<3.12
drf312: djangorestframework>=3.12,<3.13
drf313: djangorestframework>=3.13,<3.14
drf314: djangorestframework>=3.14,<3.15
Expand Down
Loading