Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-reserved-keywords.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.11', '3.12']
python-version: ['3.12']
toxenv: [django42, django52, quality]

steps:
Expand All @@ -36,7 +36,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.11' && matrix.toxenv=='django42'
if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v5
with:
flags: unittests
Expand All @@ -56,7 +56,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify_changed_contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,15 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/ci.in
pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in
pip-compile --rebuild --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
# --allow-unsafe is required here because fs (pyfilesystem2) depends on setuptools
# (via pkg_resources for namespace package declarations). Without it, pip-compile
# silently omits setuptools from the output, causing ImportError at runtime.
# TODO: remove --allow-unsafe and the setuptools<82 constraint in constraints.txt
# once a version of fs is available that does not depend on pkg_resources.
# Track: https://github.com/PyFilesystem/pyfilesystem2/issues/577
pip-compile --rebuild --upgrade --allow-unsafe -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/ci.in
pip-compile --rebuild --upgrade --allow-unsafe -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in
pip-compile --rebuild --upgrade --allow-unsafe -o requirements/test.txt requirements/base.in requirements/test.in
pip-compile --rebuild --upgrade -o requirements/ci.txt requirements/ci.in
# Let tox control the Django version for tests
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
Expand Down
2 changes: 1 addition & 1 deletion edxval/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
init
"""

__version__ = '3.2.0'
__version__ = '4.0.0'
2 changes: 1 addition & 1 deletion edxval/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def validate_list(self, value):
return validate_generated_images(value, self.max_items)

def deconstruct(self):
name, path, args, kwargs = super().deconstruct()
name, path, args, kwargs = super().deconstruct() # pylint: disable=no-member
# Only include kwarg if it's not the default
if self.max_items != LIST_MAX_ITEMS:
kwargs['max_items'] = self.max_items
Expand Down
64 changes: 40 additions & 24 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,52 +1,68 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
#
cachetools==5.5.2
annotated-doc==0.0.4
# via typer
cachetools==7.0.5
# via tox
certifi==2025.4.26
certifi==2026.2.25
# via requests
chardet==5.2.0
# via tox
charset-normalizer==3.4.2
charset-normalizer==3.4.5
# via requests
click==8.3.1
# via typer
colorama==0.4.6
# via tox
coverage[toml]==7.8.0
coverage[toml]==7.13.4
# via coveralls
coveralls==4.0.1
coveralls==4.1.0
# via -r requirements/ci.in
distlib==0.3.9
distlib==0.4.0
# via virtualenv
docopt==0.6.2
# via coveralls
filelock==3.18.0
filelock==3.25.2
# via
# python-discovery
# tox
# virtualenv
idna==3.10
idna==3.11
# via requests
packaging==25.0
markdown-it-py==4.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
packaging==26.0
# via
# pyproject-api
# tox
platformdirs==4.3.7
platformdirs==4.9.4
# via
# python-discovery
# tox
# virtualenv
pluggy==1.5.0
pluggy==1.6.0
# via tox
pyproject-api==1.9.0
pygments==2.19.2
# via rich
pyproject-api==1.10.0
# via tox
requests==2.32.3
python-discovery==1.1.3
# via virtualenv
requests==2.32.5
# via coveralls
tox==4.25.0
rich==14.3.3
# via typer
shellingham==1.5.4
# via typer
tomli-w==1.2.0
# via tox
tox==4.49.1
# via -r requirements/ci.in
urllib3==2.2.3
# via
# -c requirements/common_constraints.txt
# requests
virtualenv==20.30.0
typer==0.24.1
# via coveralls
urllib3==2.6.3
# via requests
virtualenv==21.2.0
# via tox
13 changes: 1 addition & 12 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,9 @@
# this file from Github directly. It does not require packaging in edx-lint.

# using LTS django version
Django<5.0
Django<6.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
11 changes: 11 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,14 @@

# Common constraints for edx repos
-c common_constraints.txt

# setuptools 82+ removed pkg_resources, which fs (pyfilesystem2) uses for
# namespace package declarations in fs/__init__.py. Pin until fs is updated.
# See: https://github.com/PyFilesystem/pyfilesystem2/issues/577
setuptools<82

# pact-python 3.x has a completely different API from 2.x.
# The verify_pact.py code uses the 2.x API (Verifier with provider/provider_base_url kwargs).
# Pin until the code is updated to use the new API.
# See: https://github.com/openedx/edx-val/issues/598
pact-python<3
Loading
Loading