chore: address PR review

eduNEXT · Feb 5, 2024 · 19e855b · 19e855b
1 parent d2c04aa
commit 19e855b
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 266 deletions.
diff --git a/openassessment/xblock/ui_mixins/legacy/handlers_mixin.py b/openassessment/xblock/ui_mixins/legacy/handlers_mixin.py
@@ -2,8 +2,8 @@
 
 import logging
 
-from platform_plugin_turnitin.events.data import ORASubmissionData
-from platform_plugin_turnitin.events.signals import ORA_SUBMISSION_CREATED
+from openedx_events.learning.data import ORASubmissionData
+from openedx_events.learning.signals import ORA_SUBMISSION_CREATED
 from xblock.core import XBlock
 from submissions import api as submissions_api
 from openassessment.assessment.errors.peer import (

diff --git a/requirements/base.in b/requirements/base.in
@@ -9,6 +9,7 @@ edx-toggles
 djangorestframework
 Xblock
 edx-opaque-keys
+openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event
 
 django
 django-simple-history
@@ -28,4 +29,3 @@ path.py
 python-dateutil
 pytz
 voluptuous
--e platform-plugin-turnitin @ git+https://github.com/eduNEXT/platform-plugin-turnitin.git@bav/receive-ora-submission-event
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,58 +4,32 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
-    # via kombu
 appdirs==1.4.4
     # via fs
 asgiref==3.7.2
     # via django
 attrs==23.2.0
-    # via
-    #   openedx-events
-    #   platform-plugin-turnitin
-backports-zoneinfo[tzdata]==0.2.1
-    # via
-    #   celery
-    #   kombu
-billiard==4.2.0
-    # via celery
+    # via openedx-events
 bleach==6.1.0
     # via -r requirements/base.in
-boto3==1.34.33
+boto3==1.34.34
     # via -r requirements/base.in
-botocore==1.34.33
+botocore==1.34.34
     # via
     #   boto3
     #   s3transfer
-celery==5.3.6
-    # via platform-plugin-turnitin
 certifi==2024.2.2
     # via requests
 cffi==1.16.0
-    # via
-    #   cryptography
-    #   pynacl
+    # via pynacl
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via
-    #   celery
-    #   click-didyoumean
-    #   click-plugins
-    #   click-repl
     #   code-annotations
     #   edx-django-utils
-click-didyoumean==0.3.0
-    # via celery
-click-plugins==1.1.1
-    # via celery
-click-repl==0.3.0
-    # via celery
 code-annotations==1.6.0
     # via edx-toggles
-cryptography==42.0.2
-    # via pyjwt
 defusedxml==0.7.1
     # via -r requirements/base.in
 django==3.2.23
@@ -66,15 +40,12 @@ django==3.2.23
     #   django-model-utils
     #   django-waffle
     #   djangorestframework
-    #   drf-jwt
     #   edx-django-utils
-    #   edx-drf-extensions
     #   edx-i18n-tools
     #   edx-submissions
     #   edx-toggles
     #   jsonfield
     #   openedx-events
-    #   platform-plugin-turnitin
 django-crum==0.7.9
     # via
     #   edx-django-utils
@@ -90,35 +61,23 @@ django-simple-history==3.1.1
 django-waffle==4.1.0
     # via
     #   edx-django-utils
-    #   edx-drf-extensions
     #   edx-toggles
 djangorestframework==3.14.0
     # via
     #   -r requirements/base.in
-    #   drf-jwt
-    #   edx-drf-extensions
     #   edx-submissions
-    #   platform-plugin-turnitin
-drf-jwt==1.19.2
-    # via edx-drf-extensions
 edx-django-utils==5.10.1
     # via
     #   -r requirements/base.in
-    #   edx-drf-extensions
     #   edx-toggles
-edx-drf-extensions==10.1.0
-    # via platform-plugin-turnitin
 edx-i18n-tools==1.3.0
     # via -r requirements/base.in
 edx-opaque-keys[django]==2.5.1
     # via
     #   -r requirements/base.in
-    #   edx-drf-extensions
     #   openedx-events
 edx-submissions==3.6.0
-    # via
-    #   -r requirements/base.in
-    #   platform-plugin-turnitin
+    # via -r requirements/base.in
 edx-toggles==5.1.1
     # via -r requirements/base.in
 fastavro==1.9.3
@@ -143,8 +102,6 @@ jsonfield==3.1.0
     # via
     #   -r requirements/base.in
     #   edx-submissions
-kombu==5.3.5
-    # via celery
 lazy==1.6
     # via -r requirements/base.in
 loremipsum==1.0.5
@@ -158,15 +115,15 @@ lxml==5.1.0
     #   xblock
 mako==1.3.2
     # via xblock
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via
     #   jinja2
     #   mako
     #   xblock
 newrelic==9.6.0
     # via edx-django-utils
-openedx-events==9.4.0
-    # via platform-plugin-turnitin
+openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event
+    # via -r requirements/base.in
 path==13.1.0
     # via
     #   -c requirements/constraints.txt
@@ -176,21 +133,12 @@ path-py==12.5.0
     # via -r requirements/base.in
 pbr==6.0.0
     # via stevedore
-platform-plugin-turnitin @ git+https://github.com/eduNEXT/platform-plugin-turnitin.git@bav/receive-ora-submission-event
-    # via -r requirements/base.in
 polib==1.2.0
     # via edx-i18n-tools
-prompt-toolkit==3.0.43
-    # via click-repl
 psutil==5.9.8
     # via edx-django-utils
 pycparser==2.21
     # via cffi
-pyjwt[crypto]==2.8.0
-    # via
-    #   drf-jwt
-    #   edx-drf-extensions
-    #   pyjwt
 pymongo==3.13.0
     # via edx-opaque-keys
 pynacl==1.5.0
@@ -199,7 +147,6 @@ python-dateutil==2.8.2
     # via
     #   -r requirements/base.in
     #   botocore
-    #   celery
     #   xblock
 python-slugify==8.0.3
     # via code-annotations
@@ -221,14 +168,9 @@ pyyaml==6.0.1
     #   edx-i18n-tools
     #   xblock
 requests==2.31.0
-    # via
-    #   edx-drf-extensions
-    #   platform-plugin-turnitin
-    #   python-swiftclient
+    # via python-swiftclient
 s3transfer==0.10.0
     # via boto3
-semantic-version==2.10.0
-    # via edx-drf-extensions
 simplejson==3.19.2
     # via xblock
 six==1.16.0
@@ -251,26 +193,14 @@ typing-extensions==4.9.0
     # via
     #   asgiref
     #   edx-opaque-keys
-    #   kombu
-tzdata==2023.4
-    # via
-    #   backports-zoneinfo
-    #   celery
 urllib3==1.26.18
     # via
     #   botocore
     #   requests
-vine==5.1.0
-    # via
-    #   amqp
-    #   celery
-    #   kombu
-voluptuous==0.14.1
+voluptuous==0.14.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-wcwidth==0.2.13
-    # via prompt-toolkit
 web-fragments==2.1.0
     # via xblock
 webencodings==0.5.1

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -34,7 +34,7 @@ jinja2==3.1.3
     # via sphinx
 livereload==2.6.3
     # via sphinx-autobuild
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via jinja2
 packaging==23.2
     # via

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -8,7 +8,7 @@ wheel==0.42.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.3.2
+pip==24.0
     # via -r requirements/pip.in
 setuptools==59.8.0
     # via