Skip to content

Commit b54b9e5

Browse files
irtazaakramirtazaakram
authored
feat: add support for Django 4.2
1 parent 42c2d2f commit b54b9e5

18 files changed

+179
-97
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
matrix:
2929
os: [ubuntu-20.04]
3030
python-version: [3.8]
31-
toxenv: [py38-django32, integration, quality]
31+
toxenv: [py38-django32, py38-django42, integration32, integration42, quality]
3232

3333
steps:
3434
- name: checkout repo
@@ -40,7 +40,7 @@ jobs:
4040
python-version: ${{ matrix.python-version }}
4141

4242
- name: Install Required System Packages
43-
if: matrix.toxenv == 'integration'
43+
if: ${{ startsWith(matrix.toxenv, 'integration') }}
4444
run: |
4545
sudo apt-get update
4646
sudo apt-get install -y xvfb

‎AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Eugeny Kolpakov <[email protected]>
1010
Braden MacDonald <[email protected]>
1111
Jonathan Piacenti <[email protected]>
1212
Tim Krones <[email protected]>
13+
Irtaza Akram <[email protected]>

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
102102
$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
103103
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
104104
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
105-
# Let tox control the Django version for tests
106-
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
107-
mv requirements/test.tmp requirements/test.txt
105+
# Let tox control the Django version for tests & integration
106+
sed -i '/^[dD]jango==/d' requirements/test.txt
107+
sed -i '/^[dD]jango==/d' requirements/workbench.txt

‎problem_builder/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "5.1.3"
1+
__version__ = "5.1.4"

‎problem_builder/dashboard.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def eval_(node):
156156
elif isinstance(node, ast.Name) and node.id == "x":
157157
return x
158158
elif isinstance(node, ast.BoolOp): # Boolean operator: either "and" or "or" with two or more values
159-
if type(node.op) == ast.And:
159+
if isinstance(node.op, ast.And):
160160
return all(eval_(val) for val in node.values)
161161
else: # Or:
162162
for val in node.values:

‎problem_builder/tests/unit/test_answer_mixin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def setUp(self):
2525

2626
def make_answer_mixin(self, name=None, course_id=None, student_id=None):
2727
if name is None:
28-
name = get_random_string()
28+
name = get_random_string(12)
2929
if course_id is None:
3030
course_id = self.course_id
3131
if student_id is None:

‎pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -773,4 +773,4 @@ known-third-party=enchant
773773

774774
# Exceptions that will emit a warning when being caught. Defaults to
775775
# "Exception"
776-
overgeneral-exceptions=Exception
776+
overgeneral-exceptions=builtins.Exception

‎requirements/base.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pytz==2023.3
3434
# via
3535
# django
3636
# xblock
37-
pyyaml==6.0
37+
pyyaml==6.0.1
3838
# via xblock
3939
simplejson==3.19.1
4040
# via xblock-utils
@@ -48,15 +48,15 @@ stevedore==5.1.0
4848
# via edx-opaque-keys
4949
typing-extensions==4.7.1
5050
# via asgiref
51-
web-fragments==2.0.0
51+
web-fragments==2.1.0
5252
# via
5353
# xblock
5454
# xblock-utils
5555
webob==1.8.7
5656
# via xblock
57-
xblock==1.6.2
57+
xblock==1.7.0
5858
# via xblock-utils
59-
xblock-utils==3.2.0
59+
xblock-utils==3.3.0
6060
# via -r requirements/base.in
6161

6262
# The following packages are considered to be unsafe in a requirements file:

‎requirements/ci.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# make upgrade
66
#
7-
distlib==0.3.6
7+
distlib==0.3.7
88
# via virtualenv
99
filelock==3.12.2
1010
# via
1111
# tox
1212
# virtualenv
1313
packaging==23.1
1414
# via tox
15-
platformdirs==3.9.1
15+
platformdirs==3.10.0
1616
# via virtualenv
1717
pluggy==1.2.0
1818
# via tox
@@ -29,5 +29,5 @@ tox==3.28.0
2929
# tox-battery
3030
tox-battery==0.6.1
3131
# via -r requirements/ci.in
32-
virtualenv==20.24.0
32+
virtualenv==20.24.2
3333
# via tox

‎requirements/dev.txt

+44-23
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ bok-choy==0.7.1
3333
# via
3434
# -c requirements/constraints.txt
3535
# -r requirements/workbench.txt
36-
boto3==1.28.3
36+
boto3==1.28.19
3737
# via
3838
# -r requirements/quality.txt
3939
# -r requirements/workbench.txt
4040
# fs-s3fs
41-
botocore==1.31.3
41+
botocore==1.31.19
4242
# via
4343
# -r requirements/quality.txt
4444
# -r requirements/workbench.txt
@@ -48,12 +48,12 @@ build==0.10.0
4848
# via
4949
# -r requirements/pip-tools.txt
5050
# pip-tools
51-
certifi==2023.5.7
51+
certifi==2023.7.22
5252
# via
5353
# -r requirements/quality.txt
5454
# -r requirements/workbench.txt
5555
# requests
56-
chardet==5.1.0
56+
chardet==5.2.0
5757
# via
5858
# -r requirements/quality.txt
5959
# -r requirements/workbench.txt
@@ -63,7 +63,7 @@ charset-normalizer==3.2.0
6363
# -r requirements/quality.txt
6464
# -r requirements/workbench.txt
6565
# requests
66-
click==8.1.5
66+
click==8.1.6
6767
# via
6868
# -r requirements/pip-tools.txt
6969
# -r requirements/quality.txt
@@ -77,12 +77,12 @@ click-log==0.4.0
7777
# via
7878
# -r requirements/quality.txt
7979
# edx-lint
80-
code-annotations==1.3.0
80+
code-annotations==1.5.0
8181
# via
8282
# -r requirements/quality.txt
8383
# -r requirements/workbench.txt
8484
# edx-lint
85-
cookiecutter==2.2.3
85+
cookiecutter==2.3.0
8686
# via
8787
# -r requirements/quality.txt
8888
# -r requirements/workbench.txt
@@ -96,11 +96,11 @@ ddt==1.6.0
9696
# via
9797
# -r requirements/quality.txt
9898
# -r requirements/workbench.txt
99-
dill==0.3.6
99+
dill==0.3.7
100100
# via
101101
# -r requirements/quality.txt
102102
# pylint
103-
distlib==0.3.6
103+
distlib==0.3.7
104104
# via
105105
# -r requirements/ci.txt
106106
# virtualenv
@@ -119,11 +119,11 @@ django-appconf==1.0.5
119119
# -r requirements/quality.txt
120120
# -r requirements/workbench.txt
121121
# django-statici18n
122-
django-statici18n==2.3.1
122+
django-statici18n==2.4.0
123123
# via
124124
# -r requirements/quality.txt
125125
# -r requirements/workbench.txt
126-
edx-i18n-tools==1.0.0
126+
edx-i18n-tools==1.1.0
127127
# via
128128
# -r requirements/quality.txt
129129
# -r requirements/workbench.txt
@@ -203,6 +203,11 @@ mako==1.2.4
203203
# -r requirements/quality.txt
204204
# -r requirements/workbench.txt
205205
# xblock-utils
206+
markdown-it-py==3.0.0
207+
# via
208+
# -r requirements/quality.txt
209+
# -r requirements/workbench.txt
210+
# rich
206211
markupsafe==2.1.3
207212
# via
208213
# -r requirements/quality.txt
@@ -214,6 +219,11 @@ mccabe==0.7.0
214219
# via
215220
# -r requirements/quality.txt
216221
# pylint
222+
mdurl==0.1.2
223+
# via
224+
# -r requirements/quality.txt
225+
# -r requirements/workbench.txt
226+
# markdown-it-py
217227
mock==5.1.0
218228
# via
219229
# -r requirements/quality.txt
@@ -256,9 +266,9 @@ pillow==10.0.0
256266
# via
257267
# -r requirements/workbench.txt
258268
# needle
259-
pip-tools==7.0.0
269+
pip-tools==7.2.0
260270
# via -r requirements/pip-tools.txt
261-
platformdirs==3.9.1
271+
platformdirs==3.10.0
262272
# via
263273
# -r requirements/ci.txt
264274
# -r requirements/quality.txt
@@ -280,11 +290,16 @@ py==1.11.0
280290
# via
281291
# -r requirements/ci.txt
282292
# tox
283-
pycodestyle==2.10.0
293+
pycodestyle==2.11.0
284294
# via -r requirements/quality.txt
285295
pydocstyle==6.3.0
286296
# via -r requirements/quality.txt
287-
pylint==2.17.4
297+
pygments==2.15.1
298+
# via
299+
# -r requirements/quality.txt
300+
# -r requirements/workbench.txt
301+
# rich
302+
pylint==2.17.5
288303
# via
289304
# -r requirements/quality.txt
290305
# edx-lint
@@ -351,7 +366,7 @@ pytz==2023.3
351366
# -r requirements/workbench.txt
352367
# django
353368
# xblock
354-
pyyaml==6.0
369+
pyyaml==6.0.1
355370
# via
356371
# -r requirements/quality.txt
357372
# -r requirements/workbench.txt
@@ -365,6 +380,11 @@ requests==2.31.0
365380
# -r requirements/workbench.txt
366381
# cookiecutter
367382
# xblock-sdk
383+
rich==13.5.2
384+
# via
385+
# -r requirements/quality.txt
386+
# -r requirements/workbench.txt
387+
# cookiecutter
368388
s3transfer==0.6.1
369389
# via
370390
# -r requirements/quality.txt
@@ -425,7 +445,7 @@ tomli==2.0.1
425445
# pyproject-hooks
426446
# pytest
427447
# tox
428-
tomlkit==0.11.8
448+
tomlkit==0.12.1
429449
# via
430450
# -r requirements/quality.txt
431451
# pylint
@@ -443,18 +463,19 @@ typing-extensions==4.7.1
443463
# asgiref
444464
# astroid
445465
# pylint
466+
# rich
446467
urllib3==1.26.16
447468
# via
448469
# -r requirements/quality.txt
449470
# -r requirements/workbench.txt
450471
# botocore
451472
# requests
452473
# selenium
453-
virtualenv==20.24.0
474+
virtualenv==20.24.2
454475
# via
455476
# -r requirements/ci.txt
456477
# tox
457-
web-fragments==2.0.0
478+
web-fragments==2.1.0
458479
# via
459480
# -r requirements/quality.txt
460481
# -r requirements/workbench.txt
@@ -467,25 +488,25 @@ webob==1.8.7
467488
# -r requirements/workbench.txt
468489
# xblock
469490
# xblock-sdk
470-
wheel==0.40.0
491+
wheel==0.41.0
471492
# via
472493
# -r requirements/pip-tools.txt
473494
# pip-tools
474495
wrapt==1.15.0
475496
# via
476497
# -r requirements/quality.txt
477498
# astroid
478-
xblock[django]==1.6.2
499+
xblock[django]==1.7.0
479500
# via
480501
# -r requirements/quality.txt
481502
# -r requirements/workbench.txt
482503
# xblock-sdk
483504
# xblock-utils
484-
xblock-sdk==0.6.0
505+
xblock-sdk==0.7.0
485506
# via
486507
# -r requirements/quality.txt
487508
# -r requirements/workbench.txt
488-
xblock-utils==3.2.0
509+
xblock-utils==3.3.0
489510
# via
490511
# -r requirements/quality.txt
491512
# -r requirements/workbench.txt

‎requirements/pip-tools.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
build==0.10.0
88
# via pip-tools
9-
click==8.1.5
9+
click==8.1.6
1010
# via pip-tools
1111
packaging==23.1
1212
# via build
13-
pip-tools==7.0.0
13+
pip-tools==7.2.0
1414
# via -r requirements/pip-tools.in
1515
pyproject-hooks==1.0.0
1616
# via build
@@ -19,7 +19,7 @@ tomli==2.0.1
1919
# build
2020
# pip-tools
2121
# pyproject-hooks
22-
wheel==0.40.0
22+
wheel==0.41.0
2323
# via pip-tools
2424

2525
# The following packages are considered to be unsafe in a requirements file:

‎requirements/pip.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# make upgrade
66
#
7-
wheel==0.40.0
7+
wheel==0.41.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
11-
pip==23.2
11+
pip==23.2.1
1212
# via -r requirements/pip.in
1313
setuptools==68.0.0
1414
# via -r requirements/pip.in

0 commit comments

Comments
 (0)