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

54119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andytr1
a911813153 Merge pull request #21387 from edx/andytr1/update_bulk_grades 
updated bulk grades version
 2019-08-20 14:31:37 -04:00
atesker
ff5f49b89f updated bulk grades version 2019-08-20 13:56:00 -04:00
Diana Huang
4a1949661d Merge pull request #21380 from edx/diana/microsite-removal 
Remove the microsites djangoapp.
 2019-08-20 13:52:31 -04:00
Christie Rice
abe12c89b8 ENT-1321 Upgrade requirements (#21386) 2019-08-20 12:49:45 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Awais Qureshi
3f3caba0da Merge pull request #21360 from edx/awais786/BOM-88 
BOM-88
 2019-08-20 20:51:32 +05: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
Feanil Patel
74904339dd Go from a courselocator to a unicode string. 
We don't need the ignore since courselocators sholud be
managing unicode already.
 2019-08-20 10:59:42 -04:00
arbisoft
44c798feb2 Fixing encode/decode issues for python3. 2019-08-20 14:10:37 +05:00
Chris Pappas
b22f08a414 Removing edx-enterprise from constraints and running make upgrade to bump version to 1.9.1 (#21377) 2019-08-19 17:32:46 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
3bb7d0f61a unicode -> text_type 2019-08-19 16:42:20 -04:00
Dave St.Germain
7a28bc8759 Response content is bytes 2019-08-19 16:39:09 -04:00
Dave St.Germain
c51db6c92d Must compare with bytes 2019-08-19 16:35:41 -04:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
Dave St.Germain
8e725c9eee Prevent comparison to None 2019-08-19 16:21:28 -04:00
Dave St.Germain
521cdbe309 Response content is bytes 2019-08-19 16:16:31 -04:00
Dave St.Germain
aaf7ddd3f3 Correctly encode and decode 2019-08-19 16:08:38 -04:00
Feanil Patel
5ea74e0282 Ensure that the course_id is unicode. 2019-08-19 15:28:37 -04:00
Dave St.Germain
eccfeef94b Convert from utf8 2019-08-19 15:13:37 -04:00
Matt Hughes
b897f58ae6 bug fix blocking gradebook 
JIRA:PROD-553
 2019-08-19 15:10:57 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Dave St.Germain
5ba4152cb6 Upgrade edx-val for python3 compatibility 2019-08-19 15:02:09 -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
Stu Young
b3556ba2ee use archived venv on jenkins (#21378) 2019-08-19 12:55:58 -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
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -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
Nimisha Asthagiri
1951d2eab8 Fix byte encoding of Grades hashes 2019-08-19 11:42:36 -04:00
Feanil Patel
7c8d9dd422 Downgrade edxval because 1.1.26 was never released to PyPI. 2019-08-19 11:28:41 -04:00
Feanil Patel
085b6b9468 Fix runtime error where dict is modified during iteration. 2019-08-19 11:16:29 -04:00
Feanil Patel
7a3230a260 Fix another discussions test. 2019-08-19 11:16:26 -04:00
Dave St.Germain
bc2e87db5c Update edx-val 2019-08-19 11:15:10 -04:00
Nimisha Asthagiri
38333624ac Fixes for test_retire_order.py 2019-08-19 11:06:00 -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
Feanil Patel
1367b0cf3d Move the unicode_compatible decorator to the class. 2019-08-19 11:00:25 -04:00
Feanil Patel
65eebe63e7 Hash byte strings. 2019-08-19 11:00:22 -04:00
Dave St.Germain
3275388276 Merge branch 'feanil/fix_cmp_issues' of github.com:edx/edx-platform into feanil/fix_cmp_issues 2019-08-19 10:54:46 -04:00
Dave St.Germain
0267b5c85f Fix issue of out of order calls 2019-08-19 10:54:39 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
Feanil Patel
1bfa575ada Update discussion api tests. 
json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.
 2019-08-19 10:48:30 -04:00
Ayub
4ba1792034 Merge pull request #21361 from edx/BOM-87 
BOM-87
 2019-08-19 19:43:57 +05:00
Nimisha Asthagiri
b80fd1f843 Fix for 'UUID' object has no attribute 'get_hex' in openedx/core/lib/xblock_utils/__init__.py 2019-08-19 10:36:43 -04:00
Dave St.Germain
063c6fa1e5 Reload has moved in python3 2019-08-19 10:35:08 -04:00