Merge pull request #2067 from openedx/jenkins/upgrade-python-requirem…

…ents-aa09eea

Python Requirements Update

enterprise/management/commands/monthly_impact_report.py

@@ -926,8 +926,7 @@ def get_query_results_from_snowflake(self):
         try:
             cs.execute(QUERY)
             rows = cs.fetchall()
-            for row in rows:
-                yield row
+            yield from rows
         finally:
             cs.close()
         ctx.close()

enterprise/management/commands/nudge_dormant_enrolled_enterprise_learners.py

@@ -145,8 +145,7 @@ def get_query_results_from_snowflake(self):
         try:
             cs.execute(QUERY)
             rows = cs.fetchall()
-            for row in rows:
-                yield row
+            yield from rows
         finally:
             cs.close()
         ctx.close()

integrated_channels/integrated_channel/models.py

@@ -269,7 +269,7 @@ def fetch_orphaned_content_audits(self):
             enterprise_customer=self.enterprise_customer,
             remote_deleted_at__isnull=True,
             remote_created_at__isnull=False,
-        ).filter(~non_existent_catalogs_filter | null_catalogs_filter)
+        ).filter(~non_existent_catalogs_filter | null_catalogs_filter)  # pylint: disable=unsupported-binary-operation
 
     def update_content_synced_at(self, action_happened_at, was_successful):
         """

requirements/celery53.txt

@@ -2,8 +2,8 @@ amqp==5.2.0
 billiard==4.2.0
 celery==5.3.6
 click==8.1.7
-click-didyoumean==0.3.0
+click-didyoumean==0.3.1
 click-repl==0.3.0
-kombu==5.3.5
+kombu==5.3.6
 prompt-toolkit==3.0.43
 vine==5.1.0

requirements/ci.txt

@@ -6,13 +6,13 @@
 #
 distlib==0.3.8
     # via virtualenv
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.0
     # via tox
-platformdirs==4.1.0
+platformdirs==4.2.0
     # via virtualenv
 pluggy==1.4.0
     # via tox
@@ -26,5 +26,5 @@ tox==3.28.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/ci.in
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via tox

requirements/common_constraints.txt

@@ -14,10 +14,19 @@
 
 
 # using LTS django version
-Django<4.0
+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
+
+# 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