Merge pull request #464 from openedx/ammar/pin-urllib3

chore: pin urllib3 version due to conflict with botocore

CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[8.1.0] - 2024-07-22
+---------------------
+  * Upgrade python requirements
+
 [8.0.0] - 2024-07-18
 ---------------------
   * Fix migration for EnterpriseLearnerEnrollment model

enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "8.0.0"
+__version__ = "8.1.0"

requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -10,29 +10,22 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.33.18
+awscli==1.33.27
     # via -r requirements/reporting.in
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -c requirements/constraints.txt
-    #   celery
-    #   django
-    #   djangorestframework
-    #   kombu
 bcrypt==4.1.3
     # via paramiko
 billiard==4.2.0
     # via celery
-boto3==1.34.136
+boto3==1.34.145
     # via -r requirements/reporting.in
-botocore==1.34.136
+botocore==1.34.145
     # via
     #   awscli
     #   boto3
     #   s3transfer
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   py2neo
     #   requests
@@ -70,7 +63,7 @@ cryptography==42.0.8
     #   pyjwt
     #   pyopenssl
     #   snowflake-connector-python
-django==4.2.13
+django==4.2.14
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -150,7 +143,7 @@ kombu==5.3.7
     # via celery
 monotonic==1.6
     # via py2neo
-newrelic==9.11.0
+newrelic==9.12.0
     # via edx-django-utils
 packaging==24.1
     # via
@@ -194,7 +187,7 @@ pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==24.1.0
+pyopenssl==24.2.1
     # via snowflake-connector-python
 python-dateutil==2.9.0.post0
     # via
@@ -239,33 +232,29 @@ snowflake-connector-python==3.11.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via django
 stevedore==5.2.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-tomlkit==0.12.5
+tomlkit==0.13.0
     # via snowflake-connector-python
 typing-extensions==4.12.2
     # via
-    #   asgiref
     #   edx-opaque-keys
-    #   kombu
     #   snowflake-connector-python
 tzdata==2024.1
-    # via
-    #   backports-zoneinfo
-    #   celery
+    # via celery
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
 urllib3==1.26.19
     # via
+    #   -c requirements/constraints.txt
     #   botocore
     #   py2neo
     #   requests
-    #   snowflake-connector-python
-vertica-python==1.3.8
+vertica-python==1.4.0
     # via -r requirements/reporting.in
 vine==5.1.0
     # via

requirements/ci.txt

@@ -1,16 +1,16 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
 #
-cachetools==5.3.3
+cachetools==5.4.0
     # via tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.5.4
+coverage==7.6.0
     # via -r requirements/ci.in
 distlib==0.3.8
     # via virtualenv
@@ -30,11 +30,7 @@ pluggy==1.5.0
     # via tox
 pyproject-api==1.7.1
     # via tox
-tomli==2.0.1
-    # via
-    #   pyproject-api
-    #   tox
-tox==4.15.1
+tox==4.16.0
     # via -r requirements/ci.in
 virtualenv==20.26.3
     # via tox

requirements/common_constraints.txt

@@ -18,6 +18,7 @@ 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
+# See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
@@ -31,3 +32,10 @@ django-simple-history==3.0.0
 # So we need to pin it globally, for now.
 # Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
 importlib-metadata<7
+
+# Cause: https://github.com/openedx/event-tracking/pull/290
+# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
+# We will pin event-tracking to do not break existing installations
+# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
+# has been resolved and edx-platform is running with pymongo>=4.4.0
+event-tracking<2.4.1

requirements/constraints.txt

@@ -15,3 +15,6 @@
 
 # Needed for Django 4.2 + Python 3.12 compatibility
 backports.zoneinfo; python_version<"3.9"
+
+# botocore 1.34.145 depends on urllib3<1.27 and >=1.25.4; python_version < "3.10"
+urllib3<2.0.0

requirements/dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -10,39 +10,32 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-astroid==3.2.2
+astroid==3.2.4
     # via
     #   pylint
     #   pylint-celery
-awscli==1.33.18
+awscli==1.33.27
     # via -r requirements/reporting.in
 backports-tarfile==1.2.0
     # via jaraco-context
-backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
-    # via
-    #   -c requirements/constraints.txt
-    #   celery
-    #   django
-    #   djangorestframework
-    #   kombu
 bcrypt==4.1.3
     # via paramiko
 billiard==4.2.0
     # via celery
-boto3==1.34.136
+boto3==1.34.145
     # via -r requirements/reporting.in
-botocore==1.34.136
+botocore==1.34.145
     # via
     #   awscli
     #   boto3
     #   s3transfer
 build==1.2.1
     # via pip-tools
-cachetools==5.3.3
+cachetools==5.4.0
     # via tox
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   py2neo
     #   requests
@@ -95,13 +88,13 @@ cryptography==42.0.8
     #   pyopenssl
     #   secretstorage
     #   snowflake-connector-python
-diff-cover==9.1.0
+diff-cover==9.1.1
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.8
     # via pylint
 distlib==0.3.8
     # via virtualenv
-django==4.2.13
+django==4.2.14
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -158,7 +151,7 @@ edx-drf-extensions==10.3.0
     #   edx-rbac
 edx-i18n-tools==1.6.0
     # via -r requirements/dev-enterprise_data.in
-edx-lint==5.3.6
+edx-lint==5.3.7
     # via
     #   -r requirements/dev-enterprise_data.in
     #   -r requirements/quality.in
@@ -186,11 +179,8 @@ idna==3.7
 importlib-metadata==6.11.0
     # via
     #   -c requirements/common_constraints.txt
-    #   build
     #   keyring
     #   twine
-importlib-resources==6.4.0
-    # via keyring
 interchange==2021.0.4
     # via py2neo
 isort==5.13.2
@@ -239,9 +229,9 @@ more-itertools==10.3.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-newrelic==9.11.0
+newrelic==9.12.0
     # via edx-django-utils
-nh3==0.2.17
+nh3==0.2.18
     # via readme-renderer
 packaging==24.1
     # via
@@ -304,7 +294,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==3.2.5
+pylint==3.2.6
     # via
     #   edx-lint
     #   pylint-celery
@@ -326,7 +316,7 @@ pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==24.1.0
+pyopenssl==24.2.1
     # via snowflake-connector-python
 pyproject-api==1.7.1
     # via tox
@@ -397,7 +387,7 @@ snowflake-connector-python==3.11.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.0
+sqlparse==0.5.1
     # via django
 stevedore==5.2.0
     # via
@@ -408,44 +398,30 @@ testfixtures==8.3.0
     # via -r requirements/quality.in
 text-unidecode==1.3
     # via python-slugify
-tomli==2.0.1
-    # via
-    #   build
-    #   pip-tools
-    #   pylint
-    #   pyproject-api
-    #   tox
-tomlkit==0.12.5
+tomlkit==0.13.0
     # via
     #   pylint
     #   snowflake-connector-python
-tox==4.15.1
+tox==4.16.0
     # via -r requirements/dev-enterprise_data.in
 twine==5.1.1
     # via -r requirements/dev-enterprise_data.in
 typing-extensions==4.12.2
     # via
-    #   asgiref
-    #   astroid
     #   edx-opaque-keys
-    #   kombu
-    #   pylint
-    #   rich
     #   snowflake-connector-python
 tzdata==2024.1
-    # via
-    #   backports-zoneinfo
-    #   celery
+    # via celery
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
 urllib3==1.26.19
     # via
+    #   -c requirements/constraints.txt
     #   botocore
     #   py2neo
     #   requests
-    #   snowflake-connector-python
     #   twine
-vertica-python==1.3.8
+vertica-python==1.4.0
     # via -r requirements/reporting.in
 vine==5.1.0
     # via
@@ -461,9 +437,7 @@ wheel==0.43.0
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
 zipp==3.19.2
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/django.txt

@@ -1 +1 @@
-django==4.2.13
+django==4.2.14

requirements/pip.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    make upgrade
@@ -8,7 +8,7 @@ wheel==0.43.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.1.1
+pip==24.1.2
     # via -r requirements/pip.in
-setuptools==70.1.1
+setuptools==71.1.0
     # via -r requirements/pip.in