Commit Graph

3531 Commits

Author SHA1 Message Date
Awais Qureshi
7201edb11d Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
This reverts commit db4c3b1210.
2020-11-11 00:13:47 +05:00
Awais Qureshi
db4c3b1210 Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
This reverts commit c1fe3c3a93.
2020-11-10 23:23:09 +05:00
Kyle McCormick
151bd13666 Use full names for common.djangoapps imports; warn when using old style (#25477)
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
2020-11-10 07:02:01 -05:00
Muhammad Soban Javed
c1fe3c3a93 Revert ""Update routing config" (#25536)" (#25549)
This reverts commit 39a22734c1.
2020-11-09 23:43:47 +05:00
Awais Qureshi
39a22734c1 "Update routing config" (#25536)
* Revert "Revert "Update routing config"

* Removed settings from lms/celery.py and cms/celery.py

* Moved settings import from top-level to function's scopes

Co-authored-by: Soban Javed <iamsobanjaved@gmail.com>
2020-11-09 19:06:55 +05:00
Manjinder Singh
c74b623948 Fixing code-annotations (#25539)
* Fixing code-annotations
2020-11-06 12:52:08 -05:00
Muhammad Soban Javed
5a2ea1f954 Revert "Update routing config" 2020-11-06 02:05:48 +05:00
Muhammad Soban Javed
bfa8f71f33 Update routing config #25419 2020-11-06 01:00:29 +05:00
Kyle McCormick
758c2b02a1 Pass course-run-specific resource limits to codejail
The limits can be defined in settings.CODE_JAIL['limits_overrides'],
which is a dict mapping context ids (generally, course run keys)
to overrides to be applied to settings.CODE_JAIL['limits'].

This will allow us to temporarily alter the codejail limits
for certain contexts in order to enable, for example,
a certain course run's tasks to run longer while a large exam's
grades are recomputed.

TNL-7649
2020-11-05 11:53:16 -05:00
Zainab Amir
97e9fee92e Add third party auth context api (#25497) 2020-11-05 19:26:29 +05:00
Kyle McCormick
d1a775d3cd Use full names for lms.djangoapps imports (#25401)
* Use full LMS imports paths in LMS settings and urls modules
* Use full LMS import paths in Studio settings and urls modules
* Import from lms.djangoapps.badges instead of badges
* Import from lms.djangoapps.branding instead of branding
* Import from lms.djangoapps.bulk_email instead of bulk_email
* Import from lms.djangoapps.bulk_enroll instead of bulk_enroll
* Import from lms.djangoapps.ccx instead of ccx
* Import from lms.djangoapps.course_api instead of course_api
* Import from lms.djangoapps.course_blocks instead of course_blocks
* Import from lms.djangoapps.course_wiki instead of course_wiki
* Import from lms.djangoapps.courseware instead of courseware
* Import from lms.djangoapps.dashboard instead of dashboard
* Import from lms.djangoapps.discussion import discussion
* Import from lms.djangoapps.email_marketing instead of email_marketing
* Import from lms.djangoapps.experiments instead of experiments
* Import from lms.djangoapps.gating instead of gating
* Import from lms.djangoapps.grades instead of grades
* Import from lms.djangoapps.instructor_analytics instead of instructor_analytics
* Import form lms.djangoapps.lms_xblock instead of lms_xblock
* Import from lms.djangoapps.lti_provider instead of lti_provider
* Import from lms.djangoapps.mobile_api instead of mobile_api
* Import from lms.djangoapps.rss_proxy instead of rss_proxy
* Import from lms.djangoapps.static_template_view instead of static_template_view
* Import from lms.djangoapps.survey instead of survey
* Import from lms.djangoapps.verify_student instead of verify_student
* Stop suppressing EdxPlatformDeprecatedImportWarnings
2020-11-04 08:48:33 -05:00
adeel khan
7cd9c6652a Merge pull request #25476 from edx/adeel/van_98_update_confirm_password_url_domain
Adds Logistration MFE url for forgot password email.
2020-11-03 13:40:03 +05:00
Ned Batchelder
21d7e6f3b2 Use https for open.edx.org 2020-11-02 11:29:03 -05:00
Soban Javed
3206d9cb9a Update celery routing
- Used routing function istead of class
- Move task queues to Djano settings
- Removed routing_key parameter
2020-11-02 15:03:53 +05:00
Ned Batchelder
b408d032e4 Merge pull request #25457 from regisb/regisb/squash-lmsinitialization-warning
Squash lms_initialization deprecated import warning
2020-10-30 17:09:09 -04:00
Kyle McCormick
630d30563a Silence DeprecatedEdxPlatformImportWarning by default 2020-10-30 10:20:48 -04:00
Kyle McCormick
090e10683c Rename sys_path_hacks/ to import_shims/
The old folder name is somewhat confusing, because the
folder contains shims to _compensate for the removal
of sys.path hacks_, but does not contain the sys.path
hacks themselves.

Furthermore, this import_shims/ system could also be
used for other import path changes, such as turning
the locally-installed packages in common/lib/
into regular, importable modules
(e.g. `from common.lib.xmodule import abc` instead of
`from xmodule import abc`). So, a name that is not
specific to the sys.path hacks may be better
in the medium-to-long term.

Along the same lines, we also rename SysPathHackWarning
to DeprecatedEdxPlatformImportWarning.
2020-10-30 10:20:48 -04:00
Robert Raposa
0cc46ca5b0 Merge pull request #25332 from regisb/regisb/use-settingdict
[BD-21] Use edx-toggle's SettingDictToggle to document setting-based feature toggles
2020-10-30 08:59:38 -04:00
Samuel Walladge
83144dcc2a Revert "Move lms/cms defaults from configration repo"
This reverts commit 814d1bf52d.
2020-10-30 09:23:10 +10:30
Aarif
1a31236404 updated config to use mysql 5.7 container (#25362) 2020-10-29 21:51:39 +05:00
Feanil Patel
2175d00b83 Update celery task discovery config. (#25479)
Update the celery startup code to more closely match the docs.  We believe some of these imports are causeing circulare
dependencies that are causing race conditions in task discovery.  Since all django apps should be loaded using the
django fixup in celery 4, we shouldn't need these other overrides.

https://github.com/celery/celery/blob/v4.4.7/celery/fixups/django.py
https://docs.celeryproject.org/en/v4.4.7/django/first-steps-with-django.html#using-celery-with-django
2020-10-29 10:52:16 -04:00
Adeel Khan
d61936fdb6 Adds Logistration MFE url for forgot password email.
This patch would enable routing learner to logistration MFE
via forgot password url than on platform when
ENABLE_LOGISTRATION_MICROFRONTEND feature flag is set.

VAN-98
2020-10-29 16:25:20 +05:00
Régis Behmo
daef264ebb Use SettingDictToggle to document ENABLE_ORA_TEAM_SUBMISSIONS 2020-10-29 11:11:02 +01:00
Régis Behmo
274c5a893b Squash lms_initialization deprecated import warning 2020-10-28 09:30:32 +01:00
Feanil Patel
0191f2f1bb Don't install instructor_task for common testing. (#25459)
* Import instructor tasks explicitly on workers.

Importing them via app config leads to an dependency chain nightmare as lots of other apps get pulled into the startup
and are not configured in situations like testing the common and lib unit tests.  This should register tasks to the celery
workers without messing with the startup dependency chains of the LMS, CMS and test setup.
2020-10-27 18:34:27 -04:00
Matt Tuchfarber
1caf0875df Merge pull request #25381 from edx/tuchfarber/add_exec_ed_course_mdoe
Add Executive Education course mode
2020-10-27 10:09:30 -04:00
Matt Tuchfarber
488f30496e Add Executive Education course mode 2020-10-27 09:38:20 -04:00
Régis Behmo
13a70fcaa6 Deprecate COURSE_OUTLINE_PAGE_FLAG and UNIFIED_COURSE_TAB_FLAG
These flags are deprecated in favor or the DISABLE_* equivalent.
This allows us to get rid of the DefaultTrueWaffleNamespace class.
2020-10-27 10:20:41 +01:00
Albert (AJ) St. Aubin
8cef028429 Update the award_program_cert task to fix celery registration
[MICROBA-676]
2020-10-23 17:08:34 -04:00
Zainab Amir
49ea5f5188 Update logistration MFE feature flag (#25356)
update logistration MFE feature flag to not be used in conjunction
with Accounts MFE toggle.

VAN-11
2020-10-23 12:11:56 +05:00
Feanil Patel
b73f755487 Revert "Feanil/edx search update (#25406)" (#25412)
This reverts commit 581b20056d.
2020-10-22 15:53:57 -04:00
Feanil Patel
581b20056d Feanil/edx search update (#25406)
OeX_ES-44:  Update edx-search elasticsearch.


* removes redundant doc_types from the lms/cms, replaces courseware
index with doc_types to two indices
* code polishing

* Use a new config variable for ES7 deployment. (#2226)

Co-authored-by: Golub-Sergey <1.golub.sergey.1@gmail.com>
Co-authored-by: Diana Huang <diana.k.huang@gmail.com>
2020-10-22 14:18:19 -04:00
Saleem Latif
43d0a67fa1 Request for field to specify locale in Django enterprise accounts 2020-10-20 17:56:22 +05:00
Dillon Dumesnil
84a60a1f17 AA-385: Adding in migration for LinkedInAddToProfileConfiguration 2020-10-19 12:56:34 -04:00
Kyle McCormick
4847a18a66 Remove sys.path modification for Studio; use sys_path_hacks instead
Also, tweak the un_sys_path.sh script.
2020-10-19 09:34:31 -04:00
Feanil Patel
cc1259376b Add a secret key to bok_choy_dockery.yml so that it can actually be run. 2020-10-15 11:33:12 -04:00
Jeremy Bowman
d19368525b DEPR-43 Remove most of the shoppingcart app (#24692)
Removed most of the deprecated shoppingcart app, leaving just enough to allow us to cleanly remove the related database tables later. Also removed the relevant Django settings that weren't in use elsewhere.
2020-10-14 14:24:52 -04:00
Ahtisham Shahid
fe8119a6c6 Added app.py to mobile_api to resolve migration issue (#25327)
removed un-necessary imports
2020-10-13 12:41:22 +05:00
Alex Dusenbery
5a66ed1c41 ENT-3520 | Define enterprise service usernames as a simple list of strings. Upgrade edx-enterprise to 3.8.27 2020-10-06 09:11:30 -04:00
binodpant
ec438cdd28 add missing app blackboard 2020-10-05 11:54:41 -04:00
Robert Raposa
f65bf0ed9d Merge pull request #24794 from regisb/regisb/settings-docs
[BD-21] Document settings with annotations
2020-10-01 11:53:39 -04:00
David Ormsbee
38080e0e85 Merge pull request #24991 from open-craft/farhaan/upstream-bb-2924-registration-form-changes
[BB-2924] Added a constant to help modify countries list in drop-down
2020-09-30 09:41:36 -04:00
Diana Huang
657da20c6e DEPR-43 - Remove JS that refers to shoppingcart receipt page. (#24890)
https://openedx.atlassian.net/browse/DEPR-43

Co-authored-by: Jeremy Bowman <jbowman@edx.org>
2020-09-29 16:08:42 -04:00
Nimisha Asthagiri
bc1d1bc2c5 Merge pull request #23731 from open-craft/alanoe/move_celery_check_to_high_priority_queue_upstream
Move Celery check task to the high priority queue
2020-09-29 06:37:06 -04:00
Tim McCormack
5b331b2d4d Merge branch 'master' into timmc/misc-metric-attribute
# Conflicts:
#	cms/envs/common.py
#	lms/envs/common.py
2020-09-28 13:56:08 +00:00
Tim McCormack
f29e418264 Revert "Revert "ARCHBOM-1494: Refer to custom attributes, not metrics, especially with edx-django-utils (#25010)" (#25025)" (#25055)
This reverts commit 986a448d9e.
2020-09-28 13:53:57 +00:00
Régis Behmo
e555d8a571 [BD-21] Document settings with annotations
We introduce the documentation of django settings via code annotations.
This will allow us to produce a human-readable documentatio of all Open
edX settings.
2020-09-28 12:44:36 +02:00
Josh McLaughlin
73fd2ed849 Update default for override to avoid setting duplication 2020-09-25 21:50:11 -07:00
Tim McCormack
705ad07524 A few other "metric" names in files touched in previous renaming PRs 2020-09-25 19:11:30 +00:00
Robert Raposa
04560b5ec6 replace deprecated RequestMetricsMiddleware
Replace deprecated RequestMetricsMiddleware with
renamed version RequestCustomAttributesMiddleware.

ARCHBOM-1495
2020-09-25 09:37:45 -04:00