From 584a52eeb300a15aaf337676a2b98cd53a4628a8 Mon Sep 17 00:00:00 2001 From: muhammad-ammar Date: Tue, 25 Jul 2023 13:03:08 +0500 Subject: [PATCH] chore: remove optional dependencies --- .../grades/tests/test_course_grade_factory.py | 2 +- requirements/edx/base.txt | 25 +--------------- requirements/edx/bundled.in | 2 -- requirements/edx/development.txt | 29 +------------------ requirements/edx/doc.txt | 25 +--------------- requirements/edx/testing.txt | 25 +--------------- 6 files changed, 5 insertions(+), 103 deletions(-) diff --git a/lms/djangoapps/grades/tests/test_course_grade_factory.py b/lms/djangoapps/grades/tests/test_course_grade_factory.py index fc3966b8d6..a7834c2c42 100644 --- a/lms/djangoapps/grades/tests/test_course_grade_factory.py +++ b/lms/djangoapps/grades/tests/test_course_grade_factory.py @@ -71,7 +71,7 @@ class TestCourseGradeFactory(GradeTestBase): with self.assertNumQueries(4), mock_get_score(1, 2): _assert_read(expected_pass=False, expected_percent=0) # start off with grade of 0 - num_queries = 43 + num_queries = 42 with self.assertNumQueries(num_queries), mock_get_score(1, 2): grade_factory.update(self.request.user, self.course, force_update_subsections=True) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 7b2743f0c9..2b8199a38d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -236,7 +236,6 @@ django==3.2.20 # event-tracking # help-tokens # jsonfield - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore # openedx-django-pyfs @@ -244,7 +243,6 @@ django==3.2.20 # openedx-events # openedx-filters # ora2 - # outcome-surveys # skill-tagging # super-csv # xss-utils @@ -285,7 +283,6 @@ django-filter==23.2 # via # -r requirements/edx/kernel.in # edx-enterprise - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore django-ipware==4.0.2 @@ -314,9 +311,7 @@ django-model-utils==4.3.1 # edx-submissions # edx-when # edxval - # learner-pathway-progress # ora2 - # outcome-surveys # skill-tagging # super-csv django-mptt==0.14.0 @@ -351,7 +346,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.3.0 # via -r requirements/edx/kernel.in @@ -398,7 +392,6 @@ djangorestframework==3.14.0 # edx-organizations # edx-proctoring # edx-submissions - # learner-pathway-progress # openedx-blockstore # ora2 # super-csv @@ -469,10 +462,8 @@ edx-django-utils==5.6.0 # edx-toggles # edx-when # event-tracking - # learner-pathway-progress # openedx-blockstore # ora2 - # outcome-surveys # super-csv edx-drf-extensions==8.8.0 # via @@ -485,12 +476,10 @@ edx-drf-extensions==8.8.0 # edx-rbac # edx-when # edxval - # learner-pathway-progress edx-enterprise==4.0.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in - # learner-pathway-progress edx-event-bus-kafka==5.1.0 # via -r requirements/edx/kernel.in edx-event-bus-redis==0.3.1 @@ -515,11 +504,9 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 - # outcome-surveys edx-organizations==6.12.0 # via -r requirements/edx/kernel.in edx-proctoring==4.16.0 @@ -554,7 +541,6 @@ edx-toggles==5.0.0 # edx-name-affirmation # edx-search # edxval - # learner-pathway-progress # ora2 edx-token-utils==0.2.1 # via -r requirements/edx/kernel.in @@ -655,10 +641,8 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 - # outcome-surveys jsonschema==4.18.4 # via optimizely-sdk jsonschema-specifications==2023.7.1 @@ -676,8 +660,6 @@ lazy==1.5 # lti-consumer-xblock # ora2 # xblock -learner-pathway-progress==1.3.4 - # via -r requirements/edx/bundled.in libsass==0.10.0 # via -r requirements/edx/paver.txt loremipsum==1.0.5 @@ -794,8 +776,6 @@ ora2==5.2.1 # via -r requirements/edx/bundled.in oscrypto==1.3.0 # via snowflake-connector-python -outcome-surveys==2.4.0 - # via -r requirements/edx/bundled.in packaging==23.1 # via # drf-yasg @@ -957,7 +937,6 @@ pytz==2022.7.1 # fs # icalendar # interchange - # learner-pathway-progress # olxcleaner # openedx-blockstore # ora2 @@ -998,10 +977,8 @@ requests==2.31.0 # edx-enterprise # edx-rest-api-client # geoip2 - # learner-pathway-progress # mailsnake # optimizely-sdk - # outcome-surveys # pyjwkest # pylti1p3 # python-swiftclient @@ -1220,7 +1197,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/bundled.in xblock-poll==1.13.0 # via -r requirements/edx/bundled.in -xblock-utils==3.2.0 +xblock-utils==3.3.0 # via # -r requirements/edx/kernel.in # done-xblock diff --git a/requirements/edx/bundled.in b/requirements/edx/bundled.in index 11e4fe65ef..f018ff803d 100644 --- a/requirements/edx/bundled.in +++ b/requirements/edx/bundled.in @@ -32,8 +32,6 @@ newrelic # New Relic agent for performance monitoring optimizely-sdk # Optimizely provides A/B testing and other features, used by edx.org ## Plugins used on edx.org -learner-pathway-progress # A plugin for lms to track learners progress in pathays -outcome-surveys # plugin "to send follow up events for learners who have passed a course" skill-tagging # Library to support tagging of skills on edx.org in unit/video xblocks via forms ## XBLOCKS diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 15240855ed..ba0237aea9 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -396,7 +396,6 @@ django==3.2.20 # event-tracking # help-tokens # jsonfield - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore # openedx-django-pyfs @@ -404,7 +403,6 @@ django==3.2.20 # openedx-events # openedx-filters # ora2 - # outcome-surveys # skill-tagging # super-csv # xss-utils @@ -470,7 +468,6 @@ django-filter==23.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore django-ipware==4.0.2 @@ -506,9 +503,7 @@ django-model-utils==4.3.1 # edx-submissions # edx-when # edxval - # learner-pathway-progress # ora2 - # outcome-surveys # skill-tagging # super-csv django-mptt==0.14.0 @@ -561,7 +556,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.3.0 # via @@ -624,7 +618,6 @@ djangorestframework==3.14.0 # edx-organizations # edx-proctoring # edx-submissions - # learner-pathway-progress # openedx-blockstore # ora2 # super-csv @@ -738,10 +731,8 @@ edx-django-utils==5.6.0 # edx-toggles # edx-when # event-tracking - # learner-pathway-progress # openedx-blockstore # ora2 - # outcome-surveys # super-csv edx-drf-extensions==8.8.0 # via @@ -755,13 +746,11 @@ edx-drf-extensions==8.8.0 # edx-rbac # edx-when # edxval - # learner-pathway-progress edx-enterprise==4.0.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # learner-pathway-progress edx-event-bus-kafka==5.1.0 # via # -r requirements/edx/doc.txt @@ -799,11 +788,9 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 - # outcome-surveys edx-organizations==6.12.0 # via # -r requirements/edx/doc.txt @@ -856,7 +843,6 @@ edx-toggles==5.0.0 # edx-name-affirmation # edx-search # edxval - # learner-pathway-progress # ora2 edx-token-utils==0.2.1 # via @@ -1095,10 +1081,8 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 - # outcome-surveys jsonschema==4.18.4 # via # -r requirements/edx/doc.txt @@ -1137,10 +1121,6 @@ lazy-object-proxy==1.9.0 # via # -r requirements/edx/testing.txt # astroid -learner-pathway-progress==1.3.4 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt libsass==0.10.0 # via # -r requirements/edx/doc.txt @@ -1337,10 +1317,6 @@ oscrypto==1.3.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # snowflake-connector-python -outcome-surveys==2.4.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt packaging==23.1 # via # -r requirements/edx/../pip-tools.txt @@ -1685,7 +1661,6 @@ pytz==2022.7.1 # fs # icalendar # interchange - # learner-pathway-progress # olxcleaner # openedx-blockstore # ora2 @@ -1744,10 +1719,8 @@ requests==2.31.0 # edx-enterprise # edx-rest-api-client # geoip2 - # learner-pathway-progress # mailsnake # optimizely-sdk - # outcome-surveys # pact-python # pyjwkest # pylti1p3 @@ -2219,7 +2192,7 @@ xblock-poll==1.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -xblock-utils==3.2.0 +xblock-utils==3.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 8e964ef028..e0978a1613 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -284,7 +284,6 @@ django==3.2.20 # event-tracking # help-tokens # jsonfield - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore # openedx-django-pyfs @@ -292,7 +291,6 @@ django==3.2.20 # openedx-events # openedx-filters # ora2 - # outcome-surveys # skill-tagging # super-csv # xss-utils @@ -343,7 +341,6 @@ django-filter==23.2 # via # -r requirements/edx/base.txt # edx-enterprise - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore django-ipware==4.0.2 @@ -374,9 +371,7 @@ django-model-utils==4.3.1 # edx-submissions # edx-when # edxval - # learner-pathway-progress # ora2 - # outcome-surveys # skill-tagging # super-csv django-mptt==0.14.0 @@ -415,7 +410,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.3.0 # via -r requirements/edx/base.txt @@ -462,7 +456,6 @@ djangorestframework==3.14.0 # edx-organizations # edx-proctoring # edx-submissions - # learner-pathway-progress # openedx-blockstore # ora2 # super-csv @@ -546,10 +539,8 @@ edx-django-utils==5.6.0 # edx-toggles # edx-when # event-tracking - # learner-pathway-progress # openedx-blockstore # ora2 - # outcome-surveys # super-csv edx-drf-extensions==8.8.0 # via @@ -562,12 +553,10 @@ edx-drf-extensions==8.8.0 # edx-rbac # edx-when # edxval - # learner-pathway-progress edx-enterprise==4.0.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt - # learner-pathway-progress edx-event-bus-kafka==5.1.0 # via -r requirements/edx/base.txt edx-event-bus-redis==0.3.1 @@ -593,11 +582,9 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 - # outcome-surveys edx-organizations==6.12.0 # via -r requirements/edx/base.txt edx-proctoring==4.16.0 @@ -636,7 +623,6 @@ edx-toggles==5.0.0 # edx-name-affirmation # edx-search # edxval - # learner-pathway-progress # ora2 edx-token-utils==0.2.1 # via -r requirements/edx/base.txt @@ -772,10 +758,8 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 - # outcome-surveys jsonschema==4.18.4 # via # -r requirements/edx/base.txt @@ -802,8 +786,6 @@ lazy==1.5 # lti-consumer-xblock # ora2 # xblock -learner-pathway-progress==1.3.4 - # via -r requirements/edx/base.txt libsass==0.10.0 # via -r requirements/edx/base.txt loremipsum==1.0.5 @@ -939,8 +921,6 @@ oscrypto==1.3.0 # via # -r requirements/edx/base.txt # snowflake-connector-python -outcome-surveys==2.4.0 - # via -r requirements/edx/base.txt packaging==23.1 # via # -r requirements/edx/base.txt @@ -1138,7 +1118,6 @@ pytz==2022.7.1 # fs # icalendar # interchange - # learner-pathway-progress # olxcleaner # openedx-blockstore # ora2 @@ -1183,10 +1162,8 @@ requests==2.31.0 # edx-enterprise # edx-rest-api-client # geoip2 - # learner-pathway-progress # mailsnake # optimizely-sdk - # outcome-surveys # pyjwkest # pylti1p3 # python-swiftclient @@ -1486,7 +1463,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/base.txt xblock-poll==1.13.0 # via -r requirements/edx/base.txt -xblock-utils==3.2.0 +xblock-utils==3.3.0 # via # -r requirements/edx/base.txt # done-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index cbc258c934..5135004e8e 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -316,7 +316,6 @@ django==3.2.20 # event-tracking # help-tokens # jsonfield - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore # openedx-django-pyfs @@ -324,7 +323,6 @@ django==3.2.20 # openedx-events # openedx-filters # ora2 - # outcome-surveys # skill-tagging # super-csv # xss-utils @@ -375,7 +373,6 @@ django-filter==23.2 # via # -r requirements/edx/base.txt # edx-enterprise - # learner-pathway-progress # lti-consumer-xblock # openedx-blockstore django-ipware==4.0.2 @@ -406,9 +403,7 @@ django-model-utils==4.3.1 # edx-submissions # edx-when # edxval - # learner-pathway-progress # ora2 - # outcome-surveys # skill-tagging # super-csv django-mptt==0.14.0 @@ -447,7 +442,6 @@ django-simple-history==3.0.0 # edx-name-affirmation # edx-organizations # edx-proctoring - # learner-pathway-progress # ora2 django-splash==1.3.0 # via -r requirements/edx/base.txt @@ -494,7 +488,6 @@ djangorestframework==3.14.0 # edx-organizations # edx-proctoring # edx-submissions - # learner-pathway-progress # openedx-blockstore # ora2 # super-csv @@ -575,10 +568,8 @@ edx-django-utils==5.6.0 # edx-toggles # edx-when # event-tracking - # learner-pathway-progress # openedx-blockstore # ora2 - # outcome-surveys # super-csv edx-drf-extensions==8.8.0 # via @@ -591,12 +582,10 @@ edx-drf-extensions==8.8.0 # edx-rbac # edx-when # edxval - # learner-pathway-progress edx-enterprise==4.0.4 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt - # learner-pathway-progress edx-event-bus-kafka==5.1.0 # via -r requirements/edx/base.txt edx-event-bus-redis==0.3.1 @@ -625,11 +614,9 @@ edx-opaque-keys[django]==2.3.0 # edx-proctoring # edx-user-state-client # edx-when - # learner-pathway-progress # lti-consumer-xblock # openedx-events # ora2 - # outcome-surveys edx-organizations==6.12.0 # via -r requirements/edx/base.txt edx-proctoring==4.16.0 @@ -668,7 +655,6 @@ edx-toggles==5.0.0 # edx-name-affirmation # edx-search # edxval - # learner-pathway-progress # ora2 edx-token-utils==0.2.1 # via -r requirements/edx/base.txt @@ -837,10 +823,8 @@ jsonfield==3.1.0 # edx-enterprise # edx-proctoring # edx-submissions - # learner-pathway-progress # lti-consumer-xblock # ora2 - # outcome-surveys jsonschema==4.18.4 # via # -r requirements/edx/base.txt @@ -869,8 +853,6 @@ lazy==1.5 # xblock lazy-object-proxy==1.9.0 # via astroid -learner-pathway-progress==1.3.4 - # via -r requirements/edx/base.txt libsass==0.10.0 # via -r requirements/edx/base.txt loremipsum==1.0.5 @@ -1008,8 +990,6 @@ oscrypto==1.3.0 # via # -r requirements/edx/base.txt # snowflake-connector-python -outcome-surveys==2.4.0 - # via -r requirements/edx/base.txt packaging==23.1 # via # -r requirements/edx/base.txt @@ -1275,7 +1255,6 @@ pytz==2022.7.1 # fs # icalendar # interchange - # learner-pathway-progress # olxcleaner # openedx-blockstore # ora2 @@ -1319,10 +1298,8 @@ requests==2.31.0 # edx-enterprise # edx-rest-api-client # geoip2 - # learner-pathway-progress # mailsnake # optimizely-sdk - # outcome-surveys # pact-python # pyjwkest # pylti1p3 @@ -1635,7 +1612,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/base.txt xblock-poll==1.13.0 # via -r requirements/edx/base.txt -xblock-utils==3.2.0 +xblock-utils==3.3.0 # via # -r requirements/edx/base.txt # done-xblock