diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 09ac62705ada..4b04fef294ad 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -30,7 +30,12 @@ from opaque_keys import InvalidKeyError from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.locator import BlockUsageLocator -from organizations.api import add_organization_course, ensure_organization, get_course_organization, get_organization_institutions +from organizations.api import ( + add_organization_course, + ensure_organization, + get_course_organization, + get_organization_institutions +) from organizations.exceptions import InvalidOrganizationException from rest_framework.exceptions import ValidationError diff --git a/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py b/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py new file mode 100644 index 000000000000..ef6e63016cc5 --- /dev/null +++ b/openedx/core/djangoapps/content/course_overviews/migrations/0028_merge_20241210_1837.py @@ -0,0 +1,14 @@ +# Generated by Django 3.2.16 on 2024-12-10 18:37 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('course_overviews', '0027_auto_20240909_1523'), + ('course_overviews', '0027_merge_20240123_1603'), + ] + + operations = [ + ] diff --git a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py index e06064f8f142..5e2a7442c2ab 100644 --- a/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py +++ b/openedx/core/djangoapps/content/course_overviews/tests/test_course_overviews.py @@ -380,7 +380,7 @@ def test_malformed_grading_policy(self): course_overview = CourseOverview._create_or_update(course) # pylint: disable=protected-access assert course_overview.lowest_passing_grade is None - @ddt.data((ModuleStoreEnum.Type.mongo, 5, 5), (ModuleStoreEnum.Type.split, 2, 2)) + @ddt.data((ModuleStoreEnum.Type.mongo, 6, 6), (ModuleStoreEnum.Type.split, 2, 2)) @ddt.unpack def test_versioning(self, modulestore_type, min_mongo_calls, max_mongo_calls): """ diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c8c362831128..1340882baa2e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1149,7 +1149,7 @@ zipp==3.8.0 # via -r ./requirements/edx/private.txt -e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1 # via -r ./requirements/edx/private.txt --e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1 +-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0 # via -r ./requirements/edx/private.txt # -e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2 -e git+https://github.com/CUCWD/custom-form-app.git@0.1-maple.3-cucwd#egg=custom-form-app==0.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index df119bc4eb97..effede1f42bb 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1654,7 +1654,7 @@ zipp==3.8.0 # via -r ./requirements/edx/private.txt -e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1 # via -r ./requirements/edx/private.txt - -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1 + -e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0 # via -r ./requirements/edx/private.txt -e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2 # via -r ./requirements/edx/private.txt diff --git a/requirements/edx/private.txt b/requirements/edx/private.txt index 54c2cd06048d..7aba1c454c9d 100644 --- a/requirements/edx/private.txt +++ b/requirements/edx/private.txt @@ -4,360 +4,297 @@ # # pip-compile ./requirements/edx/private.in # ---index-url http://edx.devstack.devpi:3141/root/pypi/+simple/ ---extra-index-url https://pypi.python.org/simple ---trusted-host edx.devstack.devpi - -e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-nutmeg#egg=bigcommerce==0.22.2 # via -r ./requirements/edx/private.in -e git+https://github.com/CUCWD/custom-form-app.git@0.1-maple.3-cucwd#egg=custom-form-app==0.1 # via -r ./requirements/edx/private.in --e git+https://github.com/CUCWD/figures@0.4.dev17-maple.3#egg=Figures==0.4.dev17 - # via -r ./requirements/edx/private.in -e git+https://github.com/CUCWD/edx-organizations.git@6.11.1.2-cucwd-nutmeg#egg=edx-organizations==6.11.1 # via -r ./requirements/edx/private.in --e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0 +-e git+https://github.com/CUCWD/figures@0.4.dev17-maple.3#egg=Figures==0.4.dev17 # via -r ./requirements/edx/private.in -e git+https://github.com/CUCWD/xblock-keyterms.git@0.1-maple.3-cucwd#egg=keyterms-xblock==0.1 # via -r ./requirements/edx/private.in --e git+https://github.com/CUCWD/xblock-qualtrics-survey.git@release/v.2.1.0-maple.3-cucwd#egg=xblock_qualtrics_survey==2.1.0 - # via -r ./requirements/edx/private.in -e git+https://github.com/CUCWD/edx-ora2.git@4.1.2-nutmeg-cucwd#egg=ora2==4.1.2 # via -r ./requirements/edx/private.in -asgiref==3.4.1 +-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.3#egg=social-auth-backend-bigcommerce==0.1.0 + # via -r ./requirements/edx/private.in +-e git+https://github.com/CUCWD/xblock-qualtrics-survey.git@release/v.2.1.0-maple.3-cucwd#egg=xblock_qualtrics_survey==2.1.0 + # via -r ./requirements/edx/private.in +appdirs==1.4.4 + # via fs +asgiref==3.8.1 # via django - # edx-organizations -certifi==2021.10.8 +backports-zoneinfo==0.2.1 + # via django +bleach==6.1.0 + # via ora2 +boto3==1.35.77 # via - # -r requirements/edx/paver.txt - # edx-organizations - # elasticsearch - # py2neo - # requests + # fs-s3fs + # ora2 +botocore==1.35.77 + # via + # boto3 + # s3transfer +certifi==2021.10.8 + # via requests cffi==1.15.0 - # edx-organizations # via cryptography charset-normalizer==2.0.7 - # via - # -r requirements/edx/paver.txt - # edx-organizations - # requests + # via requests +click==8.1.7 + # via code-annotations +code-annotations==1.8.2 + # via edx-toggles cryptography==35.0.0 # via - # -r requirements/edx/base.in - # django-fernet-fields - # edx-enterprise - # edx-organizations - # jwcrypto # pyjwt # social-auth-core defusedxml==0.7.1 # via + # ora2 # python3-openid # social-auth-core -django-crum==0.7.9 +django==4.2.17 # via - # -r requirements/edx/base.in + # custom-form-app + # django-crum + # django-model-utils + # djangorestframework + # drf-jwt + # edx-django-release-util # edx-django-utils - # edx-enterprise + # edx-drf-extensions + # edx-i18n-tools # edx-organizations - # edx-proctoring - # edx-rbac + # edx-submissions + # edx-toggles + # jsonfield + # openedx-django-pyfs + # ora2 + # xblock-qualtrics-survey +django-crum==0.7.9 + # via + # edx-django-utils # edx-toggles - # super-csv django-model-utils==4.2.0 # via - # -r requirements/edx/base.in - # django-user-tasks - # edx-bulk-grades - # edx-celeryutils - # edx-completion - # edx-enterprise - # edx-milestones - # edx-name-affirmation # edx-organizations - # edx-proctoring - # edx-rbac # edx-submissions - # edx-when - # edxval # ora2 - # super-csv django-simple-history==3.0.0 # via - # -r requirements/edx/base.in - # edx-enterprise # edx-organizations - # edx-proctoring # ora2 django-waffle==2.2.1 # via - # -r requirements/edx/base.in # edx-django-utils # edx-drf-extensions - # edx-enterprise - # edx-organizations - # edx-proctoring # edx-toggles djangorestframework==3.12.4 # via - # -r requirements/edx/base.in - # django-config-models - # django-user-tasks # drf-jwt - # drf-yasg - # edx-api-doc-tools - # edx-completion # edx-drf-extensions - # edx-enterprise - # edx-name-affirmation # edx-organizations - # edx-proctoring # edx-submissions # ora2 - # super-csv drf-jwt==1.19.1 # via edx-drf-extensions - # edx-organizations +edx-django-release-util==1.4.0 + # via edx-submissions edx-django-utils==4.4.0 # via - # -r requirements/edx/base.in - # django-config-models # edx-drf-extensions - # edx-enterprise - # edx-name-affirmation - # edx-organizations - # edx-rest-api-client # edx-toggles - # edx-when # ora2 - # super-csv edx-drf-extensions==8.0.0 + # via edx-organizations +edx-i18n-tools==1.6.3 + # via ora2 +edx-opaque-keys==2.2.2 # via - # -r requirements/edx/base.in - # edx-completion - # edx-enterprise - # edx-name-affirmation - # edx-organizations - # edx-proctoring - # edx-rbac - # edx-when - # edxval -edx-opaque-keys[django]==2.2.2 - # via - # -r requirements/edx/paver.txt - # edx-bulk-grades - # edx-ccx-keys - # edx-completion # edx-drf-extensions - # edx-enterprise - # edx-milestones # edx-organizations - # edx-proctoring - # edx-user-state-client - # edx-when - # lti-consumer-xblock - # openedx-events # ora2 - # xmodule -future==0.18.2 +edx-submissions==3.8.3 + # via ora2 +edx-toggles==5.2.0 + # via ora2 +fs==2.4.16 # via - # django-ses - # edx-celeryutils - # edx-enterprise - # edx-organizations - # pyjwkest + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via openedx-django-pyfs +future==0.18.2 + # via pyjwkest +html5lib==1.1 + # via ora2 idna==3.3 + # via requests +jinja2==3.1.4 + # via code-annotations +jmespath==1.0.1 # via - # -r requirements/edx/paver.txt - # edx-organizations - # requests - # yarl -newrelic==7.2.1.168 + # boto3 + # botocore +jsonfield==3.1.0 # via - # -r requirements/edx/base.in - # edx-django-utils - # edx-organizations + # edx-submissions + # ora2 +lazy==1.6 + # via + # ora2 + # xblock +libsass==0.23.0 + # via ora2 +loremipsum==1.0.5 + # via ora2 +lxml[html_clean]==5.3.0 + # via + # edx-i18n-tools + # ora2 + # xblock +mako==1.3.8 + # via + # xblock + # xblock-utils +markupsafe==2.1.5 + # via + # jinja2 + # mako + # xblock +newrelic==7.2.1.168 + # via edx-django-utils oauthlib==3.0.1 # via # requests-oauthlib # social-auth-core -pbr==5.6.0 +openedx-django-pyfs==3.7.0 + # via xblock +path==16.16.0 # via - # -r requirements/edx/paver.txt - # edx-organizations - # stevedore + # edx-i18n-tools + # path-py +path-py==12.5.0 + # via ora2 +pbr==5.6.0 + # via stevedore pillow==8.3.2 - # via - # -r requirements/edx/base.in - # edx-enterprise - # edx-organizations + # via edx-organizations +polib==1.2.0 + # via edx-i18n-tools psutil==5.8.0 - # via - # -r requirements/edx/paver.txt - # edx-django-utils - # edx-organizations + # via edx-django-utils pycparser==2.20 # via cffi - # edx-organizations pycryptodomex==3.11.0 - # via - # -r requirements/edx/base.in - # edx-organizations - # edx-proctoring - # lti-consumer-xblock - # pyjwkest + # via pyjwkest +pydash==8.0.4 + # via keyterms-xblock pyjwkest==1.4.2 - # via - # -r requirements/edx/base.in - # edx-drf-extensions - # edx-organizations - # lti-consumer-xblock -pyjwt==2.2.0 - # via - # bigcommerce - # social-auth-core + # via edx-drf-extensions pyjwt[crypto]==2.2.0 # via - # -r requirements/edx/base.in + # bigcommerce # drf-jwt - # edx-auth-backends # edx-drf-extensions - # edx-organizations - # edx-proctoring - # edx-rest-api-client - # pylti1p3 # social-auth-core pymongo==3.10.1 - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.in - # -r requirements/edx/paver.txt - # edx-opaque-keys - # edx-organizations - # event-tracking - # mongodbproxy - # mongoengine + # via edx-opaque-keys python-dateutil==2.4.0 # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.in - # analytics-python # botocore - # edx-ace # edx-drf-extensions - # edx-enterprise - # edx-organizations - # edx-proctoring - # icalendar - # olxcleaner # ora2 # xblock +python-slugify==8.0.4 + # via code-annotations +python-swiftclient==4.6.0 + # via ora2 python3-openid==3.2.0 # via social-auth-core pytz==2021.3 # via - # -r requirements/edx/base.in - # babel - # celery - # django - # django-ses - # edx-completion - # edx-enterprise - # edx-organizations - # edx-proctoring # edx-submissions - # edx-tincan-py35 - # event-tracking - # fs - # icalendar - # interchange - # olxcleaner # ora2 # xblock +pyyaml==6.0.2 + # via + # code-annotations + # edx-django-release-util + # edx-i18n-tools + # xblock requests==2.26.0 # via - # -r requirements/edx/paver.txt - # analytics-python # bigcommerce - # coreapi - # django-oauth-toolkit - # edx-analytics-data-api-client - # edx-bulk-grades # edx-drf-extensions - # edx-enterprise - # edx-organizations - # edx-rest-api-client - # geoip2 - # mailsnake # pyjwkest - # pylti1p3 # python-swiftclient # requests-oauthlib - # sailthru-client - # slumber # social-auth-core - # tableauserverclient requests-oauthlib==1.3.0 # via social-auth-core +s3transfer==0.10.4 + # via boto3 semantic-version==2.8.5 # via edx-drf-extensions - # edx-organizations +simplejson==3.19.3 + # via + # xblock + # xblock-utils six==1.16.0 # via - # -r requirements/edx/base.in - # -r requirements/edx/paver.txt - # analytics-python # bleach - # chem - # codejail - # crowdsourcehinter-xblock - # edx-ace - # edx-auth-backends - # edx-bulk-grades - # edx-ccx-keys # edx-django-release-util # edx-drf-extensions - # edx-enterprise - # edx-organizations - # edx-milestones - # edx-rbac - # event-tracking # fs # fs-s3fs # html5lib - # interchange - # isodate - # libsass - # pansi - # paver - # py2neo # pyjwkest # python-dateutil - # python-memcached - # python-swiftclient social-auth-core==4.1.0 # via social-auth-backend-bigcommerce sqlparse==0.4.2 # via - # -r requirements/edx/base.in - # edx-organizations # django + # figures stevedore==3.4.0 # via - # -r requirements/edx/base.in - # -r requirements/edx/paver.txt # code-annotations - # edx-ace # edx-django-utils - # edx-enterprise # edx-opaque-keys - # edx-organizations +text-unidecode==1.3 + # via python-slugify +typing-extensions==4.12.2 + # via + # asgiref + # pydash urllib3==1.26.7 # via - # -r requirements/edx/paver.txt - # edx-organizations - # elasticsearch - # geoip2 - # py2neo - # requests \ No newline at end of file + # botocore + # requests +voluptuous==0.14.2 + # via ora2 +web-fragments==2.2.0 + # via + # xblock + # xblock-utils +webencodings==0.5.1 + # via + # bleach + # html5lib +webob==1.8.9 + # via xblock +xblock[django]==5.1.0 + # via + # keyterms-xblock + # ora2 + # xblock-qualtrics-survey + # xblock-utils +xblock-utils==4.0.0 + # via xblock-qualtrics-survey + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4bcc39103887..4d4795862c52 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1523,5 +1523,5 @@ zipp==3.8.0 # via -r ./requirements/edx/private.txt -e git+https://github.com/CUCWD/bigcommerce-api-python.git@bigcommerce-0.22.2-maple.1#egg=bigcommerce==0.22.2 # via -r ./requirements/edx/private.in --e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0-maple.1 +-e git+https://github.com/CUCWD/social-auth-backend-bigcommerce.git@0.1.0-maple.1#egg=social-auth-backend-bigcommerce==0.1.0 # via -r ./requirements/edx/private.in \ No newline at end of file