Commit Graph

50925 Commits

Author SHA1 Message Date
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
Feanil Patel
3c33f6c30f Fix another quality issue. 2019-08-21 07:44:06 -04:00
Aarif
acf3cb684d Merge pull request #21362 from edx/BOM-89
BOM-89 Fixed tests for python 3
2019-08-21 14:00:22 +05:00
Syed Muhammad Dawoud Sheraz Ali
b710a046a3 Merge pull request #21393 from edx/revert-21209-msingh/discussion_topic_validation2
Revert "PROD-145: Added validation to discussion topic input in studio, testing 2"
2019-08-21 12:47:38 +05:00
aarif
3ff6d1b942 changes made to fix failing tests for python 3
changes made to fix failing tests for python 3

minor changes

minor changes

changes made to fix failing tests for python 3

changes made to fix failing tests for python 3

minor changes

minor changes
2019-08-21 12:14:53 +05:00
edX Transifex Bot
d8a9e9305d fix(i18n): update translations 2019-08-21 02:59:09 -04: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
Matt Hughes
0ad8753cd6 Add waffle for hiding bulk management in masters courses 2019-08-20 16:32:13 -04:00
Chris Pappas
c3da1374bf Running make upgrade to bump edx-enterprise (#21390) 2019-08-20 16:02:19 -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
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