fix: pin urllib3<2.0.0

openedx-unsupported · Sep 5, 2023 · 1cc35bd · 1cc35bd
1 parent 0a292d9
commit 1cc35bd
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 16 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -2,11 +2,13 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 lazy==1.5
     # via -r requirements/base.in
 selenium==3.141.0
     # via -r requirements/base.in
-urllib3==2.0.4
-    # via selenium
+urllib3==1.26.16
+    # via
+    #   -c requirements/constraints.txt
+    #   selenium
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 coverage==7.3.0
     # via -r requirements/ci.in
@@ -26,7 +26,7 @@ tomli==2.0.1
     # via tox
 tox==3.28.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
     #   tox-battery
     #   tox-travis

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -0,0 +1,27 @@
+# A central location for most common version constraints
+# (across edx repos) for pip-installation.
+#
+# Similar to other constraint files this file doesn't install any packages.
+# It specifies version constraints that will be applied if a package is needed.
+# When pinning something here, please provide an explanation of why it is a good
+# idea to pin this package across all edx repos, Ideally, link to other information
+# that will help people in the future to remove the pin when possible.
+# Writing an issue against the offending project and linking to it here is good.
+#
+# Note: Changes to this file will automatically be used by other repos, referencing
+#  this file from Github directly. It does not require packaging in edx-lint.
+
+
+# using LTS django version
+Django<4.0
+
+# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
+# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
+elasticsearch<7.14.0
+
+# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
+django-simple-history==3.0.0
+
+# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
+# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
+tox<4.0.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -11,3 +11,6 @@
 
 # This file contains all common constraints for edx-repos
 -c common_constraints.txt
+
+# urllib3>2.0.0 breaks bok-choy tests
+urllib3<2.0.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 astroid==2.15.6
     # via
@@ -208,7 +208,7 @@ tomlkit==0.12.1
     #   pylint
 tox==3.28.0
     # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/ci.txt
     #   tox-battery
     #   tox-travis
@@ -223,8 +223,9 @@ typing-extensions==4.7.1
     #   astroid
     #   filelock
     #   pylint
-urllib3==2.0.4
+urllib3==1.26.16
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/needle.txt
     #   selenium
 virtualenv==20.24.4

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 accessible-pygments==0.0.4
     # via pydata-sphinx-theme
@@ -84,8 +84,9 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 typing-extensions==4.7.1
     # via pydata-sphinx-theme
-urllib3==2.0.4
+urllib3==1.26.16
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   requests
     #   selenium

diff --git a/requirements/needle.txt b/requirements/needle.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 astroid==2.15.6
     # via
@@ -161,8 +161,9 @@ typing-extensions==4.7.1
     #   -r requirements/test.txt
     #   astroid
     #   pylint
-urllib3==2.0.4
+urllib3==1.26.16
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   selenium
 wrapt==1.15.0

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 build==1.0.0
     # via pip-tools

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 wheel==0.41.2
     # via -r requirements/pip.in

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    make upgrade
+#    make upgrades
 #
 astroid==2.15.6
     # via
@@ -100,8 +100,9 @@ typing-extensions==4.7.1
     # via
     #   astroid
     #   pylint
-urllib3==2.0.4
+urllib3==1.26.16
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   selenium
 wrapt==1.15.0