Merge branch 'master' of github.com:openedx/license-manager into ENT-…

…9201/define-PA-role-&-permissions
openedx · Aug 12, 2024 · 7bb8ac7 · 7bb8ac7
2 parents 91ff0b0 + 6d9b896
commit 7bb8ac7
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 90 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,7 +12,7 @@ asgiref==3.8.1
     # via
     #   django
     #   django-cors-headers
-attrs==24.1.0
+attrs==24.2.0
     # via
     #   jsonschema
     #   referencing
@@ -22,9 +22,9 @@ backoff==1.10.0
     #   analytics-python
 billiard==4.2.0
     # via celery
-boto3==1.34.153
+boto3==1.34.158
     # via django-ses
-botocore==1.34.153
+botocore==1.34.158
     # via
     #   boto3
     #   s3transfer
@@ -35,7 +35,7 @@ celery==5.4.0
     #   edx-celeryutils
 certifi==2024.7.4
     # via requests
-cffi==1.16.0
+cffi==1.17.0
     # via
     #   cryptography
     #   pynacl
@@ -65,7 +65,7 @@ defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==4.2.14
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -187,15 +187,15 @@ jsonschema==4.23.0
     # via drf-spectacular
 jsonschema-specifications==2023.12.1
     # via jsonschema
-kombu==5.3.7
+kombu==5.4.0
     # via celery
 markupsafe==2.1.5
     # via jinja2
 monotonic==1.6
     # via analytics-python
 mysqlclient==2.2.4
     # via -r requirements/base.in
-newrelic==9.12.0
+newrelic==9.13.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via
@@ -235,7 +235,7 @@ pytz==2024.1
     # via
     #   -r requirements/base.in
     #   django-ses
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   code-annotations
     #   drf-spectacular
@@ -255,7 +255,7 @@ requests==2.32.3
     #   social-auth-core
 requests-oauthlib==2.0.0
     # via social-auth-core
-rpds-py==0.19.1
+rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
@@ -307,7 +307,7 @@ vine==5.1.0
     #   kombu
 wcwidth==0.2.13
     # via prompt-toolkit
-zipp==3.19.2
+zipp==3.20.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -28,15 +28,6 @@ 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
-
 # 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

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -20,7 +20,7 @@ astroid==3.2.4
     #   -r requirements/validation.txt
     #   pylint
     #   pylint-celery
-attrs==24.1.0
+attrs==24.2.0
     # via
     #   -r requirements/validation.txt
     #   jsonschema
@@ -33,11 +33,11 @@ billiard==4.2.0
     # via
     #   -r requirements/validation.txt
     #   celery
-boto3==1.34.153
+boto3==1.34.158
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.34.153
+botocore==1.34.158
     # via
     #   -r requirements/validation.txt
     #   boto3
@@ -55,7 +55,7 @@ certifi==2024.7.4
     # via
     #   -r requirements/validation.txt
     #   requests
-cffi==1.16.0
+cffi==1.17.0
     # via
     #   -r requirements/validation.txt
     #   cryptography
@@ -124,7 +124,7 @@ dill==0.3.8
     # via
     #   -r requirements/validation.txt
     #   pylint
-django==4.2.14
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/validation.txt
@@ -251,13 +251,13 @@ edx-toggles==5.2.0
     # via -r requirements/validation.txt
 factory-boy==3.3.0
     # via -r requirements/validation.txt
-faker==26.1.0
+faker==26.3.0
     # via
     #   -r requirements/validation.txt
     #   factory-boy
 freezegun==1.5.1
     # via -r requirements/validation.txt
-gunicorn==22.0.0
+gunicorn==23.0.0
     # via -r requirements/dev.in
 idna==3.7
     # via
@@ -304,11 +304,11 @@ jsonschema-specifications==2023.12.1
     # via
     #   -r requirements/validation.txt
     #   jsonschema
-kombu==5.3.7
+kombu==5.4.0
     # via
     #   -r requirements/validation.txt
     #   celery
-lxml==5.2.2
+lxml==5.3.0
     # via
     #   -r requirements/validation.txt
     #   edx-i18n-tools
@@ -324,11 +324,11 @@ monotonic==1.6
     # via
     #   -r requirements/validation.txt
     #   analytics-python
-more-itertools==10.3.0
+more-itertools==10.4.0
     # via inflect
 mysqlclient==2.2.4
     # via -r requirements/validation.txt
-newrelic==9.12.0
+newrelic==9.13.0
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
@@ -464,7 +464,7 @@ pytz==2024.1
     #   django-ses
 pywatchman==2.0.0
     # via -r requirements/dev.in
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   -r requirements/validation.txt
     #   code-annotations
@@ -490,7 +490,7 @@ requests-oauthlib==2.0.0
     # via
     #   -r requirements/validation.txt
     #   social-auth-core
-rpds-py==0.19.1
+rpds-py==0.20.0
     # via
     #   -r requirements/validation.txt
     #   jsonschema
@@ -586,7 +586,7 @@ wheel==0.44.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-zipp==3.19.2
+zipp==3.20.0
     # via -r requirements/validation.txt
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -24,12 +24,12 @@ astroid==3.2.4
     #   -r requirements/test.txt
     #   pylint
     #   pylint-celery
-attrs==24.1.0
+attrs==24.2.0
     # via
     #   -r requirements/test.txt
     #   jsonschema
     #   referencing
-babel==2.15.0
+babel==2.16.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
@@ -43,11 +43,11 @@ billiard==4.2.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.34.153
+boto3==1.34.158
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.34.153
+botocore==1.34.158
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -61,7 +61,7 @@ certifi==2024.7.4
     # via
     #   -r requirements/test.txt
     #   requests
-cffi==1.16.0
+cffi==1.17.0
     # via
     #   -r requirements/test.txt
     #   cryptography
@@ -122,7 +122,7 @@ dill==0.3.8
     # via
     #   -r requirements/test.txt
     #   pylint
-django==4.2.14
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
@@ -250,7 +250,7 @@ edx-toggles==5.2.0
     # via -r requirements/test.txt
 factory-boy==3.3.0
     # via -r requirements/test.txt
-faker==26.1.0
+faker==26.3.0
     # via
     #   -r requirements/test.txt
     #   factory-boy
@@ -296,7 +296,7 @@ jsonschema-specifications==2023.12.1
     # via
     #   -r requirements/test.txt
     #   jsonschema
-kombu==5.3.7
+kombu==5.4.0
     # via
     #   -r requirements/test.txt
     #   celery
@@ -314,7 +314,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.4
     # via -r requirements/test.txt
-newrelic==9.12.0
+newrelic==9.13.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -433,7 +433,7 @@ pytz==2024.1
     # via
     #   -r requirements/test.txt
     #   django-ses
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   -r requirements/test.txt
     #   code-annotations
@@ -463,7 +463,7 @@ requests-oauthlib==2.0.0
     #   social-auth-core
 restructuredtext-lint==1.4.0
     # via doc8
-rpds-py==0.19.1
+rpds-py==0.20.0
     # via
     #   -r requirements/test.txt
     #   jsonschema
@@ -571,7 +571,7 @@ wcwidth==0.2.13
     # via
     #   -r requirements/test.txt
     #   prompt-toolkit
-zipp==3.19.2
+zipp==3.20.0
     # via -r requirements/test.txt
 
 # The following packages are considered to be unsafe in a requirements file: