Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,747 Commits 1 Branch 0 Tags
db30d8f447bdb21d72acc8cbb354fe3980eebe4d
Commit Graph

52747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
David Ormsbee
a8992a16dd Merge pull request #21610 from open-craft/samuel/test-oauth2 
SE-1071 send user_logged_in signal from my_user_info
 2019-12-27 10:34:44 -05:00
Feanil Patel
1b1de5c1ab Merge pull request #22618 from open-craft/giovanni/remove-python3-flaky-test 
BB-1744: Remove flaky test related to MockS3Mixin [FOLLOW-UP]
 2019-12-27 10:34:28 -05:00
Feanil Patel
99e31ab4ae Merge pull request #22610 from edx/feanil/remove_unused_static 
We don't need this anymore.
 2019-12-27 10:28:30 -05:00
edX cache uploader bot
1cbe81f747 Updating Bokchoy testing database cache (#22614) 2019-12-27 09:19:10 -05:00
Giovanni Cimolin da Silva
d1aeec45ad Remove flaky test related to MockS3Mixin 
The MockS3Mixin prevents the correct setup of the ModuleStoreTestCase 
and made this test fail. Since the fix for this wasn't trivial, this 
test was skipped on python 3, and now is removed.
 2019-12-27 09:59:25 -03:00
Samuel Walladge
c0b908e02d send user_logged_in signal from my_user_info 
A user's last logged in value previously wasn't updated when the user
logs in through the oauth2 flow from the ios mobile app. Here we must
send the user_logged_in signal manually. It's implemented in the
my_user_info mobile rest api endpoint because adding it to where the
oauth2 flow happens is to complex, and the mobile app hits this endpoint
after a successful login anyway.
 2019-12-27 09:37:22 +10:30
edX cache uploader bot
fe1f69741e Updating Bokchoy testing database cache (#22608) 2019-12-26 16:39:55 -05:00
Jeremy Bowman
673592d89b Switch xblock-poll back to source repo (#22597) 2019-12-26 16:38:48 -05:00
Feanil Patel
ff40369990 Don't try to typset mathjax if Hub has not loaded. 
In our tests there are times when Mathjax has been initialized but
Hub is still undefied.  In this case don't queue up typesetting.
 2019-12-26 16:13:58 -05:00
Feanil Patel
979e7ea653 Merge pull request #21128 from edx/feanil/py3-canary 
Make a change to cause tests to run.
 2019-12-26 15:25:26 -05:00
Feanil Patel
ae842fd250 We don't need this anymore. 
They were created to work with a service that no longer exists.
 2019-12-26 15:23:02 -05:00
Jeremy Bowman
b2046f6674 Switch make upgrade to Python 3.5 (#22609) 
* Switch make upgrade to Python 3.5

* bok-choy fixes, constrain django-debug-toolbar

* Remove flaky bok-choy test
 2019-12-26 15:13:02 -05:00
David Ormsbee
10cc7895bd Merge pull request #22607 from appsembler/omar-matej/fix-image-ratio-studio 
fix uploaded image aspect ratio in tinymce
 2019-12-26 12:33:27 -05:00
Feanil Patel
f359c9cd8f Merge pull request #21197 from open-craft/giovanni/upgrade-pymongo 
BB-1744: Bump pymongo version and fix course export issue
 2019-12-26 11:16:15 -05:00
David Ormsbee
a4b64c3a79 Merge pull request #21166 from open-craft/guruprasad/fix-courseenrollment-mode-default 
[BB-1506] Use a callable as the default value for CourseEnrollment.mode
 2019-12-26 10:25:27 -05:00
Matej Grozdanović
4b2bf9c4ac fix uploaded image aspect ratio in tinymce 2019-12-26 16:39:39 +03:00
Awais Qureshi
9bae9c0f55 Merge pull request #22595 from edx/awais786/BOM-1111 
BOM-1111
 2019-12-23 21:29:46 +05:00
Alan Zarembok
4b727ef5e9 Merge pull request #22590 from edx/azarembok/fix-retry-verifications 
PROD-1113: Fix retry_failed_photo_verifications.
 2019-12-23 11:25:27 -05:00
edX requirements bot
033bb5a3c4 Updating Python Requirements (#22594) 2019-12-23 10:08:29 -05:00
Awais Qureshi
5f6b2db31b BOM-1111 
Updating User.is_authenticated and User.is_anonymous as properties
 2019-12-23 17:51:27 +05:00
adeel khan
91bb648d11 Merge pull request #22593 from edx/adeel/prod_1076_html_editor_error 
Fix html editor for adding �
 2019-12-23 16:46:51 +05:00
Adeel Khan
51da469762 Fix html editor for adding � 
This patch would fix html editor
for adding � characters in
html attributes whenever cursor
is inside quotes. � characters
are added on save.

PROD-1076
 2019-12-23 15:47:48 +05:00
edX Transifex Bot
610ea4a5a4 fix(i18n): update translations 2019-12-22 16:26:53 -05:00