From e7f757e13dee7bbce373b73ba45e0619f92154f7 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 5 Mar 2025 07:48:17 +0000 Subject: [PATCH 1/3] Remove Python 3.7 Trove classifier as support was already dropped --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 0d41ad13..1ec450e9 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ def _pyimp(): License :: OSI Approved :: BSD License 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 From 3b26c1070ea683fbd1fdd4306c13cc9a031474cc Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 5 Mar 2025 07:52:51 +0000 Subject: [PATCH 2/3] Drop support for Python 3.8 --- .github/workflows/test.yaml | 6 +----- .pre-commit-config.yaml | 2 +- .readthedocs.yaml | 2 +- setup.py | 2 +- tox.ini | 1 - 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 81345e8c..36d5babc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,7 +13,7 @@ jobs: runs-on: blacksmith-4vcpu-ubuntu-2204 strategy: matrix: - python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9" ] django: [ "32", "42", "50", "51" ] exclude: - python-version: "3.13" @@ -24,14 +24,10 @@ jobs: django: "50" - python-version: "3.11" django: "32" - - python-version: "3.8" - django: "50" - python-version: "3.9" django: "50" - python-version: "pypy3.9" django: "50" - - python-version: "3.8" - django: "51" - python-version: "3.9" django: "51" - python-version: "pypy3.9" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c72a098b..d9b73b41 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: rev: v3.19.1 hooks: - id: pyupgrade - args: ["--py36-plus"] + args: ["--py39-plus"] - repo: https://github.com/PyCQA/flake8 rev: 7.1.2 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d379de28..a6fb9c58 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -2,7 +2,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.8" + python: "3.9" sphinx: configuration: docs/conf.py python: diff --git a/setup.py b/setup.py index 1ec450e9..59150c0f 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ def _pyimp(): License :: OSI Approved :: BSD License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 @@ -157,6 +156,7 @@ def run_tests(self): platforms=['any'], license='BSD', classifiers=classifiers, + python_requires='>=3.9', install_requires=reqs('default.txt'), tests_require=reqs('test.txt') + reqs('test-django.txt'), cmdclass={'test': pytest}, diff --git a/tox.ini b/tox.ini index aa8c3c70..a6689022 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ envlist = py311-django{51,50,42} py310-django{51,50,42,32} py39-django{42,32} - py38-django{42,32} pypy39-django{42,32} flake8 From 350add1c46da54f29c21ba118ca011b76d53dbc0 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 5 Mar 2025 08:00:13 +0000 Subject: [PATCH 3/3] Drop support for Django 3.2-4.1 --- .github/workflows/test.yaml | 8 +------- django_celery_results/__init__.py | 5 ----- requirements/default.txt | 2 +- requirements/docs.txt | 2 +- requirements/test-django.txt | 2 +- requirements/test-django32.txt | 1 - requirements/test-django40.txt | 1 - requirements/test-django41.txt | 1 - setup.py | 3 --- t/proj/settings.py | 2 -- tox.ini | 10 +++------- 11 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 requirements/test-django32.txt delete mode 100644 requirements/test-django40.txt delete mode 100644 requirements/test-django41.txt diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 36d5babc..dd7eea2b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,16 +14,12 @@ jobs: strategy: matrix: python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9" ] - django: [ "32", "42", "50", "51" ] + django: [ "42", "50", "51" ] exclude: - - python-version: "3.13" - django: "32" - python-version: "3.13" django: "42" - python-version: "3.13" django: "50" - - python-version: "3.11" - django: "32" - python-version: "3.9" django: "50" - python-version: "pypy3.9" @@ -32,8 +28,6 @@ jobs: django: "51" - python-version: "pypy3.9" django: "51" - - python-version: "3.12" - django: "32" services: postgres: diff --git a/django_celery_results/__init__.py b/django_celery_results/__init__.py index 154dae95..3643b338 100644 --- a/django_celery_results/__init__.py +++ b/django_celery_results/__init__.py @@ -7,8 +7,6 @@ import re from collections import namedtuple -import django - __version__ = '2.5.1' __author__ = 'Asif Saif Uddin, Ask Solem' __contact__ = 'auvipy@gmail.com' @@ -31,6 +29,3 @@ del re __all__ = [] - -if django.VERSION < (3, 2): - default_app_config = 'django_celery_results.apps.CeleryResultConfig' diff --git a/requirements/default.txt b/requirements/default.txt index b61f5d4b..0ee0bb74 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -1,2 +1,2 @@ celery>=5.2.7,<6.0 -Django>=3.2.25 +Django>=4.2 diff --git a/requirements/docs.txt b/requirements/docs.txt index c4f74989..87484412 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,3 +1,3 @@ sphinx_celery>=1.1 -Django>=3.2.25 +Django>=4.2 celery>=5.2.7,<6.0 diff --git a/requirements/test-django.txt b/requirements/test-django.txt index edbfd023..79b95006 100644 --- a/requirements/test-django.txt +++ b/requirements/test-django.txt @@ -1,2 +1,2 @@ -Django>=3.2,<6.0 +Django>=4.2,<6.0 psycopg>=3.1.8 diff --git a/requirements/test-django32.txt b/requirements/test-django32.txt deleted file mode 100644 index 1794178c..00000000 --- a/requirements/test-django32.txt +++ /dev/null @@ -1 +0,0 @@ -django>=3.2.25,<4.0 diff --git a/requirements/test-django40.txt b/requirements/test-django40.txt deleted file mode 100644 index 65f972f0..00000000 --- a/requirements/test-django40.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.0.10,<4.1 diff --git a/requirements/test-django41.txt b/requirements/test-django41.txt deleted file mode 100644 index a5272e4e..00000000 --- a/requirements/test-django41.txt +++ /dev/null @@ -1 +0,0 @@ -django>=4.1.13,<4.2 diff --git a/setup.py b/setup.py index 59150c0f..3866d25a 100644 --- a/setup.py +++ b/setup.py @@ -42,9 +42,6 @@ def _pyimp(): Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy Framework :: Django - Framework :: Django :: 3.2 - Framework :: Django :: 4.0 - Framework :: Django :: 4.1 Framework :: Django :: 4.2 Framework :: Django :: 5.0 Framework :: Django :: 5.1 diff --git a/t/proj/settings.py b/t/proj/settings.py index 227d5976..ea919348 100644 --- a/t/proj/settings.py +++ b/t/proj/settings.py @@ -168,8 +168,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True DJANGO_CELERY_RESULTS_TASK_ID_MAX_LENGTH = 191 diff --git a/tox.ini b/tox.ini index a6689022..61ec1855 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ envlist = py313-django{51} py312-django{51,50,42} py311-django{51,50,42} - py310-django{51,50,42,32} - py39-django{42,32} - pypy39-django{42,32} + py310-django{51,50,42} + py39-django{42} + pypy39-django{42} flake8 apicheck @@ -15,7 +15,6 @@ envlist = [travis:env] DJANGO = - 3.2: django32 4.2: django42 5.0: django50 5.1: django51 @@ -26,9 +25,6 @@ deps= -r{toxinidir}/requirements/test.txt -r{toxinidir}/requirements/test-ci.txt - django41: -r{toxinidir}/requirements/test-django41.txt - django40: -r{toxinidir}/requirements/test-django40.txt - django32: -r{toxinidir}/requirements/test-django32.txt django42: -r{toxinidir}/requirements/test-django42.txt django50: -r{toxinidir}/requirements/test-django50.txt django51: -r{toxinidir}/requirements/test-django51.txt