Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade edx-when in edx-platform

Browse Source 
Run `make upgrade` on edx-platform to update python packages.
PROD-1333
This commit is contained in:
Awais Jibran
2020-03-02 10:42:48 +05:00
parent dea918b8b8
commit c6e0985812
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openedx/core/djangoapps/schedules/content_highlights.py
View File

@@ -6,8 +6,6 @@ schedule experience built on the Schedules app.
import logging
from lms.djangoapps.courseware.model_data import FieldDataCache
from lms.djangoapps.courseware.module_render import get_module_for_descriptor
from openedx.core.djangoapps.schedules.config import COURSE_UPDATE_WAFFLE_FLAG
from openedx.core.djangoapps.schedules.exceptions import CourseUpdateDoesNotExist
from openedx.core.lib.request_utils import get_request_or_stub
@@ -92,6 +90,11 @@ def _get_course_descriptor(course_key):
def _get_course_module(course_descriptor, user):
# Adding courseware imports here to insulate other apps (e.g. schedules) to
# avoid import errors.
from lms.djangoapps.courseware.model_data import FieldDataCache
from lms.djangoapps.courseware.module_render import get_module_for_descriptor
# Fake a request to fool parts of the courseware that want to inspect it.
request = get_request_or_stub()
request.user = user

9
openedx/tests/settings.py
View File

@@ -7,6 +7,7 @@ Required in Django 1.9+ due to imports of models in stock Django apps.
import sys
import tempfile
from django.utils.translation import ugettext_lazy as _
from path import Path
# TODO: Remove the rest of the sys.path modification here and in (cms|lms)/envs/common.py
@@ -64,6 +65,7 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.sites',
'djcelery',
'django_sites_extensions',
'openedx.core.djangoapps.django_comment_common',
'openedx.core.djangoapps.video_config',
'openedx.core.djangoapps.video_pipeline',
@@ -82,6 +84,8 @@ INSTALLED_APPS = (
'openedx.core.djangoapps.content.block_structure.apps.BlockStructureConfig',
'openedx.core.djangoapps.catalog',
'openedx.core.djangoapps.self_paced',
'openedx.core.djangoapps.schedules.apps.SchedulesConfig',
'openedx.core.djangoapps.theming.apps.ThemingConfig',
'experiments',
'openedx.features.content_type_gating',
'openedx.features.course_duration_limits',
@@ -107,9 +111,10 @@ POLICY_CHANGE_TASK_RATE_LIMIT = '300/h'
SECRET_KEY = 'insecure-secret-key'
SITE_ID = 1
SITE_NAME = "localhost"
PLATFORM_NAME = _('Your Platform Name Here')
DEFAULT_FROM_EMAIL = 'registration@example.com'
TRACK_MAX_EVENT = 50000
USE_TZ = True
RETIREMENT_SERVICE_WORKER_USERNAME = 'RETIREMENT_SERVICE_USER'

5
requirements/edx/base.txt
View File

@@ -60,6 +60,7 @@ django-classy-tags==1.0.0 # via django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/base.in, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise
django-countries==6.0 # via -r requirements/edx/base.in, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.in, edx-enterprise
django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise
@@ -117,7 +118,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.in
edx-submissions==3.0.4 # via -r requirements/edx/base.in, ora2
edx-tincan-py35==0.0.5 # via edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.in
edx-when==1.0.2 # via -r requirements/edx/base.in, edx-proctoring
edx-when==1.0.3 # via -r requirements/edx/base.in, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/base.in
elasticsearch==1.9.0 # via edx-search
enum34==1.1.9 # via edxval
@@ -220,7 +221,7 @@ semantic-version==2.8.4 # via edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.in
shortuuid==0.5.0 # via -r requirements/edx/base.in
simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils
six==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, calc, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, nltk, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
six==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, calc, cryptography, django-appconf, django-classy-tags, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, nltk, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client
social-auth-core==3.2.0 # via -r requirements/edx/base.in, social-auth-app-django
git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/github.in

4
requirements/edx/development.txt
View File

@@ -70,7 +70,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise
django-countries==6.0 # via -r requirements/edx/testing.txt, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-debug-toolbar==2.2 # via -r requirements/edx/development.in
django-fernet-fields==0.6 # via -r requirements/edx/testing.txt, edx-enterprise
@@ -131,7 +131,7 @@ edx-sphinx-theme==1.5.0 # via -r requirements/edx/development.in
edx-submissions==3.0.4 # via -r requirements/edx/testing.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/testing.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/testing.txt
edx-when==1.0.2 # via -r requirements/edx/testing.txt, edx-proctoring
edx-when==1.0.3 # via -r requirements/edx/testing.txt, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/testing.txt
elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search
entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8

4
requirements/edx/testing.txt
View File

@@ -69,7 +69,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise
django-countries==6.0 # via -r requirements/edx/base.txt, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.txt, edx-enterprise
django-filter==2.2.0 # via -r requirements/edx/base.txt, edx-enterprise
@@ -126,7 +126,7 @@ edx-sga==0.10.0 # via -r requirements/edx/base.txt
edx-submissions==3.0.4 # via -r requirements/edx/base.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/base.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.txt
edx-when==1.0.2 # via -r requirements/edx/base.txt, edx-proctoring
edx-when==1.0.3 # via -r requirements/edx/base.txt, edx-proctoring
edxval==1.2.4 # via -r requirements/edx/base.txt
elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search
entrypoints==0.3 # via flake8