Merge pull request #344 from openedx/jenkins/upgrade-python-requireme…

…nts-48650ca

Python Requirements Update

requirements/base.txt

@@ -11,11 +11,13 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9"
     #   -c requirements/constraints.txt
     #   django
     #   djangorestframework
+cffi==1.16.0
     # via pynacl
 click==8.1.7
     # via edx-django-utils
 django==4.2.11
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-waffle
@@ -39,11 +41,14 @@ pycparser==2.22
     # via cffi
 pynacl==1.5.0
     # via edx-django-utils
-pytz==2024.1
-    # via djangorestframework
 sqlparse==0.4.4
     # via django
 stevedore==5.2.0
     # via edx-django-utils
 typing-extensions==4.10.0
     # via asgiref
+wheel==0.43.0
+    # via -r requirements/base.in
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

requirements/common_constraints.txt

@@ -0,0 +1,32 @@
+# 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<5.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
+
+# opentelemetry requires version 6.x at the moment:
+# https://github.com/open-telemetry/opentelemetry-python/issues/3570
+# Normally this could be added as a constraint in edx-django-utils, where we're
+# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
+# that uses version 7.x, and then there's no undoing that when compiling base.txt.
+# So we need to pin it globally, for now.
+# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
+importlib-metadata<7

requirements/dev.txt

@@ -60,6 +60,7 @@ distlib==0.3.8
     #   virtualenv
 django==4.2.11
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/quality.txt
     #   django-crum
     #   django-waffle
@@ -96,8 +97,9 @@ filelock==3.13.3
     #   virtualenv
 freezegun==1.4.0
     # via -r requirements/quality.txt
-importlib-metadata==7.1.0
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/pip-tools.txt
     #   build
 iniconfig==2.0.0
@@ -218,10 +220,6 @@ python-slugify==8.0.4
     # via
     #   -r requirements/quality.txt
     #   code-annotations
-pytz==2024.1
-    # via
-    #   -r requirements/quality.txt
-    #   djangorestframework
 pyyaml==6.0.1
     # via
     #   -r requirements/quality.txt
@@ -288,6 +286,7 @@ virtualenv==20.25.1
 wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
+    #   -r requirements/quality.txt
     #   pip-tools
 zipp==3.18.1
     # via

requirements/doc.txt

@@ -29,6 +29,7 @@ certifi==2024.2.2
 cffi==1.16.0
     # via
     #   -r requirements/test.txt
+    #   cryptography
     #   pynacl
 charset-normalizer==3.3.2
     # via requests
@@ -40,10 +41,13 @@ coverage[toml]==7.4.4
     # via
     #   -r requirements/test.txt
     #   pytest-cov
+cryptography==42.0.5
+    # via secretstorage
 ddt==1.7.2
     # via -r requirements/test.txt
 django==4.2.11
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   django-crum
     #   django-waffle
@@ -79,8 +83,9 @@ idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.1.0
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   keyring
     #   sphinx
     #   twine
@@ -96,6 +101,10 @@ jaraco-context==4.3.0
     # via keyring
 jaraco-functools==4.0.0
     # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
 jinja2==3.1.3
     # via sphinx
 keyring==25.0.0
@@ -187,6 +196,8 @@ rfc3986==2.0.0
     # via twine
 rich==13.7.1
     # via twine
+secretstorage==3.3.3
+    # via keyring
 six==1.16.0
     # via
     #   -r requirements/test.txt
@@ -240,6 +251,8 @@ urllib3==2.2.1
     # via
     #   requests
     #   twine
+wheel==0.43.0
+    # via -r requirements/test.txt
 zipp==3.18.1
     # via
     #   importlib-metadata

requirements/pip-tools.txt

@@ -8,8 +8,10 @@ build==1.2.1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==7.1.0
-    # via build
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   build
 packaging==24.0
     # via build
 pip-tools==7.4.1

requirements/quality.txt

@@ -43,6 +43,7 @@ dill==0.3.8
     # via pylint
 django==4.2.11
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   django-crum
     #   django-waffle
@@ -184,3 +185,5 @@ typing-extensions==4.10.0
     #   asgiref
     #   astroid
     #   pylint
+wheel==0.43.0
+    # via -r requirements/test.txt

requirements/test.txt

@@ -27,6 +27,7 @@ coverage[toml]==7.4.4
 ddt==1.7.2
     # via -r requirements/test.in
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.txt
     #   django-crum
     #   django-waffle
@@ -108,3 +109,5 @@ typing-extensions==4.10.0
     # via
     #   -r requirements/base.txt
     #   asgiref
+wheel==0.43.0
+    # via -r requirements/base.txt