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

17221 Commits

Author SHA1 Message Date
edX cache uploader bot
2b0d281ecf Updating Bokchoy testing database cache (#21438) 2019-08-23 16:49:02 -04:00
edX cache uploader bot
774f02d267 Updating Bokchoy testing database cache (#21434) 2019-08-23 11:13:14 -04:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
edX cache uploader bot
f6b56edbb5 Updating Bokchoy testing database cache (#21401) 2019-08-21 13:09:06 -04:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Feanil Patel
fde27196f9 Fix quality issues. 2019-08-20 18:02:30 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
edX cache uploader bot
be000cb8cd Updating Bokchoy testing database cache (#21379) 2019-08-20 11:29:33 -04:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues 
Fix a few issues we run into when running tests in python 3.
 2019-08-20 11:28:23 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
Dave St.Germain
aaf7ddd3f3 Correctly encode and decode 2019-08-19 16:08:38 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Dave St.Germain
e64c61160e Iterating dictionaries 2019-08-19 14:54:03 -04:00
Nimisha Asthagiri
d564af8301 Fix for decode errors in bulk_email.tests.test_course_optout.py 2019-08-19 14:26:48 -04:00
Jeremy Bowman
97c0684755 Cleaner fix for byte conversion in from_xml 2019-08-19 14:26:08 -04:00
Diana Huang
eaec9febb4 Merge pull request #21355 from edx/diana/microsite-deletion-migrations 
Deletion migration for microsites tables.
 2019-08-19 13:34:44 -04:00
Ned Batchelder
f17f9d3862 All of the fall 2012 courses have been imported by now. 2019-08-19 12:43:09 -04:00
David Ormsbee
95a4e9ba3c Fix BlockTransformer Py3 issues (#21376) 
Django's reverse can handle Unicode for arguments.
 2019-08-19 12:16:39 -04:00
Nimisha Asthagiri
b97db5aa86 Fix encode before calling md4 hash in common/djangoapps/util/memcache.py 2019-08-19 11:51:05 -04:00
Feanil Patel
085b6b9468 Fix runtime error where dict is modified during iteration. 2019-08-19 11:16:29 -04:00
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Zainab Amir
db67a212e8 Remove create_user management command (#21322) 
Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934
 2019-08-17 13:50:58 +05:00
Diana Huang
3455ff7393 Deletion migration for microsites tables. 2019-08-16 16:30:01 -04:00
Feanil Patel
46b730a9a0 reload is not a system built-in in python 3. 
If we're in python 3 import reload from importlib.
 2019-08-16 15:20:10 -04:00
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340) 
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
 2019-08-16 11:31:36 -04:00
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites 
Remove microsite djangoapp and configuration.
 2019-08-16 10:55:56 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
edx-pipeline-bot
e585e0bdf2 Merge pull request #21348 from edx/private_to_public_c74331e 
Mergeback PR from private to public.
 2019-08-16 14:43:47 +05:00
Awais Jibran
c74331e16e Merge pull request #158 from edx/ormsbee/sec_609_customtag_fix 
Make CustomTagModule safe (remove Mako) [SEC-609]
 2019-08-16 13:52:51 +05:00
DawoudSheraz
103a825d51 added DnD submission deadline acceptance tests 2019-08-16 09:50:56 +05:00
Manjinder Singh
65b858e3e7 Merge pull request #21209 from edx/msingh/discussion_topic_validation2 
PROD-145: Added validation to discussion topic input in studio, testing 2
 2019-08-15 19:53:17 -04:00
jinder1s
e7fb13a74f Added validation to discussion topic input in studio 2019-08-15 16:13:37 -04:00
edX Transifex Bot
a6526a8874 geoip2: update maxmind geolite country database 2019-08-14 17:01:43 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329) 
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
 2019-08-12 16:55:05 -04:00
Feanil Patel
890e119951 Remove import of nested. 
We stopped using it but forgot to remove it from the import.
 2019-08-12 14:34:48 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
aarif
4da4749f84 removed bulk_assertions context manager 
removed usages of bulk_assertion

changes made to comply quality failure

removing test-bulk assertions.
 2019-08-10 12:27:23 +05:00