diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 497a53bee..9d714ba39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [django32, django42] + python-version: ['3.8', '3.11'] + toxenv: [django42] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/requirements/base.txt b/requirements/base.txt index 72c08a4a9..0fbaa20d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,13 +4,15 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.0 # via django -bleach[css]==6.1.0 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via - # -r requirements/base.in - # bleach -django==3.2.23 + # -c requirements/constraints.txt + # django +bleach[css]==6.1.0 + # via -r requirements/base.in +django==4.2.11 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -19,20 +21,20 @@ django==3.2.23 # django-sekizai django-classy-tags==4.1.0 # via django-sekizai -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via django-mptt django-mptt==0.14.0 # via -r requirements/base.in django-sekizai==4.1.0 # via -r requirements/base.in -importlib-metadata==7.0.0 - # via markdown +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 -pytz==2023.3.post1 - # via django six==1.16.0 # via bleach sorl-thumbnail==12.10.0 @@ -41,11 +43,11 @@ sqlparse==0.4.4 # via django tinycss2==1.2.1 # via bleach -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via asgiref webencodings==0.5.1 # via # bleach # tinycss2 -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/ci.txt b/requirements/ci.txt index 2201d1ebb..7ccbcae77 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via # -r requirements/tox.txt # tox @@ -16,7 +16,7 @@ colorama==0.4.6 # via # -r requirements/tox.txt # tox -distlib==0.3.7 +distlib==0.3.8 # via # -r requirements/tox.txt # virtualenv @@ -25,17 +25,17 @@ filelock==3.13.1 # -r requirements/tox.txt # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # -r requirements/tox.txt # pyproject-api # tox -platformdirs==4.1.0 +platformdirs==4.2.0 # via # -r requirements/tox.txt # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # -r requirements/tox.txt # tox @@ -48,9 +48,9 @@ tomli==2.0.1 # -r requirements/tox.txt # pyproject-api # tox -tox==4.11.4 +tox==4.14.1 # via -r requirements/tox.txt -virtualenv==20.25.0 +virtualenv==20.25.1 # via # -r requirements/tox.txt # tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ab960a1db..982a6ca6e 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -13,3 +13,6 @@ # markdown==3.4.0 contains refactoring which are breaking the package itself markdown<3.4.0 + +# For python greater than or equal to 3.9 backports.zoneinfo causing failures +backports.zoneinfo; python_version<'3.9' diff --git a/requirements/django.txt b/requirements/django.txt index d296127a5..db03776fe 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==3.2.23 +django==4.2.11 diff --git a/requirements/docs.txt b/requirements/docs.txt index dcf480011..96eac2672 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -8,13 +8,13 @@ accessible-pygments==0.0.4 # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx -babel==2.13.1 +babel==2.14.0 # via # pydata-sphinx-theme # sphinx -beautifulsoup4==4.12.2 +beautifulsoup4==4.12.3 # via pydata-sphinx-theme -certifi==2023.11.17 +certifi==2024.2.2 # via requests charset-normalizer==3.3.2 # via requests @@ -26,13 +26,15 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.0 - # via sphinx -jinja2==3.1.2 +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 # via sphinx -markupsafe==2.1.3 +markupsafe==2.1.5 # via jinja2 -packaging==23.2 +packaging==24.0 # via # pydata-sphinx-theme # sphinx @@ -43,7 +45,7 @@ pygments==2.17.2 # accessible-pygments # pydata-sphinx-theme # sphinx -pytz==2023.3.post1 +pytz==2024.1 # via babel requests==2.31.0 # via sphinx @@ -70,9 +72,9 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via pydata-sphinx-theme -urllib3==2.1.0 +urllib3==2.2.1 # via requests -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 14cb99cd3..cf449024a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==24.0 # via -r requirements/pip.in -setuptools==69.0.2 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index c9e5f7267..152da449f 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,26 +4,30 @@ # # make upgrade # -build==1.0.3 +build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.0 - # via build -packaging==23.2 +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 # via build -pip-tools==7.3.0 +pip-tools==7.4.1 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools tomli==2.0.1 # via # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index d7f67647b..411a877cd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,18 +4,19 @@ # # make upgrade # -asgiref==3.7.2 +asgiref==3.8.0 # via # -r requirements/base.txt # django -bleach[css]==6.1.0 +backports-zoneinfo==0.2.1 ; python_version < "3.9" # via + # -c requirements/constraints.txt # -r requirements/base.txt - # bleach -coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov + # django +bleach[css]==6.1.0 + # via -r requirements/base.txt +coverage[toml]==7.4.4 + # via pytest-cov # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt @@ -26,7 +27,7 @@ django-classy-tags==4.1.0 # via # -r requirements/base.txt # django-sekizai -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via # -r requirements/base.txt # django-mptt @@ -36,8 +37,9 @@ django-sekizai==4.1.0 # via -r requirements/base.txt exceptiongroup==1.2.0 # via pytest -importlib-metadata==7.0.0 +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 @@ -46,23 +48,19 @@ markdown==3.3.7 # via # -c requirements/constraints.txt # -r requirements/base.txt -packaging==23.2 +packaging==24.0 # via pytest -pluggy==1.3.0 +pluggy==1.4.0 # via pytest -pytest==7.4.3 +pytest==8.1.1 # via # -r requirements/test.in # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.7.0 +pytest-django==4.8.0 # via -r requirements/test.in -pytz==2023.3.post1 - # via - # -r requirements/base.txt - # django six==1.16.0 # via # -r requirements/base.txt @@ -81,7 +79,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # -r requirements/base.txt # asgiref @@ -90,7 +88,7 @@ webencodings==0.5.1 # -r requirements/base.txt # bleach # tinycss2 -zipp==3.17.0 +zipp==3.18.1 # via # -r requirements/base.txt # importlib-metadata diff --git a/requirements/tox.txt b/requirements/tox.txt index 7f74d22f2..daf54cee1 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,27 +4,27 @@ # # make upgrade # -cachetools==5.3.2 +cachetools==5.3.3 # via tox chardet==5.2.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # pyproject-api # tox -platformdirs==4.1.0 +platformdirs==4.2.0 # via # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via tox pyproject-api==1.6.1 # via tox @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.11.4 +tox==4.14.1 # via -r requirements/tox.in -virtualenv==20.25.0 +virtualenv==20.25.1 # via tox diff --git a/setup.py b/setup.py index 386932e02..ad189f19a 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def is_requirement(line): setup( name="openedx-django-wiki", - version="2.0.3", + version="2.1.0", author="Benjamin Bach", author_email="benjamin@overtag.dk", long_description_content_type='text/markdown', @@ -79,8 +79,8 @@ def is_requirement(line): 'Intended Audience :: Developers', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.11', 'Framework :: Django', - 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.2', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', diff --git a/tox.ini b/tox.ini index c65e6adad..d83df9a12 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,10 @@ [tox] -envlist = py38-django{32, 42} +envlist = py{38, 311}-django{42} [testenv] deps = - django32: -r requirements/django.txt django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt changedir = {toxinidir}/testproject/ commands = pytest --cov wiki --cov django_notify -