Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,831 Commits 1 Branch 0 Tags
5f8e59ccc8a9cc752d45bc3d76bd1aec9b9b29d7
Commit Graph

51831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manjinder Singh
5f8e59ccc8 Merge pull request #21901 from edx/msingh/python3_test_lti_stub_py 
BOM-749: Explicity byte strings
 2019-10-09 09:23:04 -04:00
Manjinder Singh
00348ec0a9 Merge pull request #21898 from edx/msingh/python3_test_views_py 
BOM-749: Explicity creating byte strings
 2019-10-09 08:52:06 -04:00
Manjinder Singh
a315317315 Merge branch 'master' into msingh/python3_test_lti_stub_py 2019-10-09 08:51:15 -04:00
jinder1s
d025657942 review fixes 2019-10-09 08:49:25 -04:00
Waheed Ahmed
1a01a6be3e Merge pull request #21967 from edx/waheed/PROD-744-upgrade-requirements 
Bump up version for xblock-lti-consumer.
 2019-10-09 17:45:38 +05:00
Aarif
442ae6fd29 Merge pull request #21917 from edx/BOM-889 
Updated the expected error message to make it compatible for both python versions - BOM-889
 2019-10-09 16:43:41 +05:00
Waheed Ahmed
6d53ee98c2 Bump up version for xblock-lti-consumer. 
PROD-744
 2019-10-09 16:12:08 +05:00
aarif
91bed37922 Updated the expected error message to get assertion successful for both python versions 
changes made as suggested
 2019-10-09 16:03:50 +05:00
Aarif
a383c7fdb8 Merge pull request #21886 from edx/BOM-867 
Updated the API to properly parse Query parameters to make it compatible with python 3 - BOM-867
 2019-10-09 15:41:05 +05:00
Aarif
6a2f3d6dbc Merge pull request #21866 from edx/BOM-831 
Updated the string input to md5 to make output compatible with both python versions - BOM-831
 2019-10-09 15:40:33 +05:00
Ayub
ea8a10e9d8 Merge pull request #21953 from edx/BOM-808 
BOM-808 struct is not defined
 2019-10-09 15:02:18 +05:00
Ayub khan
d1eb51bd71 BOM-808 struct is not defined 
python3 list comprehension variables are not accessible after comprehension
 2019-10-09 12:53:12 +05:00
Aarif
4c9aa43c2f Merge pull request #21924 from edx/BOM-813 
Updated the comparison operation to fix None comparison with an integer - BOM-813
 2019-10-09 12:07:13 +05:00
Feanil Patel
bbadf48b8e Merge pull request #21960 from edx/feanil/fix_more_cms_tests 
Feanil/fix more cms tests
 2019-10-08 15:48:54 -04:00
Feanil Patel
067d95f797 Fix transcript tests to be consistent. 2019-10-08 15:26:52 -04:00
Feanil Patel
92e06d52a6 Delete items by their asset_key instead of _id. 
The _id comes back as a dict and it's in the wrong order compared to the
dict stored in mongo.  This results in lookups for deletion failing when
we use the '_id' as the lookup key.

Luckily the delete function also takes the asset_key as a valid key to
delete by so we just use that instead.
 2019-10-08 15:26:52 -04:00
Feanil Patel
9610aab0f8 Fix more cms contentstore tests. 2019-10-08 15:26:52 -04:00
Feanil Patel
2d766e7b5d Skip tests that can't succeed in Python3 + Django 1.11 
There is a bug in the underlying management/base code that tries to make
all manageent command output be unicode.  This management command
outputs the binary tar file data and so breaks in python3.  In python2
the code is happy to pass bytes back and forth and in later versions of
django this is fixed.  Howevere it's not possible to get this test to
pass in Python3 and django 1.11
 2019-10-08 15:26:52 -04:00
Awais Qureshi
68137b19ec Merge pull request #21937 from edx/awais786/BOM-470-upgrade-drag-n-drp-ver 
BOM-470
 2019-10-08 23:31:20 +05:00
Chris Pappas
17475ec081 Running make upgrade to bump edx-enterprise (#21959) 2019-10-08 11:33:28 -04:00
edX cache uploader bot
c4995d91fd Updating Bokchoy testing database cache (#21952) 2019-10-08 10:30:09 -04:00
Awais Qureshi
95fb0f11f8 Merge pull request #21948 from edx/awais786/BOM-861 
BOM-861
 2019-10-08 17:36:53 +05:00
Awais Qureshi
e76180cd8d BOM-470 
run upgrade to update the dragndrop version.
 2019-10-08 17:12:27 +05:00
adeelehsan
8914d982e7 Merge pull request #21723 from edx/aehsan/prod-655/configuration_model_added_for_bulk_unenroll 
Configuration model added for bulk unenroll command
 2019-10-08 13:51:39 +05:00
Aarif
97452b31ae Merge pull request #21881 from edx/BOM-873 
Updated the division operation to make the output compatible with both python versions - BOM-873
 2019-10-08 13:41:15 +05:00
Aarif
4db48ae9b0 Merge pull request #21862 from edx/BOM-762 
BOM-762
 2019-10-08 13:40:12 +05:00
Awais Qureshi
9ed328879e BOM-861 
Dictionaries are being rendered into the HTML but in different order between python2 and python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-08 12:45:01 +05:00
Ayub
7537283048 Merge pull request #21935 from edx/BOM-capa-random-python3-combatibility 
BOM Project Capa Module Python3 Compatibility
 2019-10-08 11:11:02 +05:00
David Ormsbee
014040e877 Merge pull request #21947 from open-craft/fix-unicode-olx-bug 
Fix minor unicode OLX bug (Blockstore-based content libraries)
 2019-10-07 17:12:52 -04:00
Braden MacDonald
b7d1827017 Fix minor unicode OLX bug 2019-10-07 16:43:47 -04:00
Feanil Patel
847758a7da Merge pull request #21938 from edx/feanil/fix_contentstore_tests 
Feanil/fix contentstore views tests
 2019-10-07 16:21:42 -04:00
edX cache uploader bot
a9fd1d961f Updating Bokchoy testing database cache (#21934) 2019-10-07 13:55:56 -04:00
Feanil Patel
5a9a5ba918 Catch another place where we were passing in byte data into transcript conversion module. 2019-10-07 13:49:25 -04:00
Feanil Patel
ca705a2757 Encoding that was breaking import. 2019-10-07 13:49:25 -04:00
Feanil Patel
c9895477fd Import binary files an byte arrays. 2019-10-07 13:49:25 -04:00
Feanil Patel
ef27928e67 Decode content from django test client. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests. 
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
 2019-10-07 13:49:25 -04:00
Chris Pappas
96aa11d9d3 Bumping edx-enterprise to 2.0.1 (#21944) 2019-10-07 12:50:01 -04:00
Jeremy Bowman
71e9c85dca Fix capa problem i18n BOM-775 (#21832) 2019-10-07 11:19:49 -04:00
Feanil Patel
9c6e3ce383 Merge pull request #21942 from edx/jenkins/upgrade-python-requirements-9a8f0ce 
Python Requirements Update
 2019-10-07 11:16:06 -04:00
jinder1s
bd479292f7 quality fixes 2019-10-07 10:28:38 -04:00
jinder1s
93e11925ff Removing decoding due to it being done in another place 2019-10-07 10:27:55 -04:00
jinder1s
cb8d2f8a74 removing pdb 2019-10-07 10:27:55 -04:00
jinder1s
11284039a5 unicode sandwich 2019-10-07 10:27:55 -04:00
Awais Qureshi
7905640df2 Merge pull request #21927 from edx/awais786/BOM-866 
BOM-866
 2019-10-07 19:24:42 +05:00
Ayub khan
bb242c4b22 BOM Project Capa Module Python3 Compatibility 
Python3 RNG produces different results as compared to python2
In capa problems we save seed value and generate random state
using the seed. Python3 random generates a different state as
compared to python2. Thats why using random2 library to make
state genration consistent in both python versions.
 2019-10-07 16:39:47 +05:00
edX requirements bot
79b7a8d467 Updating Python Requirements 2019-10-07 06:48:37 -04:00
Awais Qureshi
79b00c9af4 BOM-866 
Dictionaries are being rendered into the HTML but in different order between python2 and python3 and failing tests in python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-07 15:00:41 +05:00
Aarif
9a8f0cee1d Merge pull request #21894 from edx/BOM-802 
Updated the comparison operation to calculate MongoDB's connection version - BOM-802
 2019-10-07 12:22:30 +05:00
Syed Muhammad Dawoud Sheraz Ali
f558bd7b0a Merge pull request #21872 from edx/dsheraz/PROD-760 
add information for missing annotation fields
 2019-10-07 11:22:58 +05:00