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

…nts-3ed13e8 Python Requirements Update
openedx · Apr 4, 2024 · 71a23db · 71a23db
2 parents 3ed13e8 + 0839bae
commit 71a23db
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 115 deletions.
diff --git a/license_manager/apps/subscriptions/rules.py b/license_manager/apps/subscriptions/rules.py
@@ -52,7 +52,7 @@ def has_explicit_access_to_subscriptions_admin(user, enterprise_customer_uuid):
     )
 
 
-has_admin_access = has_implicit_access_to_subscriptions_admin | has_explicit_access_to_subscriptions_admin
+has_admin_access = has_implicit_access_to_subscriptions_admin or has_explicit_access_to_subscriptions_admin
 rules.add_perm(
     constants.SUBSCRIPTIONS_ADMIN_ACCESS_PERMISSION,
     has_admin_access,
@@ -97,9 +97,9 @@ def has_explicit_access_to_subscriptions_learner(user, enterprise_customer_uuid)
     )
 
 
-has_learner_access = has_implicit_access_to_subscriptions_learner | has_explicit_access_to_subscriptions_learner
+has_learner_access = has_implicit_access_to_subscriptions_learner or has_explicit_access_to_subscriptions_learner
 # Grants access permission if the user is a learner or admin
 rules.add_perm(
     constants.SUBSCRIPTIONS_ADMIN_LEARNER_ACCESS_PERMISSION,
-    has_admin_access | has_learner_access,
+    has_admin_access or has_learner_access,
 )
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -32,9 +32,9 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     #   kombu
 billiard==4.2.0
     # via celery
-boto3==1.34.76
+boto3==1.34.77
     # via django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   boto3
     #   s3transfer
@@ -177,7 +177,7 @@ edx-rbac==1.8.0
     # via -r requirements/base.in
 edx-rest-api-client==5.6.1
     # via -r requirements/base.in
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/base.in
 idna==3.6
     # via requests

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -16,9 +16,8 @@ asgiref==3.8.1
     #   django
     #   django-cors-headers
     #   django-simple-history
-astroid==2.11.7
+astroid==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/validation.txt
     #   pylint
     #   pylint-celery
@@ -47,11 +46,11 @@ billiard==4.2.0
     # via
     #   -r requirements/validation.txt
     #   celery
-boto3==1.34.76
+boto3==1.34.77
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   -r requirements/validation.txt
     #   boto3
@@ -247,10 +246,8 @@ edx-drf-extensions==10.3.0
     #   edx-rbac
 edx-i18n-tools==1.3.0
     # via -r requirements/validation.txt
-edx-lint==5.2.5
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/validation.txt
+edx-lint==5.3.6
+    # via -r requirements/validation.txt
 edx-opaque-keys==2.5.1
     # via
     #   -r requirements/validation.txt
@@ -259,7 +256,7 @@ edx-rbac==1.8.0
     # via -r requirements/validation.txt
 edx-rest-api-client==5.6.1
     # via -r requirements/validation.txt
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/validation.txt
 exceptiongroup==1.2.0
     # via
@@ -335,10 +332,6 @@ kombu==5.3.6
     # via
     #   -r requirements/validation.txt
     #   celery
-lazy-object-proxy==1.10.0
-    # via
-    #   -r requirements/validation.txt
-    #   astroid
 lxml==5.2.1
     # via
     #   -r requirements/validation.txt
@@ -434,9 +427,8 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pylint==2.14.5
+pylint==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/validation.txt
     #   edx-lint
     #   pylint-celery
@@ -639,11 +631,6 @@ wheel==0.43.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-wrapt==1.14.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/validation.txt
-    #   astroid
 zipp==3.18.1
     # via
     #   -r requirements/pip-tools.txt

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -20,9 +20,8 @@ asgiref==3.8.1
     #   django
     #   django-cors-headers
     #   django-simple-history
-astroid==2.11.7
+astroid==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   pylint
     #   pylint-celery
@@ -57,11 +56,11 @@ billiard==4.2.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.34.76
+boto3==1.34.77
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -246,10 +245,8 @@ edx-drf-extensions==10.3.0
     # via
     #   -r requirements/test.txt
     #   edx-rbac
-edx-lint==5.2.5
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.txt
+edx-lint==5.3.6
+    # via -r requirements/test.txt
 edx-opaque-keys==2.5.1
     # via
     #   -r requirements/test.txt
@@ -258,7 +255,7 @@ edx-rbac==1.8.0
     # via -r requirements/test.txt
 edx-rest-api-client==5.6.1
     # via -r requirements/test.txt
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/test.txt
 exceptiongroup==1.2.0
     # via
@@ -325,10 +322,6 @@ kombu==5.3.6
     # via
     #   -r requirements/test.txt
     #   celery
-lazy-object-proxy==1.10.0
-    # via
-    #   -r requirements/test.txt
-    #   astroid
 markupsafe==2.1.5
     # via
     #   -r requirements/test.txt
@@ -409,9 +402,8 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pylint==2.14.5
+pylint==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   edx-lint
     #   pylint-celery
@@ -620,16 +612,8 @@ wcwidth==0.2.13
     # via
     #   -r requirements/test.txt
     #   prompt-toolkit
-wrapt==1.14.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.txt
-    #   astroid
 zipp==3.18.1
     # via
     #   -r requirements/test.txt
     #   importlib-metadata
     #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements/production.txt b/requirements/production.txt
@@ -41,11 +41,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.76
+boto3==1.34.77
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -210,7 +210,7 @@ edx-rbac==1.8.0
     # via -r requirements/base.txt
 edx-rest-api-client==5.6.1
     # via -r requirements/base.txt
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/base.txt
 gevent==24.2.1
     # via -r requirements/production.in

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -16,9 +16,8 @@ asgiref==3.8.1
     #   django
     #   django-cors-headers
     #   django-simple-history
-astroid==2.11.7
+astroid==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   pylint
     #   pylint-celery
 async-timeout==4.0.3
@@ -46,11 +45,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.76
+boto3==1.34.77
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -214,10 +213,8 @@ edx-drf-extensions==10.3.0
     # via
     #   -r requirements/base.txt
     #   edx-rbac
-edx-lint==5.2.5
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/quality.in
+edx-lint==5.3.6
+    # via -r requirements/quality.in
 edx-opaque-keys==2.5.1
     # via
     #   -r requirements/base.txt
@@ -226,7 +223,7 @@ edx-rbac==1.8.0
     # via -r requirements/base.txt
 edx-rest-api-client==5.6.1
     # via -r requirements/base.txt
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/base.txt
 idna==3.6
     # via
@@ -270,8 +267,6 @@ kombu==5.3.6
     # via
     #   -r requirements/base.txt
     #   celery
-lazy-object-proxy==1.10.0
-    # via astroid
 markupsafe==2.1.5
     # via
     #   -r requirements/base.txt
@@ -331,9 +326,8 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pylint==2.14.5
+pylint==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   edx-lint
     #   pylint-celery
     #   pylint-django
@@ -488,14 +482,7 @@ wcwidth==0.2.13
     # via
     #   -r requirements/base.txt
     #   prompt-toolkit
-wrapt==1.14.1
-    # via
-    #   -c requirements/constraints.txt
-    #   astroid
 zipp==3.18.1
     # via
     #   -r requirements/base.txt
     #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -16,9 +16,8 @@ asgiref==3.8.1
     #   django
     #   django-cors-headers
     #   django-simple-history
-astroid==2.11.7
+astroid==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   pylint
     #   pylint-celery
 async-timeout==4.0.3
@@ -46,11 +45,11 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.76
+boto3==1.34.77
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.76
+botocore==1.34.77
     # via
     #   -r requirements/base.txt
     #   boto3
@@ -223,10 +222,8 @@ edx-drf-extensions==10.3.0
     # via
     #   -r requirements/base.txt
     #   edx-rbac
-edx-lint==5.2.5
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.in
+edx-lint==5.3.6
+    # via -r requirements/test.in
 edx-opaque-keys==2.5.1
     # via
     #   -r requirements/base.txt
@@ -235,7 +232,7 @@ edx-rbac==1.8.0
     # via -r requirements/base.txt
 edx-rest-api-client==5.6.1
     # via -r requirements/base.txt
-edx-toggles==5.1.1
+edx-toggles==5.2.0
     # via -r requirements/base.txt
 exceptiongroup==1.2.0
     # via pytest
@@ -287,8 +284,6 @@ kombu==5.3.6
     # via
     #   -r requirements/base.txt
     #   celery
-lazy-object-proxy==1.10.0
-    # via astroid
 markupsafe==2.1.5
     # via
     #   -r requirements/base.txt
@@ -348,9 +343,8 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pylint==2.14.5
+pylint==3.1.0
     # via
-    #   -c requirements/constraints.txt
     #   edx-lint
     #   pylint-celery
     #   pylint-django
@@ -517,14 +511,7 @@ wcwidth==0.2.13
     # via
     #   -r requirements/base.txt
     #   prompt-toolkit
-wrapt==1.14.1
-    # via
-    #   -c requirements/constraints.txt
-    #   astroid
 zipp==3.18.1
     # via
     #   -r requirements/base.txt
     #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools