From 1cc35bd79ccf92c6a6cf72d4dff15047902bf587 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Tue, 5 Sep 2023 15:59:24 +0500 Subject: [PATCH] fix: pin urllib3<2.0.0 --- requirements/base.txt | 8 +++++--- requirements/ci.txt | 4 ++-- requirements/common_constraints.txt | 27 +++++++++++++++++++++++++++ requirements/constraints.txt | 3 +++ requirements/dev.txt | 7 ++++--- requirements/doc.txt | 5 +++-- requirements/needle.txt | 5 +++-- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 2 +- requirements/test.txt | 5 +++-- 10 files changed, 52 insertions(+), 16 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 92720f2a..b5f382c3 100644 --- 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 index fcf56bc6..24122b98 100644 --- 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 index e69de29b..afe6aa88 100644 --- 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 index 04e78f53..c0a5dae5 100644 --- 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 index 0acb1889..154fd9b7 100644 --- 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 index 88de561c..f3cc3fa8 100644 --- 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 index 25a77a08..bdfc2bfa 100644 --- 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 index 135c9d9a..e1000669 100644 --- 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 index 13c7e845..9783e55d 100644 --- 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 index 12a52cbf..49d4ea21 100644 --- 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