Skip to content

Commit

Permalink
Drop support for Django 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
hmpf committed Apr 9, 2024
1 parent 9235739 commit 2609cd7
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 239 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ There are several ways to install Argus.
#### Requirements

* Python 3.8+
* Django 3.2 or 4.2
* Django 4.2 or 5.0
* pip

#### Optional requirements
Expand Down
2 changes: 2 additions & 0 deletions changelog.d/+drop-django32.changed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Drop all support for Django 3.2. No version-specific requirements for 3.2 are
included anymore, and we no longer test on 3.2.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@

intersphinx_mapping = {
"django": (
"http://docs.djangoproject.com/en/3.2/",
"http://docs.djangoproject.com/en/3.2/_objects/",
"http://docs.djangoproject.com/en/4.2/",
"http://docs.djangoproject.com/en/4.2/_objects/",
),
}
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ requires-python = ">=3.8"
license = {text = "GPL-3.0-or-later"}
classifiers = [
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Intended Audience :: Information Technology",
"Intended Audience :: System Administrators",
Expand All @@ -25,7 +24,7 @@ classifiers = [
]
dependencies = [
'importlib-metadata; python_version<"3.8"',
"Django>=3.2.24,<5.1",
"Django>=4.2.11,<5.1",
"dj-database-url>=0.5.0",
"django-cors-headers>=3.2",
"django-filter",
Expand Down
221 changes: 0 additions & 221 deletions requirements-django32.txt

This file was deleted.

2 changes: 1 addition & 1 deletion requirements-django42.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ defusedxml==0.7.1
# social-auth-core
dj-database-url==2.0.0
# via argus-server (pyproject.toml)
django==4.2.10
django==4.2.11
# via
# -r requirements/django42.txt
# argus-server (pyproject.toml)
Expand Down
10 changes: 4 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=requirements-django32.txt constraints.txt pyproject.toml requirements/django32.txt
# pip-compile --output-file=requirements-django42.txt constraints.txt pyproject.toml requirements/django42.txt
#
anyio==3.7.1
# via httpcore
Expand Down Expand Up @@ -61,9 +61,9 @@ defusedxml==0.7.1
# social-auth-core
dj-database-url==2.0.0
# via argus-server (pyproject.toml)
django==3.2.24
django==4.2.11
# via
# -r requirements/django32.txt
# -r requirements/django42.txt
# argus-server (pyproject.toml)
# channels
# dj-database-url
Expand Down Expand Up @@ -150,9 +150,7 @@ python-dateutil==2.8.2
python3-openid==3.2.0
# via social-auth-core
pytz==2024.1
# via
# django
# djangorestframework
# via djangorestframework
pyyaml==6.0.1
# via
# -r constraints.txt
Expand Down
1 change: 0 additions & 1 deletion requirements/django32.txt

This file was deleted.

7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[tox]
envlist =
clean
py{38,39}-django{32,42}
py{310}-django{32,42,50}
py{38,39,310}-django{42}
py{311,312}-django{42,50}
coverage-html
skipsdist = True
Expand Down Expand Up @@ -50,10 +49,9 @@ setenv =
PIP_CONSTRAINT=constraints.txt

commands =
pip-compile --resolver backtracking --output-file requirements-django32.txt {posargs} pyproject.toml requirements/django32.txt constraints.txt
pip-compile --resolver backtracking --output-file requirements-django42.txt {posargs} pyproject.toml requirements/django42.txt constraints.txt
pip-compile --resolver backtracking --output-file requirements-django50.txt {posargs} pyproject.toml requirements/django50.txt constraints.txt
cp requirements-django32.txt requirements.txt
cp requirements-django42.txt requirements.txt

[testenv:coverage-xml]
basepython = python3.10
Expand All @@ -79,7 +77,6 @@ setenv =
LANG=C.UTF-8
PYTHONPATH = {toxinidir}/src
PYTHONWARNINGS=once::DeprecationWarning
django32: DJANGO_VER=32
django42: DJANGO_VER=42
django50: DJANGO_VER=50

Expand Down

0 comments on commit 2609cd7

Please sign in to comment.