From c6a9a0e9f03fd6c15269fcd6d5526b11cc39bebb Mon Sep 17 00:00:00 2001 From: Andreas Stocker Date: Fri, 13 Oct 2023 12:04:36 +0200 Subject: [PATCH] SIANXKE-335: Updated supported Python and Celery versions --- .github/workflows/test.yml | 14 ++++++++------ CHANGELOG.md | 7 +++++++ README.md | 6 +++--- requirements.txt | 6 +++--- setup.py | 6 +++--- tests/test_project/manage.py | 1 - tests/test_project/test_project/settings.py | 12 ------------ tests/test_project/test_project/urls.py | 15 --------------- tests/test_project/test_project/wsgi.py | 9 --------- 9 files changed, 24 insertions(+), 52 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3eadc96..1a5d562 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,14 +13,17 @@ jobs: fail-fast: false matrix: python-version: - - "3.6" - - "3.7" - "3.8" - "3.9" - "3.10" + - "3.11" + - "3.12" celery-version: - - "5.0" - - "5.1" + - "5.2" + - "5.3" + exclude: + - python-version: "3.12" + celery-version: "5.2" steps: - uses: actions/checkout@v2 @@ -35,7 +38,6 @@ jobs: python -m pip install --upgrade pip pip install -r "requirements.txt" pip install "celery~=${{ matrix.celery-version }}.0" - pip install "importlib-metadata<5.0" - name: Lint with flake8 run: | @@ -55,4 +57,4 @@ jobs: coverage xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 978e751..39ad6bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Added support for Python 3.11 and Python 3.12 +- Added support for Celery 5.2 and 5.3 + +### Removed +- Removed support for Python 3.6 and Python 3.7 +- Removed support for Celery 5.0 and 5.1 ## [1.0.0] - 2021-10-19 ### Added diff --git a/README.md b/README.md index 499847f..19a6b5b 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,13 @@ result_exchange_type = 'direct' # Supported versions -| | Celery 5.0 | Celery 5.1 | +| | Celery 5.2 | Celery 5.3 | |-------------|------------|------------| -| Python 3.6 | ✓ | ✓ | -| Python 3.7 | ✓ | ✓ | | Python 3.8 | ✓ | ✓ | | Python 3.9 | ✓ | ✓ | | Python 3.10 | ✓ | ✓ | +| Python 3.11 | ✓ | ✓ | +| Python 3.12 | ✗ | ✓ | # List of developers diff --git a/requirements.txt b/requirements.txt index 51260b0..6e5e43e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ -e . # Development dependencies -pytest>=6.2,<6.3 -flake8>=3.9,<3.10 +pytest>=7.4,<7.5 +flake8>=6.1.0,<6.2.0 codecov>=2.1,<2.2 -django>=3.2,<3.3 +django>=4.2,<4.3 setuptools>=42 wheel>=0.37 twine>=3.4 diff --git a/setup.py b/setup.py index aa0ede8..6ee7f96 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ author='Andreas Stocker', author_email='AStocker@anexia-it.com', install_requires=[ - 'celery>=5.0,<6.0', + 'celery>=5.2,<6.0', ], classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -30,11 +30,11 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Framework :: Celery', 'Topic :: Software Development', ], diff --git a/tests/test_project/manage.py b/tests/test_project/manage.py index b455bc8..ca475ea 100755 --- a/tests/test_project/manage.py +++ b/tests/test_project/manage.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -"""Django's command-line utility for administrative tasks.""" import os import sys diff --git a/tests/test_project/test_project/settings.py b/tests/test_project/test_project/settings.py index bf7d3c8..63f8e0b 100644 --- a/tests/test_project/test_project/settings.py +++ b/tests/test_project/test_project/settings.py @@ -1,15 +1,3 @@ -""" -Django settings for test_project project. - -Generated by 'django-admin startproject' using Django 3.2.8. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ -""" - from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. diff --git a/tests/test_project/test_project/urls.py b/tests/test_project/test_project/urls.py index 7785dcc..9004533 100644 --- a/tests/test_project/test_project/urls.py +++ b/tests/test_project/test_project/urls.py @@ -1,18 +1,3 @@ -"""test_project URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/3.2/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path('', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) -""" __all__ = [ 'urlpatterns', ] diff --git a/tests/test_project/test_project/wsgi.py b/tests/test_project/test_project/wsgi.py index 8a19dad..1e6481c 100644 --- a/tests/test_project/test_project/wsgi.py +++ b/tests/test_project/test_project/wsgi.py @@ -1,12 +1,3 @@ -""" -WSGI config for test_project project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ -""" - import os from django.core.wsgi import get_wsgi_application