feat: apple silicon m1 support

Merge branch 'master' into apple-silicon

.annotation_safe_list.yml

@@ -15,6 +15,12 @@ auth.Permission:
   ".. no_pii:": "This model has no PII"
 contenttypes.ContentType:
   ".. no_pii:": "This model has no PII"
+django_celery_results.ChordCounter:
+  ".. no_pii:": "This model has no PII"
+django_celery_results.GroupResult:
+  ".. no_pii:": "This model has no PII"
+django_celery_results.TaskResult:
+  ".. no_pii:": "This model has no PII"
 sessions.Session:
   ".. no_pii:": "This model has no PII"
 social_django.Association:

license_manager/settings/base.py

@@ -56,6 +56,7 @@
     'license_manager.apps.core',
     'license_manager.apps.api',
     'license_manager.apps.subscriptions.apps.SubscriptionsConfig',
+    'django_celery_results',
 )
 
 INSTALLED_APPS += THIRD_PARTY_APPS

requirements/base.in

@@ -7,6 +7,7 @@ backoff
 celery
 confluent-kafka
 Django
+django-celery-results
 django-cors-headers
 django-durationwidget
 django-extensions

requirements/base.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==2.6.1
+amqp==5.1.0
     # via kombu
 analytics-python==1.4.0
     # via -r requirements/base.in
@@ -16,27 +16,36 @@ backoff==1.10.0
     #   analytics-python
 billiard==3.6.4.0
     # via celery
-boto3==1.21.41
+boto3==1.21.42
     # via django-ses
-botocore==1.24.41
+botocore==1.24.42
     # via
     #   boto3
     #   s3transfer
-celery==4.4.7
+celery==5.2.6
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/base.in
+    #   django-celery-results
     #   edx-celeryutils
 certifi==2021.10.8
     # via requests
 cffi==1.15.0
     # via cryptography
 charset-normalizer==2.0.12
     # via requests
-click==7.1.2
+click==8.1.2
     # via
-    #   -c requirements/constraints.txt
+    #   celery
+    #   click-didyoumean
+    #   click-plugins
+    #   click-repl
     #   code-annotations
+click-didyoumean==0.3.0
+    # via celery
+click-plugins==1.1.1
+    # via celery
+click-repl==0.2.0
+    # via celery
 code-annotations==1.3.0
     # via edx-toggles
 confluent-kafka==1.8.2
@@ -78,6 +87,8 @@ django==3.2.13
     #   edx-rbac
     #   edx-toggles
     #   jsonfield
+django-celery-results==2.3.0
+    # via -r requirements/base.in
 django-cors-headers==3.11.0
     # via -r requirements/base.in
 django-crum==0.7.9
@@ -171,7 +182,7 @@ jmespath==1.0.0
     #   botocore
 jsonfield==3.1.0
     # via edx-celeryutils
-kombu==4.6.11
+kombu==5.2.4
     # via celery
 markupsafe==2.1.1
     # via jinja2
@@ -189,6 +200,8 @@ packaging==21.3
     # via drf-yasg
 pbr==5.8.1
     # via stevedore
+prompt-toolkit==3.0.29
+    # via click-repl
 psutil==5.9.0
     # via edx-django-utils
 pycparser==2.21
@@ -257,6 +270,7 @@ simplejson==3.17.6
 six==1.16.0
     # via
     #   analytics-python
+    #   click-repl
     #   djangorestframework-csv
     #   edx-auth-backends
     #   edx-drf-extensions
@@ -290,9 +304,12 @@ urllib3==1.26.9
     # via
     #   botocore
     #   requests
-vine==1.3.0
+vine==5.0.0
     # via
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.5
+    # via prompt-toolkit
 zipp==3.8.0
     # via -r requirements/base.in

requirements/common_constraints.txt

@@ -1,8 +1,4 @@
-# This is a temporary solution to override the real common_constraints.txt
-# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
-# See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
-
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
@@ -16,7 +12,6 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # using LTS django version
 Django<4.0
 

requirements/constraints.txt

@@ -10,13 +10,6 @@
 
 -c common_constraints.txt
 
-# Celery 5.0 has some breaking changes, as python 3.8 is priority so,
-# we will look at it after python 3.8 deployment
-celery<5.0
-
-# celery requires click<8.0.0 which would be fixed once https://github.com/celery/celery/issues/6753 is done.
-click<8.0
-
 # diff-cover latest requires (pluggy>=0.13.1,<0.14.0)
 # which conflicts with pytest(pluggy>=0.12,<2.0.0) and tox(pluggy>0.12) both of these fetch pluggy==1.0.0
 # but diff-cover latest has a pin (pluggy<1.0.0a1)

requirements/dev.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==2.6.1
+amqp==5.1.0
     # via
     #   -r requirements/validation.txt
     #   kombu
@@ -31,19 +31,19 @@ billiard==3.6.4.0
     # via
     #   -r requirements/validation.txt
     #   celery
-boto3==1.21.41
+boto3==1.21.42
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.24.41
+botocore==1.24.42
     # via
     #   -r requirements/validation.txt
     #   boto3
     #   s3transfer
-celery==4.4.7
+celery==5.2.6
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/validation.txt
+    #   django-celery-results
     #   edx-celeryutils
 certifi==2021.10.8
     # via
@@ -57,19 +57,34 @@ charset-normalizer==2.0.12
     # via
     #   -r requirements/validation.txt
     #   requests
-click==7.1.2
+click==8.1.2
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/pip-tools.txt
     #   -r requirements/validation.txt
+    #   celery
+    #   click-didyoumean
     #   click-log
+    #   click-plugins
+    #   click-repl
     #   code-annotations
     #   edx-lint
     #   pip-tools
+click-didyoumean==0.3.0
+    # via
+    #   -r requirements/validation.txt
+    #   celery
 click-log==0.4.0
     # via
     #   -r requirements/validation.txt
     #   edx-lint
+click-plugins==1.1.1
+    # via
+    #   -r requirements/validation.txt
+    #   celery
+click-repl==0.2.0
+    # via
+    #   -r requirements/validation.txt
+    #   celery
 code-annotations==1.3.0
     # via
     #   -r requirements/validation.txt
@@ -137,6 +152,8 @@ django==3.2.13
     #   edx-rbac
     #   edx-toggles
     #   jsonfield
+django-celery-results==2.3.0
+    # via -r requirements/validation.txt
 django-cors-headers==3.11.0
     # via -r requirements/validation.txt
 django-crum==0.7.9
@@ -284,7 +301,7 @@ jsonfield==3.1.0
     # via
     #   -r requirements/validation.txt
     #   edx-celeryutils
-kombu==4.6.11
+kombu==5.2.4
     # via
     #   -r requirements/validation.txt
     #   celery
@@ -349,6 +366,10 @@ polib==1.1.1
     # via
     #   -r requirements/validation.txt
     #   edx-i18n-tools
+prompt-toolkit==3.0.29
+    # via
+    #   -r requirements/validation.txt
+    #   click-repl
 psutil==5.9.0
     # via
     #   -r requirements/validation.txt
@@ -493,6 +514,7 @@ six==1.16.0
     # via
     #   -r requirements/validation.txt
     #   analytics-python
+    #   click-repl
     #   django-dynamic-fixture
     #   djangorestframework-csv
     #   edx-auth-backends
@@ -561,11 +583,16 @@ urllib3==1.26.9
     #   -r requirements/validation.txt
     #   botocore
     #   requests
-vine==1.3.0
+vine==5.0.0
     # via
     #   -r requirements/validation.txt
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.5
+    # via
+    #   -r requirements/validation.txt
+    #   prompt-toolkit
 wheel==0.37.1
     # via
     #   -r requirements/pip-tools.txt