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

…nts-4efad52 Python Requirements Update
openedx · Apr 19, 2024 · 4ec21e5 · 4ec21e5
2 parents 4efad52 + 6225e26
commit 4ec21e5
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 136 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.11", "3.12"]
         django-version: ["pinned"]
     steps:
     - uses: actions/checkout@v2
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

diff --git a/license_manager/apps/subscriptions/models.py b/license_manager/apps/subscriptions/models.py
@@ -914,7 +914,7 @@ def get_renewed_plan_title(self):
             return self.renewed_plan_title
         return '{prior_title} - Renewal {activation_year}'.format(
             prior_title=self.prior_subscription_plan.title,
-            activation_year=self.effective_date.year,
+            activation_year=self.effective_date.year, # pylint-disable: no-member
         )
 
     def __str__(self):

diff --git a/license_manager/apps/subscriptions/rules.py b/license_manager/apps/subscriptions/rules.py
@@ -51,7 +51,7 @@ def has_explicit_access_to_subscriptions_admin(user, enterprise_customer_uuid):
         str(enterprise_customer_uuid),
     )
 
-
+# pylint-disable: unsupported-binary-operation
 has_admin_access = has_implicit_access_to_subscriptions_admin | has_explicit_access_to_subscriptions_admin
 rules.add_perm(
     constants.SUBSCRIPTIONS_ADMIN_ACCESS_PERMISSION,
@@ -97,9 +97,10 @@ 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 \
+                     | has_explicit_access_to_subscriptions_learner # pylint-disable: unsupported-binary-operation
 # 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 | has_learner_access, # pylint-disable: unsupported-binary-operation
 )
diff --git a/pylintrc_tweaks b/pylintrc_tweaks
@@ -18,5 +18,6 @@ disable+ =
     consider-using-f-string,
     missing-module-docstring,
     missing-class-docstring,
+    missing-timeout,
     useless-option-value,
     unknown-option-value,
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -32,13 +32,13 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     #   kombu
 billiard==4.2.0
     # via celery
-boto3==1.34.84
+boto3==1.34.87
     # via django-ses
-botocore==1.34.84
+botocore==1.34.87
     # via
     #   boto3
     #   s3transfer
-celery==5.3.6
+celery==5.4.0
     # via
     #   -r requirements/base.in
     #   django-celery-results
@@ -207,7 +207,7 @@ monotonic==1.6
     # via analytics-python
 mysqlclient==2.2.4
     # via -r requirements/base.in
-newrelic==9.8.0
+newrelic==9.9.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via

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.84
+boto3==1.34.87
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.34.84
+botocore==1.34.87
     # via
     #   -r requirements/validation.txt
     #   boto3
@@ -60,7 +59,7 @@ build==1.2.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-celery==5.3.6
+celery==5.4.0
     # via
     #   -r requirements/validation.txt
     #   django-celery-results
@@ -247,10 +246,8 @@ edx-drf-extensions==10.3.0
     #   edx-rbac
 edx-i18n-tools==1.5.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
@@ -261,19 +258,19 @@ edx-rest-api-client==5.7.0
     # via -r requirements/validation.txt
 edx-toggles==5.2.0
     # via -r requirements/validation.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via
     #   -r requirements/validation.txt
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/validation.txt
-faker==24.9.0
+faker==24.11.0
     # via
     #   -r requirements/validation.txt
     #   factory-boy
 freezegun==1.4.0
     # via -r requirements/validation.txt
-gunicorn==21.2.0
+gunicorn==22.0.0
     # via -r requirements/dev.in
 idna==3.7
     # via
@@ -335,10 +332,6 @@ kombu==5.3.7
     # 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
@@ -359,7 +352,7 @@ more-itertools==10.2.0
     # via inflect
 mysqlclient==2.2.4
     # via -r requirements/validation.txt
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/validation.txt
     #   edx-django-utils
@@ -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.11.2
-    # 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,16 +56,16 @@ billiard==4.2.0
     # via
     #   -r requirements/test.txt
     #   celery
-boto3==1.34.84
+boto3==1.34.87
     # via
     #   -r requirements/test.txt
     #   django-ses
-botocore==1.34.84
+botocore==1.34.87
     # via
     #   -r requirements/test.txt
     #   boto3
     #   s3transfer
-celery==5.3.6
+celery==5.4.0
     # via
     #   -r requirements/test.txt
     #   django-celery-results
@@ -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
@@ -260,13 +257,13 @@ edx-rest-api-client==5.7.0
     # via -r requirements/test.txt
 edx-toggles==5.2.0
     # via -r requirements/test.txt
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via
     #   -r requirements/test.txt
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/test.txt
-faker==24.9.0
+faker==24.11.0
     # via
     #   -r requirements/test.txt
     #   factory-boy
@@ -325,10 +322,6 @@ kombu==5.3.7
     # 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
@@ -343,7 +336,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.4
     # via -r requirements/test.txt
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/test.txt
     #   edx-django-utils
@@ -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.11.2
-    # 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,16 +41,16 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
-boto3==1.34.84
+boto3==1.34.87
     # via
     #   -r requirements/base.txt
     #   django-ses
-botocore==1.34.84
+botocore==1.34.87
     # via
     #   -r requirements/base.txt
     #   boto3
     #   s3transfer
-celery==5.3.6
+celery==5.4.0
     # via
     #   -r requirements/base.txt
     #   django-celery-results
@@ -216,7 +216,7 @@ gevent==24.2.1
     # via -r requirements/production.in
 greenlet==3.0.3
     # via gevent
-gunicorn==21.2.0
+gunicorn==22.0.0
     # via -r requirements/production.in
 idna==3.7
     # via
@@ -266,7 +266,7 @@ monotonic==1.6
     #   analytics-python
 mysqlclient==2.2.4
     # via -r requirements/base.txt
-newrelic==9.8.0
+newrelic==9.9.0
     # via
     #   -r requirements/base.txt
     #   edx-django-utils