From 90b624d6db1001f85d58dbb5b3352388f98e53d9 Mon Sep 17 00:00:00 2001 From: Palwisha Akhtar Date: Fri, 25 Apr 2025 19:35:23 -0600 Subject: [PATCH 1/2] chore: Drop support for Python 3.8 --- .github/workflows/ci.yml | 6 +-- .github/workflows/publish_pypi.yml | 6 +-- HISTORY.rst | 3 ++ requirements/base.txt | 16 ++---- requirements/dev.txt | 78 ++++++++++++------------------ requirements/pip-tools.txt | 20 +++----- requirements/pip.txt | 10 ++-- requirements/test.txt | 78 ++++++++++++------------------ requirements/tox.txt | 76 ++++++++++++----------------- setup.py | 1 - tox.ini | 2 +- 11 files changed, 121 insertions(+), 175 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b866d6..006b766 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,13 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.8', '3.11', '3.12'] + python-version: ['3.11', '3.12'] toxenv: ['django42'] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 5a2a3f9..b4a9bea 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -12,11 +12,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.12 - name: Install pip run: pip install -r requirements/pip.txt diff --git a/HISTORY.rst b/HISTORY.rst index d188235..6b5f640 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,9 @@ History ------- +2.0.0 (2020-05-29) +* Drop support for Python 3.8 + 1.0.0 (2020-05-29) ------------------ diff --git a/requirements/base.txt b/requirements/base.txt index 40b3075..ea98e52 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,29 +1,21 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # asgiref==3.8.1 # via django -babel==2.16.0 +babel==2.17.0 # via # -r requirements/base.in # enmerkar -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django -django==4.2.16 +django==4.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # enmerkar enmerkar==0.7.1 # via -r requirements/base.in -pytz==2024.1 - # via babel -sqlparse==0.5.1 +sqlparse==0.5.3 # via django -typing-extensions==4.12.2 - # via asgiref diff --git a/requirements/dev.txt b/requirements/dev.txt index 4cd9570..14f1722 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,61 +1,53 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx asgiref==3.8.1 # via django -babel==2.16.0 +babel==2.17.0 # via # -r requirements/base.in # enmerkar # sphinx -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django -certifi==2024.8.30 +certifi==2025.1.31 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests -coverage[toml]==7.6.1 +coverage[toml]==7.8.0 # via # -r requirements/test.in # pytest-cov # python-coveralls -django==4.2.16 +django==4.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # enmerkar -docutils==0.20.1 +docutils==0.21.2 # via sphinx enmerkar==0.7.1 # via -r requirements/base.in -exceptiongroup==1.2.2 - # via pytest execnet==2.1.1 # via pytest-cache -flake8==7.1.1 +flake8==7.2.0 # via -r requirements/test.in -idna==3.8 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 - # via sphinx -iniconfig==2.0.0 +iniconfig==2.1.0 # via pytest -jinja2==3.1.4 +jinja2==3.1.6 # via sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via flake8 -packaging==24.1 +packaging==25.0 # via # pytest # sphinx @@ -63,15 +55,15 @@ pep8==1.7.1 # via pytest-pep8 pluggy==1.5.0 # via pytest -pycodestyle==2.12.1 +pycodestyle==2.13.0 # via flake8 -pyflakes==3.2.0 +pyflakes==3.3.2 # via # flake8 # pytest-flakes -pygments==2.18.0 +pygments==2.19.1 # via sphinx -pytest==8.3.2 +pytest==8.3.5 # via # -r requirements/test.in # pytest-cache @@ -80,7 +72,7 @@ pytest==8.3.2 # pytest-pep8 pytest-cache==1.0 # via pytest-pep8 -pytest-cov==5.0.0 +pytest-cov==6.1.1 # via -r requirements/test.in pytest-flakes==4.0.5 # via -r requirements/test.in @@ -88,41 +80,35 @@ pytest-pep8==1.0.6 # via -r requirements/test.in python-coveralls==2.9.3 # via -r requirements/test.in -pytz==2024.1 - # via babel pyyaml==6.0.2 # via python-coveralls requests==2.32.3 # via # python-coveralls # sphinx -six==1.16.0 +roman-numerals-py==3.1.0 + # via sphinx +six==1.17.0 # via python-coveralls snowballstemmer==2.2.0 # via sphinx -sphinx==7.1.2 +sphinx==8.2.3 # via -r requirements/test.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.1 +sqlparse==0.5.3 # via django -tomli==2.0.1 +urllib3==2.2.3 # via - # coverage - # pytest -typing-extensions==4.12.2 - # via asgiref -urllib3==2.2.2 - # via requests -zipp==3.20.1 - # via importlib-metadata + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # requests diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fc796fd..1dd71b5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,31 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -build==1.2.1 +build==1.2.2.post1 # via pip-tools -click==8.1.7 +click==8.1.8 # via pip-tools -importlib-metadata==8.4.0 - # via build -packaging==24.1 +packaging==25.0 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.1.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.2.0 # via # build # pip-tools -wheel==0.44.0 +wheel==0.45.1 # via pip-tools -zipp==3.20.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 08e7022..79bf094 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -wheel==0.44.0 +wheel==0.45.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.2 - # via -r requirements/pip.in -setuptools==74.1.2 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/pip.in +setuptools==79.0.1 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 4cd9570..14f1722 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,61 +1,53 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx asgiref==3.8.1 # via django -babel==2.16.0 +babel==2.17.0 # via # -r requirements/base.in # enmerkar # sphinx -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django -certifi==2024.8.30 +certifi==2025.1.31 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests -coverage[toml]==7.6.1 +coverage[toml]==7.8.0 # via # -r requirements/test.in # pytest-cov # python-coveralls -django==4.2.16 +django==4.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # enmerkar -docutils==0.20.1 +docutils==0.21.2 # via sphinx enmerkar==0.7.1 # via -r requirements/base.in -exceptiongroup==1.2.2 - # via pytest execnet==2.1.1 # via pytest-cache -flake8==7.1.1 +flake8==7.2.0 # via -r requirements/test.in -idna==3.8 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 - # via sphinx -iniconfig==2.0.0 +iniconfig==2.1.0 # via pytest -jinja2==3.1.4 +jinja2==3.1.6 # via sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via flake8 -packaging==24.1 +packaging==25.0 # via # pytest # sphinx @@ -63,15 +55,15 @@ pep8==1.7.1 # via pytest-pep8 pluggy==1.5.0 # via pytest -pycodestyle==2.12.1 +pycodestyle==2.13.0 # via flake8 -pyflakes==3.2.0 +pyflakes==3.3.2 # via # flake8 # pytest-flakes -pygments==2.18.0 +pygments==2.19.1 # via sphinx -pytest==8.3.2 +pytest==8.3.5 # via # -r requirements/test.in # pytest-cache @@ -80,7 +72,7 @@ pytest==8.3.2 # pytest-pep8 pytest-cache==1.0 # via pytest-pep8 -pytest-cov==5.0.0 +pytest-cov==6.1.1 # via -r requirements/test.in pytest-flakes==4.0.5 # via -r requirements/test.in @@ -88,41 +80,35 @@ pytest-pep8==1.0.6 # via -r requirements/test.in python-coveralls==2.9.3 # via -r requirements/test.in -pytz==2024.1 - # via babel pyyaml==6.0.2 # via python-coveralls requests==2.32.3 # via # python-coveralls # sphinx -six==1.16.0 +roman-numerals-py==3.1.0 + # via sphinx +six==1.17.0 # via python-coveralls snowballstemmer==2.2.0 # via sphinx -sphinx==7.1.2 +sphinx==8.2.3 # via -r requirements/test.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.1 +sqlparse==0.5.3 # via django -tomli==2.0.1 +urllib3==2.2.3 # via - # coverage - # pytest -typing-extensions==4.12.2 - # via asgiref -urllib3==2.2.2 - # via requests -zipp==3.20.1 - # via importlib-metadata + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # requests diff --git a/requirements/tox.txt b/requirements/tox.txt index 6289d85..386e2db 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,27 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx asgiref==3.8.1 # via django -babel==2.16.0 +babel==2.17.0 # via # -r requirements/base.in # enmerkar # sphinx -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django -certifi==2024.8.30 +certifi==2025.1.31 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests -coverage[toml]==7.6.1 +coverage[toml]==7.8.0 # via # -r requirements/test.in # pytest-cov @@ -30,31 +26,27 @@ coverage[toml]==7.6.1 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # enmerkar -docutils==0.20.1 +docutils==0.21.2 # via sphinx enmerkar==0.7.1 # via -r requirements/base.in -exceptiongroup==1.2.2 - # via pytest execnet==2.1.1 # via pytest-cache -flake8==7.1.1 +flake8==7.2.0 # via -r requirements/test.in -idna==3.8 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 - # via sphinx -iniconfig==2.0.0 +iniconfig==2.1.0 # via pytest -jinja2==3.1.4 +jinja2==3.1.6 # via sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 mccabe==0.7.0 # via flake8 -packaging==24.1 +packaging==25.0 # via # pytest # sphinx @@ -62,15 +54,15 @@ pep8==1.7.1 # via pytest-pep8 pluggy==1.5.0 # via pytest -pycodestyle==2.12.1 +pycodestyle==2.13.0 # via flake8 -pyflakes==3.2.0 +pyflakes==3.3.2 # via # flake8 # pytest-flakes -pygments==2.18.0 +pygments==2.19.1 # via sphinx -pytest==8.3.2 +pytest==8.3.5 # via # -r requirements/test.in # pytest-cache @@ -79,7 +71,7 @@ pytest==8.3.2 # pytest-pep8 pytest-cache==1.0 # via pytest-pep8 -pytest-cov==5.0.0 +pytest-cov==6.1.1 # via -r requirements/test.in pytest-flakes==4.0.5 # via -r requirements/test.in @@ -87,41 +79,35 @@ pytest-pep8==1.0.6 # via -r requirements/test.in python-coveralls==2.9.3 # via -r requirements/test.in -pytz==2024.1 - # via babel pyyaml==6.0.2 # via python-coveralls requests==2.32.3 # via # python-coveralls # sphinx -six==1.16.0 +roman-numerals-py==3.1.0 + # via sphinx +six==1.17.0 # via python-coveralls snowballstemmer==2.2.0 # via sphinx -sphinx==7.1.2 +sphinx==8.2.3 # via -r requirements/test.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.1 +sqlparse==0.5.3 # via django -tomli==2.0.1 +urllib3==2.2.3 # via - # coverage - # pytest -typing-extensions==4.12.2 - # via asgiref -urllib3==2.2.2 - # via requests -zipp==3.20.1 - # via importlib-metadata + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # requests diff --git a/setup.py b/setup.py index d4b0433..2ea5fcd 100644 --- a/setup.py +++ b/setup.py @@ -134,7 +134,6 @@ def get_version(*file_paths): 'Natural Language :: English', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', 'Framework :: Django', diff --git a/tox.ini b/tox.ini index 8297c54..4d9332e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,311,312}-django{42} +envlist = py{311,312}-django{42} [testenv] skipsdist = True From e25ef9f6547fc843ff68469b14204486b004e52a Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 6 May 2025 15:13:03 -0400 Subject: [PATCH 2/2] tmp: Apply suggestions from code review --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 6b5f640..fcd665e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,8 @@ History ------- 2.0.0 (2020-05-29) +------------------ + * Drop support for Python 3.8