Skip to content

Commit 6aeb50d

Browse files
authored
Merge branch 'main' into pwnage101/ENT-11510
2 parents 3547ad7 + b225264 commit 6aeb50d

File tree

16 files changed

+182
-191
lines changed

16 files changed

+182
-191
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ubuntu-latest]
18-
python-version: ['3.11', '3.12']
18+
python-version: ['3.12']
1919
toxenv: ["django42", "django52", "quality", "docs"]
2020

2121
steps:
@@ -37,7 +37,7 @@ jobs:
3737
run: tox
3838

3939
- name: Run coverage
40-
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
40+
if: matrix.python-version == '3.12' && matrix.toxenv == 'django42'
4141
uses: codecov/codecov-action@v5
4242
with:
4343
flags: unittests

.github/workflows/pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: setup python
1616
uses: actions/setup-python@v6
1717
with:
18-
python-version: 3.11
18+
python-version: 3.12
1919

2020
- name: Install pip
2121
run: pip install -r requirements/pip.txt

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Python
2626
uses: actions/setup-python@v6
2727
with:
28-
python-version: 3.11
28+
python-version: 3.12
2929

3030
- name: Install requirements
3131
run: pip install scriv bump-my-version

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version: 2
88
build:
99
os: "ubuntu-lts-latest"
1010
tools:
11-
python: "3.11"
11+
python: "3.12"
1212

1313
# Build documentation in the docs/ directory with Sphinx
1414
sphinx:

openedx_filters/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"""
44
from openedx_filters.filters import *
55

6-
__version__ = "2.1.0"
6+
__version__ = "3.0.0"

openedx_filters/learning/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ class AccountSettingsReadOnlyFieldsRequested(OpenEdxPublicFilter):
14681468
filter_type = "org.openedx.learning.account.settings.read_only_fields.requested.v1"
14691469

14701470
@classmethod
1471-
def run_filter(cls, readonly_fields: set, user: Any) -> set:
1471+
def run_filter(cls, readonly_fields: set, user: Any) -> tuple[Any, Any]:
14721472
"""
14731473
Process the readonly_fields set using the configured pipeline steps.
14741474

requirements/base.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# make upgrade
66
#
7-
asgiref==3.11.0
7+
asgiref==3.11.1
88
# via django
9-
django==5.2.9
9+
django==5.2.12
1010
# via
1111
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1212
# -r requirements/base.in
1313
dnspython==2.8.0
1414
# via pymongo
15-
edx-opaque-keys[django]==3.0.0
15+
edx-opaque-keys[django]==3.1.0
1616
# via -r requirements/base.in
17-
pymongo==4.15.5
17+
pymongo==4.16.0
1818
# via edx-opaque-keys
1919
sqlparse==0.5.5
2020
# via django
21-
stevedore==5.6.0
21+
stevedore==5.7.0
2222
# via edx-opaque-keys
2323
typing-extensions==4.15.0
2424
# via edx-opaque-keys

requirements/ci.txt

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# make upgrade
66
#
7-
cachetools==6.2.4
8-
# via tox
9-
chardet==5.2.0
7+
cachetools==7.0.5
108
# via tox
119
colorama==0.4.6
1210
# via tox
1311
distlib==0.4.0
1412
# via virtualenv
15-
filelock==3.20.2
13+
filelock==3.25.2
1614
# via
15+
# python-discovery
1716
# tox
1817
# virtualenv
19-
packaging==25.0
18+
packaging==26.0
2019
# via
2120
# pyproject-api
2221
# tox
23-
platformdirs==4.5.1
22+
platformdirs==4.9.4
2423
# via
24+
# python-discovery
2525
# tox
2626
# virtualenv
2727
pluggy==1.6.0
2828
# via tox
2929
pyproject-api==1.10.0
3030
# via tox
31-
tox==4.33.0
31+
python-discovery==1.2.0
32+
# via virtualenv
33+
tomli-w==1.2.0
34+
# via tox
35+
tox==4.50.3
3236
# via -r requirements/ci.in
33-
virtualenv==20.35.4
37+
virtualenv==21.2.0
3438
# via tox

0 commit comments

Comments
 (0)