Commit Graph

52771 Commits

Author SHA1 Message Date
Calen Pennington
151b309225 Convert custom storage subclasses into mixins so that we can store to either the filesystem or S3 2020-01-02 14:49:19 -05:00
Calen Pennington
0ee1c2f05a Remove S3ReportStorage, because S3BotoStorage already handles a custom_domain argument 2020-01-02 10:25:53 -05:00
Manjinder Singh
6c69b6d435 Adding code to output pytest warnings. (#22570)
* Added pytest-json-report plugin
	- modifying app-opts in setup.cfg
	- adding hook to all conftest.py files in repo
	- setting report to be saved to test_root/log/warnings.json
	- Writing custom logic to save json report to avoid overwrite if pytest called twice
This was created to allow us to easily parse through test warnings in jenkins
2020-01-02 10:01:52 -05:00
edX cache uploader bot
f4bb9b4b8e Updating Bokchoy testing database cache (#22681) 2020-01-02 09:45:19 -05:00
Abdul Hannan
e652309066 Merge pull request #22391 from edx/rename_start_in_schedule_3/5
Rename start in schedule 3/5
2020-01-02 18:24:03 +05:00
hunytalk
e07c2f1c27 Copy values from old to new field in Schedules Model 2020-01-02 18:00:21 +05:00
Zainab Amir
43a06fe385 Fix failing bokchoy test (#22670) 2020-01-02 11:03:01 +05:00
Matthew Piatetsky
09e62afb99 Merge pull request #22598 from edx/REV-1061
[REV-1061] Set discount on order based on discount that was on basket
2020-01-01 22:53:01 -05:00
Manjinder Singh
ac232e926a Merge pull request #22645 from edx/msingh/fixing_type
Fixing typo
2020-01-01 21:26:16 -05:00
Zaman Afzal
363a75cc99 ENT-2518 Fix Enterprise Login Page not showing to the user (#22602) 2020-01-01 15:18:45 +05:00
David Ormsbee
9ba09c4151 Merge pull request #22666 from edx/ormsbee/2020_test_fix
Fix test that assumes 2020 is in the future.
2019-12-31 18:04:50 -05:00
David Ormsbee
3f0281dd66 Fix test that assumes 2020 is in the future. 2019-12-31 17:25:02 -05:00
Syed Muhammad Dawoud Sheraz Ali
20426c761d Merge pull request #22662 from edx/dsheraz/PROD-1109-ora-update
ORA update
2019-12-31 15:37:59 +05:00
Aarif
e607657a73 Merge pull request #22620 from edx/on_delete_parameter
Added on_delete parameter to models
2019-12-31 15:23:47 +05:00
DawoudSheraz
8d068a4a09 ORA update 2019-12-31 14:32:20 +05:00
David Ormsbee
80fb484a98 Merge pull request #22445 from edx/ormsbee/reduce_queries
Query optimizations
2019-12-30 17:18:09 -05:00
Jeremy Bowman
eace6e36a7 Unpin assorted dependencies (#22656) 2019-12-30 17:09:14 -05:00
David Ormsbee
ad5cc3d5d9 Request cache context processor output.
In Django template rendering, context processors only run once.
But when we do template rendering through edxmako (which we do for
each and every web fragment/XBlock), we can end up having hundreds
of invocations of templates and run context processors for each
separately. This removes that work.
2019-12-30 16:38:46 -05:00
David Ormsbee
2cb2265ffe Add request caching to reduce ORM queries
This adds request caching to the following places:
* course expiration wrapper (displayed in Units)
* offer banner generation (displayed in Units)
* get_enrollment
* user_by_anonymous_id
* youtube_disabled_for_course

On a sample course with edx-val enabled, this reduced the queries
for a large sequence from 450 to 155.
2019-12-30 16:19:25 -05:00
edX cache uploader bot
e326520c03 Updating Bokchoy testing database cache (#22655) 2019-12-30 15:57:43 -05:00
Jeremy Bowman
3941e40b1b Skip date comments on all bok-choy DB dumps (#22651)
In the script used to create the bok-choy database cache files, we've been passing in the parameters to omit timestamps that change for every run in some of the mysqldump commands but not all of them. Use them consistently so we can stop creating new redundant automated bok-choy DB cache PRs on almost every merge to edx-platform.
2019-12-30 15:14:21 -05:00
David Ormsbee
db30d8f447 Merge pull request #22631 from appsembler/omar/iexact__in
Safer CourseOverview.org filed matching
2019-12-30 14:59:13 -05:00
Feanil Patel
941204329c Merge pull request #22652 from edx/feanil/lower_pylint_threshold
Lower the pylint threshold.
2019-12-30 14:49:27 -05:00
Feanil Patel
d63aaaa4c3 Lower the pylint threshold.
We fixed various deprecation warnings as part of BOM-1024
2019-12-30 13:52:15 -05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8
Fix all E303 pep8 errors.
2019-12-30 13:32:26 -05:00
Feanil Patel
8a7159a324 Fix other pep8 violations. 2019-12-30 13:01:55 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts
Run `2to3 -f asserts . -w` on edx-platform.
2019-12-30 12:13:42 -05:00
Feanil Patel
39d3a7ca17 Fix pep8 issues caused by the fixer. 2019-12-30 11:42:04 -05:00
Feanil Patel
61e1eda20d Merge pull request #22644 from edx/feanil/2to3_imports
Run `2to3 -f future . -w`
2019-12-30 11:21:05 -05:00
Manjinder Singh
2a6517ad27 Fixing typo 2019-12-30 10:42:35 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform.
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
2019-12-30 10:22:19 -05:00
Awais Qureshi
4d310438fa Merge pull request #22605 from edx/awais786/BOM-1117
BOM-1117
2019-12-30 20:15:00 +05:00
edX cache uploader bot
a6f374c90b Updating Bokchoy testing database cache (#22640) 2019-12-30 09:55:34 -05:00
Feanil Patel
52a1a72c97 Merge pull request #22636 from edx/jenkins/upgrade-python-requirements-c7c6242
Python Requirements Update
2019-12-30 09:16:30 -05:00
Jeremy Bowman
63574e12b8 Remove pytest version constraint (#22626)
Fix the issue that was preventing us from upgrading pytest.  pytest does some manipulation of test packages that prevents `pkg_resources` from loading resources from them, but used to contain a workaround for the problem.  That workaround was [removed](https://github.com/pytest-dev/pytest/issues/5392) in 4.6.0 as a performance enhancement when pytest switched from `pkg_resources` to `importlib-metadata` for its own entrypoint handling.  This tripped up one of our test modules which defined classes that loaded templates from inside a test package.  Moving these resources to the parent package fixes the problem.

More and more, `pkg_resources` is being abandoned in favor of `importlib-metadata` and `importlib_resources` as they have a simpler design with much better performance.  However, `importlib_resources` doesn't support loading files from any directory which isn't itself a Python package (and doesn't allow direct use of paths including directories within the package).  Jinja2 chose a [different approach](https://github.com/pallets/jinja/pull/1082) that we may want to emulate in our resource handling.

Also fixed usage of a removed `pytest.raises()` parameter and a bug in our configuration of the `common/lib` tests that became a problem after the upgrade.
2019-12-30 09:10:57 -05:00
Awais Qureshi
928a84f969 BOM-1117
Specifying a namespace in django.conf.urls.include() without providing an app_name is deprecated.
Adding the app_name attribute in the included module.
2019-12-30 18:08:21 +05:00
edX requirements bot
a05714e397 Updating Python Requirements 2019-12-30 05:48:38 -05:00
Awais Qureshi
c7c6242a0e Merge pull request #22617 from edx/awais786/BOM-1124
BOM-1124
2019-12-30 15:09:27 +05:00
Zainab Amir
257c635a68 Fix Targeted Feedback HTML (#22606)
etree.tostring returns bytes instead of string which when converted
back to XML, to be rendered as etree element, presents stray
characters.

PROD-1116
2019-12-30 15:06:02 +05:00
Zaman Afzal
c07268d1b5 Fix the broken privacy page link url on enterprise login page (#22528) 2019-12-30 14:57:28 +05:00
edX Transifex Bot
55cfc45a85 fix(i18n): update translations 2019-12-30 03:22:15 -05:00
Omar Al-Ithawi
99960d7001 Safer CourseOverview.org filed matching
Regular expressions are harder to read and debug
2019-12-30 11:01:50 +03:00
Awais Qureshi
804a84f9cf BOM-1124
Direct assignment to the forward side of a many-to-many set is deprecated Fixing this issue.
2019-12-28 00:04:15 +05:00
Matthew Piatetsky
2775b67787 Set discount on order based on discount that was on basket 2019-12-27 11:53:56 -05:00
Feanil Patel
0fd3c84889 Merge pull request #22624 from edx/feanil/remove_screenshots
Remove unused screenshots.
2019-12-27 11:22:34 -05:00
Feanil Patel
59808c82f1 Merge pull request #22611 from edx/feanil/fix_mathjax_bug
Don't try to typset mathjax if Hub has not loaded.
2019-12-27 11:22:22 -05:00
Jeremy Bowman
0cb7539999 Python dependencies cleanup (#22612) 2019-12-27 11:00:46 -05:00
Feanil Patel
f0fdb18d64 Remove unused screenshots. 2019-12-27 10:51:11 -05:00