From e352157f8589bd8b47170bbb1339bb71f0ec74a4 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Thu, 30 Nov 2023 15:26:17 +0330 Subject: [PATCH] Update Python and Django versions --- .github/workflows/test.yml | 14 +++----------- .pre-commit-config.yaml | 4 ++-- CHANGELOG.md | 5 +++++ README.rst | 2 +- setup.cfg | 3 +-- tox.ini | 9 +++------ 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5db5b06..d3235d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,23 +12,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.0', '4.1', 'main'] + python-version: ['3.8', '3.9', '3.10', '3.11'] + django-version: ['3.2', '4.1', '4.2', 'main'] exclude: - - python-version: '3.7' - django-version: '4.0' - - python-version: '3.7' - django-version: '4.1' - - python-version: '3.7' - django-version: 'main' - python-version: '3.8' django-version: 'main' - python-version: '3.9' django-version: 'main' - python-version: '3.11' django-version: '3.2' - - python-version: '3.11' - django-version: '4.0' steps: - uses: actions/checkout@v2 - name: Setup python @@ -54,7 +46,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 architecture: x64 - run: | pip install wheel diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c9713d2..996e515 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: - id: black args: - "--target-version" - - "py37" + - "py38" - repo: https://github.com/PyCQA/flake8 rev: "6.1.0" hooks: @@ -20,4 +20,4 @@ repos: rev: v3.15.0 hooks: - id: pyupgrade - args: [--py37-plus] + args: [--py38-plus] diff --git a/CHANGELOG.md b/CHANGELOG.md index d94bf03..399f8d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### Changed +- Drop Python 3.7 support +- Confirm Python 3.12 support +- Drop Django 4.1 support + ## [6.0.1] - 2022-11-29 ### Changed - Add Django 4.1 support diff --git a/README.rst b/README.rst index c45204d..61e67ac 100644 --- a/README.rst +++ b/README.rst @@ -102,7 +102,7 @@ Usage .. code:: shell $ python manage.py shell - Python 3.7.0 (default, Nov 26 2018, 15:26:54) + Python 3.8.18 (default, Nov 26 2018, 15:26:54) [GCC 6.3.0 20170516] on linux Type "help", "copyright", "credits" or "license" for more information. (InteractiveConsole) diff --git a/setup.cfg b/setup.cfg index 87cc973..7f54eb9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,7 @@ author_email = eslashmili@gmail.com keywords = django jalali license = Python Software Foundation License platforms = any +python_requires= ">=3.8" long_description = file: README.rst classifiers = Development Status :: 5 - Production/Stable @@ -17,7 +18,6 @@ classifiers = 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 @@ -25,7 +25,6 @@ classifiers = Programming Language :: Python :: Implementation :: CPython Framework :: Django Framework :: Django :: 3.2 - Framework :: Django :: 4.0 Framework :: Django :: 4.1 Framework :: Django :: 4.2 diff --git a/tox.ini b/tox.ini index 8334baa..885a142 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,21 @@ [tox] envlist = - py{37,38,39,310}-dj32 - py{38,39,310}-dj40 + py{38,39,310}-dj32 py{38,39,310,311}-dj{41,42} - py{310,311}-djmain + py{310,311,312}-djmain py38-lint [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = 3.2: dj32 - 4.0: dj40 4.1: dj41 4.2: dj42 main: djmain @@ -26,7 +24,6 @@ DJANGO = deps = -rrequirements-test.txt dj32: Django==3.2.* - dj40: Django==4.0.* dj41: Django==4.1.* dj42: Django==4.2.* djmain: https://github.com/django/django/archive/main.tar.gz