Skip to content

Commit 26ff101

Browse files
authored
Merge branch 'master' into ttqureshi/drop-py3.8
2 parents a876858 + 1274488 commit 26ff101

11 files changed

Lines changed: 156 additions & 136 deletions

File tree

catalog-info.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file records information about this repo. Its use is described in OEP-55:
2+
# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
3+
4+
apiVersion: backstage.io/v1alpha1
5+
kind: Component
6+
metadata:
7+
name: 'xqueue'
8+
description: "XQueue defines an interface for the LMS to communicate with external grader services."
9+
annotations:
10+
openedx.org/arch-interest-groups: ""
11+
openedx.org/release: "master"
12+
spec:
13+
owner: group:openedx-unmaintained
14+
type: 'service'
15+
lifecycle: 'production'

openedx.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

requirements.txt

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9"
1212
# via
1313
# -c requirements/constraints.txt
1414
# django
15-
boto3==1.34.93
15+
boto3==1.36.21
1616
# via -r requirements/base.in
17-
botocore==1.34.93
17+
botocore==1.36.21
1818
# via
1919
# boto3
2020
# s3transfer
21-
certifi==2024.2.2
21+
certifi==2025.1.31
2222
# via requests
23-
cffi==1.16.0
23+
cffi==1.17.1
2424
# via pynacl
25-
charset-normalizer==3.3.2
25+
charset-normalizer==3.4.1
2626
# via requests
27-
click==8.1.7
27+
click==8.1.8
2828
# via edx-django-utils
29-
django==4.2.13
29+
django==4.2.19
3030
# via
3131
# -c requirements/common_constraints.txt
3232
# -r requirements/base.in
@@ -37,37 +37,37 @@ django==4.2.13
3737
# edx-django-utils
3838
django-crum==0.7.9
3939
# via edx-django-utils
40-
django-storages==1.14.2
40+
django-storages==1.14.4
4141
# via -r requirements/base.in
42-
django-waffle==4.1.0
42+
django-waffle==4.2.0
4343
# via edx-django-utils
4444
edx-django-release-util==1.4.0
4545
# via -r requirements/base.in
46-
edx-django-utils==5.12.0
46+
edx-django-utils==7.1.0
4747
# via -r requirements/base.in
48-
gunicorn==22.0.0
48+
gunicorn==23.0.0
4949
# via -r requirements/base.in
50-
idna==3.7
50+
idna==3.10
5151
# via requests
5252
isort==5.13.2
5353
# via -r requirements/base.in
5454
jmespath==1.0.1
5555
# via
5656
# boto3
5757
# botocore
58-
mysqlclient==2.2.4
58+
mysqlclient==2.2.7
5959
# via -r requirements/base.in
60-
newrelic==9.9.0
60+
newrelic==10.6.0
6161
# via
6262
# -r requirements/base.in
6363
# edx-django-utils
64-
packaging==24.0
64+
packaging==24.2
6565
# via gunicorn
6666
path-py==11.0.1
6767
# via -r requirements/base.in
68-
pbr==6.0.0
68+
pbr==6.1.1
6969
# via stevedore
70-
psutil==5.9.8
70+
psutil==7.0.0
7171
# via edx-django-utils
7272
pycparser==2.22
7373
# via cffi
@@ -79,26 +79,27 @@ python-memcached==1.62
7979
# via -r requirements/base.in
8080
python-termstyle==0.1.10
8181
# via -r requirements/base.in
82-
pytz==2024.1
82+
pytz==2025.1
8383
# via -r requirements/base.in
84-
pyyaml==6.0.1
84+
pyyaml==6.0.2
8585
# via edx-django-release-util
86-
requests==2.31.0
86+
requests==2.32.3
8787
# via -r requirements/base.in
88-
s3transfer==0.10.1
88+
s3transfer==0.11.2
8989
# via boto3
90-
six==1.16.0
90+
six==1.17.0
9191
# via
9292
# edx-django-release-util
9393
# python-dateutil
94-
sqlparse==0.5.0
94+
sqlparse==0.5.3
9595
# via django
96-
stevedore==5.2.0
96+
stevedore==5.3.0
9797
# via edx-django-utils
98-
typing-extensions==4.11.0
98+
typing-extensions==4.12.2
9999
# via asgiref
100-
urllib3==1.26.18
100+
urllib3==1.26.20
101101
# via
102+
# -c requirements/common_constraints.txt
102103
# botocore
103104
# requests
104105

requirements/ci.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,37 @@
44
#
55
# make upgrade
66
#
7-
cachetools==5.3.3
7+
cachetools==5.5.1
88
# via tox
99
chardet==5.2.0
1010
# via tox
1111
colorama==0.4.6
1212
# via tox
13-
distlib==0.3.8
13+
distlib==0.3.9
1414
# via virtualenv
15-
filelock==3.13.4
15+
filelock==3.16.1
1616
# via
1717
# tox
1818
# virtualenv
19-
packaging==24.0
19+
packaging==24.2
2020
# via
2121
# pyproject-api
2222
# tox
23-
platformdirs==4.2.1
23+
platformdirs==4.3.6
2424
# via
2525
# tox
2626
# virtualenv
2727
pluggy==1.5.0
2828
# via tox
29-
pyproject-api==1.6.1
29+
pyproject-api==1.8.0
3030
# via tox
31-
tomli==2.0.1
31+
tomli==2.2.1
3232
# via
3333
# pyproject-api
3434
# tox
35-
tox==4.15.0
35+
tox==4.24.1
3636
# via -r requirements/ci.in
37-
virtualenv==20.26.0
37+
typing-extensions==4.12.2
38+
# via tox
39+
virtualenv==20.29.2
3840
# via tox

requirements/common_constraints.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
# Note: Changes to this file will automatically be used by other repos, referencing
1717
# this file from Github directly. It does not require packaging in edx-lint.
1818

19-
2019
# using LTS django version
2120
Django<5.0
2221

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

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

30-
# opentelemetry requires version 6.x at the moment:
31-
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
32-
# Normally this could be added as a constraint in edx-django-utils, where we're
33-
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
34-
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
35-
# So we need to pin it globally, for now.
36-
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
37-
importlib-metadata<7
30+
# Cause: https://github.com/openedx/edx-lint/issues/458
31+
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
32+
pip<24.3
33+
34+
# Cause: https://github.com/openedx/edx-lint/issues/475
35+
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
36+
urllib3<2.3.0

0 commit comments

Comments
 (0)