Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use jammy repositories to install mongo for testing and unpin lxml and xmlsec. #35634

Merged
merged 2 commits into from
Oct 10, 2024
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/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
if [[ "${{ matrix.mongo-version }}" != "4.4" ]]; then
wget -qO - https://www.mongodb.org/static/pgp/server-${{ matrix.mongo-version }}.asc | sudo apt-key add -
echo "deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list
echo "deb https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/${{ matrix.mongo-version }} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-${{ matrix.mongo-version }}.list
sudo apt-get update && sudo apt-get install -y mongodb-org="${{ matrix.mongo-version }}.*"
fi
Expand Down
19 changes: 0 additions & 19 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,6 @@ django-storages<1.14.4
# for them.
edx-enterprise==4.27.2

# Date: 2024-05-09
# This has to be constrained as well because newer versions of edx-i18n-tools need the
# newer version of lxml but that requirement was not made expilict in the 1.6.0 version
# of the package. This can be un-pinned when we're upgrading lxml.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35274
edx-i18n-tools<1.6.0

# Date: 2024-07-26
# To override the constraint of edx-lint
# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
Expand All @@ -105,13 +98,6 @@ event-tracking==3.0.0
# https://github.com/openedx/edx-platform/issues/31616
libsass==0.10.0

# Date: 2024-04-30
# lxml>=5.0 introduced breaking changes related to system dependencies
# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean]
# This constraint can be removed once we upgrade to Python 3.11
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35272
lxml<5.0

# Date: 2018-12-14
# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
# pinning the version untill the issue gets resolved in the package itself
Expand Down Expand Up @@ -187,8 +173,3 @@ social-auth-app-django<=5.4.1
# which require urllib3<2 for now.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
urllib3<2.0.0

# Date: 2024-04-24
# xmlsec==1.3.14 breaking tests or all builds, can be removed once a fix is available
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35264
xmlsec<1.3.14
5 changes: 2 additions & 3 deletions requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ joblib==1.4.2
# via nltk
kiwisolver==1.4.7
# via matplotlib
lxml==4.9.4
lxml==5.3.0
# via
# -c requirements/edx-sandbox/../constraints.txt
# -r requirements/edx-sandbox/base.in
# openedx-calc
markupsafe==2.1.5
markupsafe==3.0.1
# via
# chem
# openedx-calc
Expand Down
74 changes: 37 additions & 37 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
-e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack
# via -r requirements/edx/github.in
acid-xblock==0.3.1
acid-xblock==0.4.1
# via -r requirements/edx/kernel.in
aiohappyeyeballs==2.4.0
aiohappyeyeballs==2.4.3
# via aiohttp
aiohttp==3.10.6
aiohttp==3.10.9
# via
# geoip2
# openai
Expand Down Expand Up @@ -70,13 +70,13 @@ bleach[css]==6.1.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/kernel.in
boto3==1.35.27
boto3==1.35.37
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.35.27
botocore==1.35.37
# via
# -r requirements/edx/kernel.in
# boto3
Expand All @@ -87,7 +87,7 @@ cachecontrol==0.14.0
# via firebase-admin
cachetools==5.5.0
# via google-auth
camel-converter[pydantic]==3.1.2
camel-converter[pydantic]==4.0.1
# via meilisearch
celery==5.4.0
# via
Expand Down Expand Up @@ -328,7 +328,7 @@ django-sekizai==4.1.0
# via
# -r requirements/edx/kernel.in
# openedx-django-wiki
django-ses==4.1.1
django-ses==4.2.0
# via -r requirements/edx/bundled.in
django-simple-history==3.4.0
# via
Expand Down Expand Up @@ -387,7 +387,7 @@ djangorestframework==3.14.0
# super-csv
djangorestframework-xml==2.0.0
# via edx-enterprise
dnspython==2.6.1
dnspython==2.7.0
# via
# -r requirements/edx/paver.txt
# pymongo
Expand Down Expand Up @@ -429,7 +429,7 @@ edx-celeryutils==1.3.0
# super-csv
edx-codejail==3.4.1
# via -r requirements/edx/kernel.in
edx-completion==4.7.1
edx-completion==4.7.2
# via -r requirements/edx/kernel.in
edx-django-release-util==1.4.0
# via
Expand All @@ -438,7 +438,7 @@ edx-django-release-util==1.4.0
# edxval
edx-django-sites-extensions==4.2.0
# via -r requirements/edx/kernel.in
edx-django-utils==5.16.0
edx-django-utils==6.0.0
# via
# -r requirements/edx/kernel.in
# django-config-models
Expand Down Expand Up @@ -475,9 +475,8 @@ edx-event-bus-kafka==5.8.1
# via -r requirements/edx/kernel.in
edx-event-bus-redis==0.5.0
# via -r requirements/edx/kernel.in
edx-i18n-tools==1.5.0
edx-i18n-tools==1.6.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/bundled.in
# ora2
edx-milestones==0.6.0
Expand Down Expand Up @@ -517,7 +516,7 @@ edx-search==4.0.0
# via -r requirements/edx/kernel.in
edx-sga==0.25.0
# via -r requirements/edx/bundled.in
edx-submissions==3.8.0
edx-submissions==3.8.1
# via
# -r requirements/edx/kernel.in
# ora2
Expand Down Expand Up @@ -584,14 +583,14 @@ geoip2==4.8.0
# via -r requirements/edx/kernel.in
glob2==0.7
# via -r requirements/edx/kernel.in
google-api-core[grpc]==2.20.0
google-api-core[grpc]==2.21.0
# via
# firebase-admin
# google-api-python-client
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.147.0
google-api-python-client==2.149.0
# via firebase-admin
google-auth==2.35.0
# via
Expand Down Expand Up @@ -621,11 +620,11 @@ googleapis-common-protos==1.65.0
# via
# google-api-core
# grpcio-status
grpcio==1.66.1
grpcio==1.66.2
# via
# google-api-core
# grpcio-status
grpcio-status==1.66.1
grpcio-status==1.66.2
# via google-api-core
gunicorn==23.0.0
# via -r requirements/edx/kernel.in
Expand All @@ -639,7 +638,7 @@ httplib2==0.22.0
# via
# google-api-python-client
# google-auth-httplib2
icalendar==5.0.13
icalendar==6.0.0
# via -r requirements/edx/kernel.in
idna==3.10
# via
Expand All @@ -658,7 +657,7 @@ interchange==2021.0.4
# via py2neo
ipaddress==1.0.23
# via -r requirements/edx/kernel.in
isodate==0.6.1
isodate==0.7.2
# via python3-saml
jinja2==3.1.4
# via code-annotations
Expand All @@ -683,7 +682,7 @@ jsonschema==4.23.0
# via
# drf-spectacular
# optimizely-sdk
jsonschema-specifications==2023.12.1
jsonschema-specifications==2024.10.1
# via jsonschema
jwcrypto==1.5.6
# via
Expand All @@ -708,19 +707,21 @@ loremipsum==1.0.5
# via ora2
lti-consumer-xblock==9.11.3
# via -r requirements/edx/kernel.in
lxml==4.9.4
lxml[html-clean]==5.3.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
# edx-i18n-tools
# edxval
# lti-consumer-xblock
# lxml-html-clean
# olxcleaner
# openedx-calc
# ora2
# python3-saml
# xblock
# xmlsec
lxml-html-clean==0.3.1
# via lxml
mailsnake==1.6.4
# via -r requirements/edx/bundled.in
mako==1.3.5
Expand All @@ -737,7 +738,7 @@ markdown==3.3.7
# openedx-django-wiki
# staff-graded-xblock
# xblock-poll
markupsafe==2.1.5
markupsafe==3.0.1
# via
# -r requirements/edx/paver.txt
# chem
Expand Down Expand Up @@ -769,7 +770,7 @@ multidict==6.1.0
# yarl
mysqlclient==2.2.4
# via -r requirements/edx/kernel.in
newrelic==9.13.0
newrelic==10.0.0
# via
# -r requirements/edx/bundled.in
# edx-django-utils
Expand Down Expand Up @@ -820,7 +821,7 @@ openedx-events==9.14.1
# edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.10.0
openedx-filters==1.11.0
# via
# -r requirements/edx/kernel.in
# lti-consumer-xblock
Expand All @@ -829,7 +830,7 @@ openedx-learning==0.13.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
openedx-mongodbproxy==0.2.1
openedx-mongodbproxy==0.2.2
# via -r requirements/edx/kernel.in
optimizely-sdk==4.1.1
# via
Expand Down Expand Up @@ -881,6 +882,8 @@ polib==1.2.0
# via edx-i18n-tools
prompt-toolkit==3.0.48
# via click-repl
propcache==0.2.0
# via yarl
proto-plus==1.24.0
# via
# google-api-core
Expand Down Expand Up @@ -911,7 +914,7 @@ pycountry==24.6.1
# via -r requirements/edx/kernel.in
pycparser==2.22
# via cffi
pycryptodomex==3.20.0
pycryptodomex==3.21.0
# via
# -r requirements/edx/kernel.in
# edx-proctoring
Expand Down Expand Up @@ -1017,7 +1020,6 @@ pytz==2024.2
# edx-tincan-py35
# event-tracking
# fs
# icalendar
# interchange
# olxcleaner
# ora2
Expand All @@ -1039,7 +1041,7 @@ random2==1.0.2
# via -r requirements/edx/kernel.in
recommender-xblock==2.2.1
# via -r requirements/edx/bundled.in
redis==5.0.8
redis==5.1.1
# via
# -r requirements/edx/kernel.in
# walrus
Expand Down Expand Up @@ -1092,7 +1094,7 @@ rules==3.5
# edx-enterprise
# edx-proctoring
# openedx-learning
s3transfer==0.10.2
s3transfer==0.10.3
# via boto3
sailthru-client==2.2.3
# via edx-ace
Expand Down Expand Up @@ -1131,7 +1133,6 @@ six==1.16.0
# fs-s3fs
# html5lib
# interchange
# isodate
# libsass
# optimizely-sdk
# pansi
Expand Down Expand Up @@ -1208,6 +1209,7 @@ typing-extensions==4.12.2
tzdata==2024.2
# via
# celery
# icalendar
# kombu
unicodecsv==0.14.1
# via
Expand Down Expand Up @@ -1237,7 +1239,7 @@ voluptuous==0.15.2
# via ora2
walrus==0.9.4
# via edx-event-bus-redis
watchdog==5.0.2
watchdog==5.0.3
# via -r requirements/edx/paver.txt
wcwidth==0.2.13
# via prompt-toolkit
Expand Down Expand Up @@ -1285,13 +1287,11 @@ xblock-utils==4.0.0
# via
# edx-sga
# xblock-poll
xmlsec==1.3.13
# via
# -c requirements/edx/../constraints.txt
# python3-saml
xmlsec==1.3.14
# via python3-saml
xss-utils==0.6.0
# via -r requirements/edx/kernel.in
yarl==1.12.1
yarl==1.14.0
# via aiohttp
zipp==3.20.2
# via importlib-metadata
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/coverage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
chardet==5.2.0
# via diff-cover
coverage==7.6.1
coverage==7.6.2
# via -r requirements/edx/coverage.in
diff-cover==9.2.0
# via -r requirements/edx/coverage.in
jinja2==3.1.4
# via diff-cover
markupsafe==2.1.5
markupsafe==3.0.1
# via jinja2
pluggy==1.5.0
# via diff-cover
Expand Down
Loading
Loading