diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f66b739f..d01127342 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: run_tests: name: tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -18,9 +18,9 @@ jobs: toxenv: [quality, django42] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 6ed7ebfab..a90b053a2 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -7,13 +7,13 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.11 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d52e4ea2b..f3284985c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -17,7 +17,7 @@ formats: # Set the version of python needed to build these docs. build: - os: "ubuntu-22.04" + os: "ubuntu-lts-latest" tools: python: "3.11" diff --git a/requirements/ci.txt b/requirements/ci.txt index 3c5df6382..61355c780 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -22,7 +22,7 @@ packaging==24.1 # via # pyproject-api # tox -platformdirs==4.3.1 +platformdirs==4.3.2 # via # tox # virtualenv diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 3bb18ffde..b23164274 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,7 +10,3 @@ # Common constraints for edx repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - -# diff-cover latest requires (pluggy>=0.13.1,<0.14.0) which conflicts with pytest which requires(pluggy>=0.12,<2.0.0) -# Using the same version of diff-cover which is being used currently in edx-platform to avoid this conflict. -diff-cover==4.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index b3de0d30b..886560225 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -43,6 +43,7 @@ chardet==5.2.0 # via # -r requirements/ci.txt # -r requirements/test.txt + # diff-cover # tox click==8.1.7 # via @@ -72,10 +73,8 @@ coverage[toml]==7.6.1 # pytest-cov ddt==1.7.2 # via -r requirements/test.txt -diff-cover==4.0.0 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt +diff-cover==9.2.0 + # via -r requirements/test.txt dill==0.3.8 # via # -r requirements/test.txt @@ -115,10 +114,6 @@ fs-s3fs==1.1.1 # openedx-django-pyfs hypothesis==6.112.0 # via -r requirements/test.txt -inflect==7.4.0 - # via - # -r requirements/test.txt - # jinja2-pluralize iniconfig==2.0.0 # via # -r requirements/test.txt @@ -132,11 +127,6 @@ jinja2==3.1.4 # -r requirements/test.txt # code-annotations # diff-cover - # jinja2-pluralize -jinja2-pluralize==0.3.0 - # via - # -r requirements/test.txt - # diff-cover jmespath==1.0.1 # via # -r requirements/test.txt @@ -159,10 +149,6 @@ mccabe==0.7.0 # pylint mock==5.1.0 # via -r requirements/test.txt -more-itertools==10.5.0 - # via - # -r requirements/test.txt - # inflect openedx-django-pyfs==3.7.0 # via -r requirements/test.txt packaging==24.1 @@ -182,7 +168,7 @@ pbr==6.1.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.3.1 +platformdirs==4.3.2 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -297,15 +283,10 @@ tox==4.18.1 # via # -r requirements/ci.txt # -r requirements/test.txt -typeguard==4.3.0 - # via - # -r requirements/test.txt - # inflect typing-extensions==4.12.2 # via # -r requirements/test.txt # edx-opaque-keys - # typeguard urllib3==2.2.2 # via # -r requirements/test.txt diff --git a/requirements/django.in b/requirements/django.in index c15b7a5ea..064856e67 100644 --- a/requirements/django.in +++ b/requirements/django.in @@ -8,7 +8,3 @@ Django openedx-django-pyfs>=1.0.5 lazy - -# Needed until we drop testing on Python 3.8 so that -# we don't try to install this on newer versions of python. -backports.zoneinfo;python_version<"3.9" diff --git a/requirements/test.txt b/requirements/test.txt index 24bb93c40..b337ef2cb 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -31,7 +31,9 @@ botocore==1.35.14 cachetools==5.5.0 # via tox chardet==5.2.0 - # via tox + # via + # diff-cover + # tox click==8.1.7 # via # click-log @@ -49,10 +51,8 @@ coverage[toml]==7.6.1 # pytest-cov ddt==1.7.2 # via -r requirements/test.in -diff-cover==4.0.0 - # via - # -c requirements/constraints.txt - # -r requirements/test.in +diff-cover==9.2.0 + # via -r requirements/test.in dill==0.3.8 # via pylint distlib==0.3.8 @@ -84,8 +84,6 @@ fs-s3fs==1.1.1 # openedx-django-pyfs hypothesis==6.112.0 # via -r requirements/test.in -inflect==7.4.0 - # via jinja2-pluralize iniconfig==2.0.0 # via pytest isort==5.13.2 @@ -94,9 +92,6 @@ jinja2==3.1.4 # via # code-annotations # diff-cover - # jinja2-pluralize -jinja2-pluralize==0.3.0 - # via diff-cover jmespath==1.0.1 # via # -r requirements/django.txt @@ -117,8 +112,6 @@ mccabe==0.7.0 # via pylint mock==5.1.0 # via -r requirements/test.in -more-itertools==10.5.0 - # via inflect openedx-django-pyfs==3.7.0 # via -r requirements/django.txt packaging==24.1 @@ -132,7 +125,7 @@ pbr==6.1.0 # via # -r requirements/django.txt # stevedore -platformdirs==4.3.1 +platformdirs==4.3.2 # via # pylint # tox @@ -218,13 +211,10 @@ tomlkit==0.13.2 # via pylint tox==4.18.1 # via -r requirements/test.in -typeguard==4.3.0 - # via inflect typing-extensions==4.12.2 # via # -r requirements/django.txt # edx-opaque-keys - # typeguard urllib3==2.2.2 # via # -r requirements/django.txt diff --git a/setup.py b/setup.py index 779fc04c2..77a3c93ae 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ """ Set up for XBlock """ -import codecs import os import os.path import re diff --git a/tox.ini b/tox.ini index 4f9001094..bf7c2fb86 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ filterwarnings = always norecursedirs = .* docs requirements [testenv] -deps = - django42: Django>=4.2,<4.3 +deps = + django42: Django>=4.2,<5.0 -r requirements/test.txt changedir = {envsitepackagesdir} commands = @@ -31,8 +31,8 @@ commands = make html [testenv:quality] -deps = - django42: Django>=4.2,<4.3 +deps = + django42: Django>=4.2,<5.0 -r requirements/test.txt changedir = {toxinidir} commands =