From f851839932c6ca1dd0e538c1b1371dc067f29bf3 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Sat, 26 Oct 2024 23:54:39 +0500 Subject: [PATCH] feat!: Python 3.12 Upgrade --- .github/workflows/ci.yml | 4 +- .github/workflows/pypi-publish.yml | 4 +- .../workflows/upgrade-python-requirements.yml | 1 + requirements/base.txt | 24 ++------ requirements/ci.txt | 25 ++++---- requirements/django.txt | 2 +- requirements/docs.txt | 60 ++++++++----------- requirements/pip.txt | 8 +-- requirements/pip_tools.txt | 21 ++----- requirements/test.txt | 46 ++++---------- requirements/tox.txt | 24 ++++---- setup.py | 5 +- tox.ini | 2 +- 13 files changed, 80 insertions(+), 146 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d714ba39..c7aa67b48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] - python-version: ['3.8', '3.11'] + os: [ubuntu-22.04] + python-version: ['3.12'] toxenv: [django42] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 140603aee..d9d4f9eee 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -15,7 +15,7 @@ jobs: - name: setup python uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: 3.12 - name: Install pip run: pip install pip diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index e7d871d10..8784400c8 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -15,6 +15,7 @@ jobs: uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master with: branch: ${{ github.event.inputs.branch || 'edx_release' }} + python_version: "3.12" # optional parameters below; fill in if you'd like github or email notifications # user_reviewers: "" # team_reviewers: "" diff --git a/requirements/base.txt b/requirements/base.txt index 0fbaa20d5..818e301c4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,18 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.0 +asgiref==3.8.1 # via django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # django bleach[css]==6.1.0 # via -r requirements/base.in -django==4.2.11 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -23,31 +19,23 @@ django-classy-tags==4.1.0 # via django-sekizai django-js-asset==2.2.0 # via django-mptt -django-mptt==0.14.0 +django-mptt==0.16.0 # via -r requirements/base.in django-sekizai==4.1.0 # via -r requirements/base.in -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # markdown markdown==3.3.7 # via # -c requirements/constraints.txt # -r requirements/base.in six==1.16.0 # via bleach -sorl-thumbnail==12.10.0 +sorl-thumbnail==12.11.0 # via -r requirements/base.in -sqlparse==0.4.4 +sqlparse==0.5.1 # via django tinycss2==1.2.1 # via bleach -typing-extensions==4.10.0 - # via asgiref webencodings==0.5.1 # via # bleach # tinycss2 -zipp==3.18.1 - # via importlib-metadata diff --git a/requirements/ci.txt b/requirements/ci.txt index 7ccbcae77..4e8ff3ed7 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.5.0 # via # -r requirements/tox.txt # tox @@ -16,41 +16,36 @@ colorama==0.4.6 # via # -r requirements/tox.txt # tox -distlib==0.3.8 +distlib==0.3.9 # via # -r requirements/tox.txt # virtualenv -filelock==3.13.1 +filelock==3.16.1 # via # -r requirements/tox.txt # tox # virtualenv -packaging==24.0 +packaging==24.1 # via # -r requirements/tox.txt # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via # -r requirements/tox.txt # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r requirements/tox.txt # tox -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via # -r requirements/tox.txt # tox -tomli==2.0.1 - # via - # -r requirements/tox.txt - # pyproject-api - # tox -tox==4.14.1 +tox==4.23.2 # via -r requirements/tox.txt -virtualenv==20.25.1 +virtualenv==20.27.0 # via # -r requirements/tox.txt # tox diff --git a/requirements/django.txt b/requirements/django.txt index db03776fe..64aaf996f 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==4.2.11 +django==4.2.16 diff --git a/requirements/docs.txt b/requirements/docs.txt index 96eac2672..efc4a0094 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,80 +1,70 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==1.0.0 # via sphinx -babel==2.14.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx beautifulsoup4==4.12.3 # via pydata-sphinx-theme -certifi==2024.2.2 +certifi==2024.8.30 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests -docutils==0.19 +docutils==0.21.2 # via # pydata-sphinx-theme # sphinx -idna==3.6 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # sphinx -jinja2==3.1.3 +jinja2==3.1.4 # via sphinx -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 -packaging==24.0 - # via - # pydata-sphinx-theme - # sphinx -pydata-sphinx-theme==0.14.4 +packaging==24.1 + # via sphinx +pydata-sphinx-theme==0.16.0 # via sphinx-book-theme -pygments==2.17.2 +pygments==2.18.0 # via # accessible-pygments # pydata-sphinx-theme # sphinx -pytz==2024.1 - # via babel -requests==2.31.0 +requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==8.1.3 # via # -r requirements/docs.in # pydata-sphinx-theme # sphinx-book-theme -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r requirements/docs.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 -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via pydata-sphinx-theme -urllib3==2.2.1 +urllib3==2.2.3 # via requests -zipp==3.18.1 - # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index cf449024a..35655630e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.43.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.2 # via -r requirements/pip.in -setuptools==69.2.0 +setuptools==75.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 152da449f..938ef5319 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,34 +1,23 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -build==1.1.1 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip_tools.in -pyproject-hooks==1.0.0 - # via - # build - # pip-tools -tomli==2.0.1 +pyproject-hooks==1.2.0 # via # build # pip-tools - # pyproject-hooks -wheel==0.43.0 +wheel==0.44.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 411a877cd..2e110d91d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,21 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -asgiref==3.8.0 +asgiref==3.8.1 # via # -r requirements/base.txt # django -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c requirements/constraints.txt - # -r requirements/base.txt - # django bleach[css]==6.1.0 # via -r requirements/base.txt -coverage[toml]==7.4.4 +coverage[toml]==7.6.4 # via pytest-cov # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -31,43 +26,36 @@ django-js-asset==2.2.0 # via # -r requirements/base.txt # django-mptt -django-mptt==0.14.0 +django-mptt==0.16.0 # via -r requirements/base.txt django-sekizai==4.1.0 # via -r requirements/base.txt -exceptiongroup==1.2.0 - # via pytest -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # -r requirements/base.txt - # markdown iniconfig==2.0.0 # via pytest markdown==3.3.7 # via # -c requirements/constraints.txt # -r requirements/base.txt -packaging==24.0 +packaging==24.1 # via pytest -pluggy==1.4.0 +pluggy==1.5.0 # via pytest -pytest==8.1.1 +pytest==8.3.3 # via # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.1.0 +pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.in six==1.16.0 # via # -r requirements/base.txt # bleach -sorl-thumbnail==12.10.0 +sorl-thumbnail==12.11.0 # via -r requirements/base.txt -sqlparse==0.4.4 +sqlparse==0.5.1 # via # -r requirements/base.txt # django @@ -75,20 +63,8 @@ tinycss2==1.2.1 # via # -r requirements/base.txt # bleach -tomli==2.0.1 - # via - # coverage - # pytest -typing-extensions==4.10.0 - # via - # -r requirements/base.txt - # asgiref webencodings==0.5.1 # via # -r requirements/base.txt # bleach # tinycss2 -zipp==3.18.1 - # via - # -r requirements/base.txt - # importlib-metadata diff --git a/requirements/tox.txt b/requirements/tox.txt index daf54cee1..b76a89777 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -1,38 +1,34 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.8 +distlib==0.3.9 # via virtualenv -filelock==3.13.1 +filelock==3.16.1 # via # tox # virtualenv -packaging==24.0 +packaging==24.1 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.3.6 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via tox -pyproject-api==1.6.1 +pyproject-api==1.8.0 # via tox -tomli==2.0.1 - # via - # pyproject-api - # tox -tox==4.14.1 +tox==4.23.2 # via -r requirements/tox.in -virtualenv==20.25.1 +virtualenv==20.27.0 # via tox diff --git a/setup.py b/setup.py index ad189f19a..ef69c0de6 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def is_requirement(line): setup( name="openedx-django-wiki", - version="2.1.0", + version="3.0.0", author="Benjamin Bach", author_email="benjamin@overtag.dk", long_description_content_type='text/markdown', @@ -78,8 +78,7 @@ def is_requirement(line): 'Framework :: Django', 'Intended Audience :: Developers', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Framework :: Django', 'Framework :: Django :: 4.2', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', diff --git a/tox.ini b/tox.ini index d83df9a12..7ec77c86c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38, 311}-django{42} +envlist = py{312}-django{42} [testenv] deps =