Skip to content

Commit

Permalink
Drop support for obsolete Python and Django versions.
Browse files Browse the repository at this point in the history
* Drop Python 3.6 and 3.7.
* Drop Django 4.0.
* Upgrade development dependencies.
  • Loading branch information
tiborhari committed Jun 4, 2023
1 parent d22c38a commit 900bd86
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install 'tox~=3.24.5' 'tox-gh-actions~=2.9.1'
python -m pip install 'tox~=4.5.2' 'tox-gh-actions~=3.1.1'
- name: Test with tox
run: tox
- name: Upload Artifacts
Expand Down
3 changes: 1 addition & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ Compatible Django and Python versions:
============== ========================
Django version Python versions
============== ========================
3.2 LTS 3.6, 3.7, 3.8, 3.9, 3.10
4.0 3.8, 3.9, 3.10
3.2 LTS 3.8, 3.9, 3.10
4.1 3.8, 3.9, 3.10, 3.11
4.2 3.8, 3.9, 3.10, 3.11
============== ========================
2 changes: 1 addition & 1 deletion django_admin_reset/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.6.2'
__version__ = '0.7.0'
20 changes: 10 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
packages=['django_admin_reset'],
package_data={'django_admin_reset': ['templates/admin/*.html',
'locale/*/LC_MESSAGES/*.[mp]o']},
python_requires='>=3.6, <4',
install_requires=['django>=3.2,<4.3'],
python_requires='>=3.8, <4',
install_requires=['django>=3.2,<4.3,!=4.0'],
extras_require={
'testing': [
'flake8~=5.0.4',
'pytest~=6.2.5',
'pytest-cov~=3.0.0',
'pytest-django~=3.10.0',
'tox~=3.25.0'],
'flake8~=6.0.0',
'pytest~=7.3.1',
'pytest-cov~=4.1.0',
'pytest-django~=4.5.2',
'tox~=4.5.2'],
'docs': [
'sphinx~=4.5.0',
'sphinx_rtd_theme~=1.0.0'],
'sphinx~=6.2.1',
'sphinx_rtd_theme~=1.2.1'],
'babel': [
'babel~=2.10.1']
'babel~=2.12.1']
},
)
17 changes: 5 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist =
py{36,37,38,39,310}-django32
py{38,39,310}-django40
py{38,39,310}-django32
py{38,39,310,311}-django41
py{38,39,310,311}-django42
docs
Expand All @@ -10,11 +9,7 @@ envlist =
[testenv]
pip_pre = True
deps =
django22: Django>=2.2.8,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
django42: Django>=4.2,<4.3
commands =
Expand All @@ -23,26 +18,24 @@ commands =
flake8

[testenv:docs]
basepython = python3.10
basepython = python3.11
commands =
pip install -e .[docs]
sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build

[testenv:package]
basepython = python3.10
basepython = python3.11
commands =
pip install -e .[babel]
pybabel compile --domain django --directory django_admin_reset/locale
python setup.py bdist_wheel --universal

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310, docs, package
3.11: py311
3.10: py310
3.11: py311, docs, package

[pytest]
DJANGO_SETTINGS_MODULE = django_admin_reset.tests.settings
Expand Down

0 comments on commit 900bd86

Please sign in to comment.