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.

Sign up for GitHub

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

Jump to bottom

chore: remove constraints urllib3<2.0.0 #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

chore: remove constraints urllib3<2.0.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a451688
build: Pin MyPY due to internal error
bmtcril Oct 17, 2024
82a0ded
build: Propagate MyPY constraint
bmtcril Oct 17, 2024
3e14dd2
docs: Add issue comment for unpinning MyPY
bmtcril Oct 17, 2024
568fe84
Merge pull request #35666 from openedx/bmtcril/pin_mypy
bmtcril Oct 17, 2024
d30c962
fix: remove urllib3<2.0.0 constraint and update dependencies
mfarhan943 Oct 14, 2024
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
14 changes: 9 additions & 5 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ markdown<3.4.0
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35270
moto<5.0

# Date: 2024-10-16
# MyPY 1.12.0 fails on all PRs with the following error:
# openedx/core/djangoapps/content_libraries/api.py:732: error: INTERNAL ERROR
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35667
mypy<1.12.0

# Date: 2024-07-16
# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
# Otherwise we see a failure while running the following command:
Expand Down Expand Up @@ -182,11 +188,9 @@ pymongo<4.4.1
# Issue for unpinning: https://github.com/edx/edx-arch-experiments/issues/760
social-auth-app-django<=5.4.1

# Date: 2023-11-05
# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
# which require urllib3<2 for now.
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
urllib3<2.0.0
# # Date: 2024-10-14
# # The edx-enterprise is currently using edx-rest-api-client==5.7.1, which needs to be updated first.
# edx-rest-api-client==5.7.1

# Date: 2024-04-24
# xmlsec==1.3.14 breaking tests or all builds, can be removed once a fix is available
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx-sandbox/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ openedx-calc==3.1.2
# via -r requirements/edx-sandbox/base.in
packaging==24.1
# via matplotlib
pillow==10.4.0
pillow==11.0.0
# via matplotlib
pycparser==2.22
# via cffi
Expand Down
21 changes: 10 additions & 11 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
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.40
boto3==1.35.42
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
botocore==1.35.40
botocore==1.35.42
# via
# -r requirements/edx/kernel.in
# boto3
Expand Down Expand Up @@ -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==6.0.0
edx-django-utils==6.1.0
# via
# -r requirements/edx/kernel.in
# django-config-models
Expand Down Expand Up @@ -543,7 +543,7 @@ edx-when==2.5.0
# edx-proctoring
edxval==2.6.0
# via -r requirements/edx/kernel.in
elasticsearch==7.13.4
elasticsearch==7.9.1
# via
# -c requirements/edx/../common_constraints.txt
# edx-search
Expand Down Expand Up @@ -621,11 +621,11 @@ googleapis-common-protos==1.65.0
# via
# google-api-core
# grpcio-status
grpcio==1.66.2
grpcio==1.67.0
# via
# google-api-core
# grpcio-status
grpcio-status==1.66.2
grpcio-status==1.67.0
# via google-api-core
gunicorn==23.0.0
# via -r requirements/edx/kernel.in
Expand Down Expand Up @@ -769,7 +769,7 @@ multidict==6.1.0
# yarl
mysqlclient==2.2.4
# via -r requirements/edx/kernel.in
newrelic==10.1.0
newrelic==10.2.0
# via
# -r requirements/edx/bundled.in
# edx-django-utils
Expand Down Expand Up @@ -869,7 +869,7 @@ pgpy==0.6.0
# via edx-enterprise
piexif==1.1.3
# via -r requirements/edx/kernel.in
pillow==10.4.0
pillow==11.0.0
# via
# -r requirements/edx/kernel.in
# edx-enterprise
Expand Down Expand Up @@ -1219,9 +1219,8 @@ uritemplate==4.1.1
# drf-spectacular
# drf-yasg
# google-api-python-client
urllib3==1.26.20
urllib3==2.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/paver.txt
# botocore
# elasticsearch
Expand Down Expand Up @@ -1292,7 +1291,7 @@ xmlsec==1.3.13
# python3-saml
xss-utils==0.6.0
# via -r requirements/edx/kernel.in
yarl==1.15.2
yarl==1.15.4
# via aiohttp
zipp==3.20.2
# via importlib-metadata
Expand Down
37 changes: 18 additions & 19 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ boto==2.49.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
boto3==1.35.40
boto3==1.35.42
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# django-ses
# fs-s3fs
# ora2
botocore==1.35.40
botocore==1.35.42
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -710,7 +710,7 @@ edx-django-sites-extensions==4.2.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
edx-django-utils==6.0.0
edx-django-utils==6.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -850,7 +850,7 @@ edxval==2.6.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
elasticsearch==7.13.4
elasticsearch==7.9.1
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -879,7 +879,7 @@ execnet==2.1.1
# pytest-xdist
factory-boy==3.3.1
# via -r requirements/edx/testing.txt
faker==30.3.0
faker==30.6.0
# via
# -r requirements/edx/testing.txt
# factory-boy
Expand Down Expand Up @@ -1009,13 +1009,13 @@ grimp==3.5
# via
# -r requirements/edx/testing.txt
# import-linter
grpcio==1.66.2
grpcio==1.67.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# google-api-core
# grpcio-status
grpcio-status==1.66.2
grpcio-status==1.67.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1279,8 +1279,9 @@ multidict==6.1.0
# -r requirements/edx/testing.txt
# aiohttp
# yarl
mypy==1.12.0
mypy==1.11.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/development.in
# django-stubs
# djangorestframework-stubs
Expand All @@ -1290,7 +1291,7 @@ mysqlclient==2.2.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
newrelic==10.1.0
newrelic==10.2.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1455,7 +1456,7 @@ piexif==1.1.3
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
pillow==10.4.0
pillow==11.0.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -2052,7 +2053,7 @@ staff-graded-xblock==2.3.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
starlette==0.39.2
starlette==0.40.0
# via
# -r requirements/edx/testing.txt
# fastapi
Expand Down Expand Up @@ -2098,7 +2099,7 @@ tomlkit==0.13.2
# -r requirements/edx/testing.txt
# pylint
# snowflake-connector-python
tox==4.21.2
tox==4.23.0
# via -r requirements/edx/testing.txt
tqdm==4.66.5
# via
Expand All @@ -2112,10 +2113,8 @@ types-pyyaml==6.0.12.20240917
# via
# django-stubs
# djangorestframework-stubs
types-requests==2.31.0.6
types-requests==2.32.0.20241016
# via djangorestframework-stubs
types-urllib3==1.26.25.14
# via types-requests
typing-extensions==4.12.2
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -2157,20 +2156,20 @@ uritemplate==4.1.1
# drf-spectacular
# drf-yasg
# google-api-python-client
urllib3==1.26.20
urllib3==2.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# botocore
# elasticsearch
# py2neo
# requests
# types-requests
user-util==1.1.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
uvicorn==0.31.1
uvicorn==0.32.0
# via
# -r requirements/edx/testing.txt
# pact-python
Expand Down Expand Up @@ -2281,7 +2280,7 @@ xss-utils==0.6.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
yarl==1.15.2
yarl==1.15.4
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
Expand Down
21 changes: 10 additions & 11 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ bleach[css]==6.1.0
# xblock-poll
boto==2.49.0
# via -r requirements/edx/base.txt
boto3==1.35.40
boto3==1.35.42
# via
# -r requirements/edx/base.txt
# django-ses
# fs-s3fs
# ora2
botocore==1.35.40
botocore==1.35.42
# via
# -r requirements/edx/base.txt
# boto3
Expand Down Expand Up @@ -518,7 +518,7 @@ edx-django-release-util==1.4.0
# edxval
edx-django-sites-extensions==4.2.0
# via -r requirements/edx/base.txt
edx-django-utils==6.0.0
edx-django-utils==6.1.0
# via
# -r requirements/edx/base.txt
# django-config-models
Expand Down Expand Up @@ -626,7 +626,7 @@ edx-when==2.5.0
# edx-proctoring
edxval==2.6.0
# via -r requirements/edx/base.txt
elasticsearch==7.13.4
elasticsearch==7.9.1
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -735,12 +735,12 @@ googleapis-common-protos==1.65.0
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
grpcio==1.66.2
grpcio==1.67.0
# via
# -r requirements/edx/base.txt
# google-api-core
# grpcio-status
grpcio-status==1.66.2
grpcio-status==1.67.0
# via
# -r requirements/edx/base.txt
# google-api-core
Expand Down Expand Up @@ -923,7 +923,7 @@ multidict==6.1.0
# yarl
mysqlclient==2.2.4
# via -r requirements/edx/base.txt
newrelic==10.1.0
newrelic==10.2.0
# via
# -r requirements/edx/base.txt
# edx-django-utils
Expand Down Expand Up @@ -1039,7 +1039,7 @@ picobox==4.0.0
# via sphinxcontrib-openapi
piexif==1.1.3
# via -r requirements/edx/base.txt
pillow==10.4.0
pillow==11.0.0
# via
# -r requirements/edx/base.txt
# edx-enterprise
Expand Down Expand Up @@ -1503,9 +1503,8 @@ uritemplate==4.1.1
# drf-spectacular
# drf-yasg
# google-api-python-client
urllib3==1.26.20
urllib3==2.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
# botocore
# elasticsearch
Expand Down Expand Up @@ -1586,7 +1585,7 @@ xmlsec==1.3.13
# python3-saml
xss-utils==0.6.0
# via -r requirements/edx/base.txt
yarl==1.15.2
yarl==1.15.4
# via
# -r requirements/edx/base.txt
# aiohttp
Expand Down
6 changes: 2 additions & 4 deletions requirements/edx/paver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ stevedore==5.3.0
# edx-opaque-keys
typing-extensions==4.12.2
# via edx-opaque-keys
urllib3==1.26.20
# via
# -c requirements/edx/../constraints.txt
# requests
urllib3==2.2.3
# via requests
watchdog==5.0.3
# via -r requirements/edx/paver.in
wrapt==1.16.0
Expand Down
Loading
Loading