Skip to content

Commit 4c6a4ea

Browse files
feanilclaude
andcommitted
fix: resolve CI failures from pylint 4.0, version mismatch, and pkg_resources
- admin.py: add `request` parameter to `lookup_allowed` override to match Django 4.2+ base class signature (fixes pylint 4.0 arguments-differ W0221) - package.json: bump version to 6.0.0 to match edx_proctoring/__init__.py - constraints.txt: remove django-simple-history<=3.1.1 cap (was an incremental upgrade placeholder with no specific blocker); upgrades to 3.11.0 which uses Hatchling and has no pkg_resources dependency, fixing the setuptools 82+ ModuleNotFoundError across all test envs - Regenerate all pinned requirements with django-simple-history 3.11.0 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 6d8331b commit 4c6a4ea

8 files changed

Lines changed: 30 additions & 35 deletions

File tree

edx_proctoring/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ def save_model(self, request, obj, form, change):
316316
obj.reviewed_by = request.user
317317
obj.save()
318318

319-
def lookup_allowed(self, lookup, value):
319+
def lookup_allowed(self, lookup, value, request=None):
320320
""" Checks if lookup allowed or not """
321321
if lookup == 'exam__course_id':
322322
return True
323-
return super().lookup_allowed(lookup, value)
323+
return super().lookup_allowed(lookup, value, request)
324324

325325

326326
@admin.register(ProctoredExamSoftwareSecureReviewHistory)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@edx/edx-proctoring",
33
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
4-
"version": "5.2.2",
4+
"version": "6.0.0",
55
"main": "edx_proctoring/static/index.js",
66
"scripts": {
77
"test": "gulp test"

requirements/base.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ django==5.2.12
5151
# -r requirements/base.in
5252
# django-crum
5353
# django-model-utils
54+
# django-simple-history
5455
# django-waffle
5556
# djangorestframework
5657
# drf-jwt
@@ -72,10 +73,8 @@ django-model-utils==5.0.0
7273
# via
7374
# -r requirements/base.in
7475
# edx-when
75-
django-simple-history==3.1.1
76-
# via
77-
# -c requirements/constraints.txt
78-
# -r requirements/base.in
76+
django-simple-history==3.11.0
77+
# via -r requirements/base.in
7978
django-waffle==5.0.0
8079
# via
8180
# -r requirements/base.in
@@ -157,7 +156,7 @@ pycparser==3.0
157156
# via cffi
158157
pycryptodomex==3.23.0
159158
# via -r requirements/base.in
160-
pyjwt[crypto]==2.11.0
159+
pyjwt[crypto]==2.12.0
161160
# via
162161
# -r requirements/base.in
163162
# drf-jwt
@@ -227,7 +226,7 @@ vine==5.1.0
227226
# kombu
228227
wcwidth==0.6.0
229228
# via prompt-toolkit
230-
web-fragments==3.1.0
229+
web-fragments==4.0.0
231230
# via xblock
232231
webob==1.8.9
233232
# via xblock

requirements/ci.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# make upgrade
66
#
7-
cachetools==7.0.3
7+
cachetools==7.0.5
88
# via tox
99
colorama==0.4.6
1010
# via tox
1111
coverage==7.13.4
1212
# via -r requirements/ci.in
1313
distlib==0.4.0
1414
# via virtualenv
15-
filelock==3.25.0
15+
filelock==3.25.2
1616
# via
1717
# python-discovery
1818
# tox
@@ -30,11 +30,11 @@ pluggy==1.6.0
3030
# via tox
3131
pyproject-api==1.10.0
3232
# via tox
33-
python-discovery==1.1.0
33+
python-discovery==1.1.3
3434
# via virtualenv
3535
tomli-w==1.2.0
3636
# via tox
37-
tox==4.49.0
37+
tox==4.49.1
3838
# via -r requirements/ci.in
39-
virtualenv==21.1.0
39+
virtualenv==21.2.0
4040
# via tox

requirements/constraints.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ click>=8.0,<9.0
2121
# pinning because to match pin in edx-platform: https://github.com/openedx/edx-platform/blob/e25f00f35cb2ed70502bb0b28909535d55e5525e/requirements/constraints.txt#L83
2222
django-webpack-loader<1.0.0
2323

24-
# incremental upgrade plan.
25-
django-simple-history<=3.1.1
26-
2724
#Temporary to Support the python 3.11 Upgrade
2825
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library

requirements/dev.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ astroid==4.0.4
1414
# via
1515
# pylint
1616
# pylint-celery
17-
cachetools==7.0.3
17+
cachetools==7.0.5
1818
# via tox
19-
chardet==7.0.1
19+
chardet==7.1.0
2020
# via diff-cover
2121
click==8.3.1
2222
# via
@@ -45,13 +45,13 @@ django==5.2.12
4545
# edx-i18n-tools
4646
docutils==0.22.4
4747
# via rstcheck-core
48-
edx-i18n-tools==1.9.0
48+
edx-i18n-tools==2.0.0
4949
# via -r requirements/dev.in
50-
edx-lint==5.6.0
50+
edx-lint==6.0.0
5151
# via
5252
# -r requirements/dev.in
5353
# -r requirements/quality.in
54-
filelock==3.25.0
54+
filelock==3.25.2
5555
# via
5656
# python-discovery
5757
# tox
@@ -129,7 +129,7 @@ pylint-plugin-utils==0.9.0
129129
# pylint-django
130130
pyproject-api==1.10.0
131131
# via tox
132-
python-discovery==1.1.0
132+
python-discovery==1.1.3
133133
# via virtualenv
134134
python-slugify==8.0.4
135135
# via code-annotations
@@ -159,7 +159,7 @@ tomli-w==1.2.0
159159
# via tox
160160
tomlkit==0.14.0
161161
# via pylint
162-
tox==4.49.0
162+
tox==4.49.1
163163
# via -r requirements/dev.in
164164
typer==0.24.1
165165
# via rstcheck
@@ -170,7 +170,7 @@ typing-extensions==4.15.0
170170
# typing-inspection
171171
typing-inspection==0.4.2
172172
# via pydantic
173-
virtualenv==21.1.0
173+
virtualenv==21.2.0
174174
# via tox
175175
wheel==0.46.3
176176
# via -r requirements/dev.in

requirements/quality.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ django==5.2.12
3333
# -r requirements/quality.in
3434
docutils==0.22.4
3535
# via rstcheck-core
36-
edx-lint==5.6.0
36+
edx-lint==6.0.0
3737
# via -r requirements/quality.in
3838
isort==8.0.1
3939
# via

requirements/test.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ ddt==1.7.2
5050
# -r requirements/base.in
5151
# django-crum
5252
# django-model-utils
53+
# django-simple-history
5354
# django-waffle
5455
# djangorestframework
5556
# drf-jwt
@@ -72,10 +73,8 @@ django-model-utils==5.0.0
7273
# via
7374
# -r requirements/base.in
7475
# edx-when
75-
django-simple-history==3.1.1
76-
# via
77-
# -c requirements/constraints.txt
78-
# -r requirements/base.in
76+
django-simple-history==3.11.0
77+
# via -r requirements/base.in
7978
django-waffle==5.0.0
8079
# via
8180
# -r requirements/base.in
@@ -108,7 +107,7 @@ edx-drf-extensions==10.6.0
108107
# via
109108
# -r requirements/base.in
110109
# edx-when
111-
edx-i18n-tools==1.9.0
110+
edx-i18n-tools==2.0.0
112111
# via -r requirements/test.in
113112
edx-opaque-keys[django]==3.1.0
114113
# via
@@ -129,7 +128,7 @@ execnet==2.1.2
129128
# via pytest-xdist
130129
factory-boy==3.3.3
131130
# via -r requirements/test.in
132-
faker==40.8.0
131+
faker==40.11.0
133132
# via factory-boy
134133
fastavro==1.12.1
135134
# via openedx-events
@@ -189,7 +188,7 @@ pycryptodomex==3.23.0
189188
# via -r requirements/base.in
190189
pygments==2.19.2
191190
# via pytest
192-
pyjwt[crypto]==2.11.0
191+
pyjwt[crypto]==2.12.0
193192
# via
194193
# -r requirements/base.in
195194
# drf-jwt
@@ -260,7 +259,7 @@ stevedore==5.7.0
260259
# code-annotations
261260
# edx-django-utils
262261
# edx-opaque-keys
263-
testfixtures==10.0.0
262+
testfixtures==11.0.0
264263
# via -r requirements/test.in
265264
text-unidecode==1.3
266265
# via python-slugify
@@ -280,7 +279,7 @@ urllib3==2.6.3
280279
# kombu
281280
wcwidth==0.6.0
282281
# via prompt-toolkit
283-
web-fragments==3.1.0
282+
web-fragments==4.0.0
284283
# via xblock
285284
webob==1.8.9
286285
# via xblock

0 commit comments

Comments
 (0)