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

51804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
95fb0f11f8 Merge pull request #21948 from edx/awais786/BOM-861 
BOM-861
 2019-10-08 17:36:53 +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
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
DawoudSheraz
aeeb76edd0 add information for missing annotation fields 2019-10-07 10:55:11 +05:00
edX Transifex Bot
855e973b37 fix(i18n): update translations 2019-10-06 17:18:17 -04:00
Feanil Patel
e5361038ff Merge pull request #21936 from edx/jenkins/upgrade-python-requirements-42ec910 
Python Requirements Update
 2019-10-04 14:39:39 -04:00
Calen Pennington
6c73361cf5 Merge pull request #21565 from cpennington/content-highlight-warning 
Downgrade content-highlights mismatches to warnings, and add the cour…
 2019-10-04 11:06:56 -04:00
Calen Pennington
c664fed716 Merge pull request #21928 from cpennington/absolute-path-bokchoy-uploads 
Use absolute paths to upload files in more bokchoy tests
 2019-10-04 10:36:08 -04:00
Calen Pennington
9a800fb180 Downgrade content-highlights mismatches to warnings, and add the course-key to the error message 2019-10-04 10:35:03 -04:00
Calen Pennington
5734e79b5d Use absolute paths to upload files in more bokchoy tests 2019-10-04 10:10:11 -04:00
edX requirements bot
ff1e18f358 Updating Python Requirements 2019-10-04 06:48:29 -04:00
Ayub
42ec910e07 Merge pull request #21922 from edx/BOM-788 
BOM-788
 2019-10-04 15:07:36 +05:00
Ayub
0b82a59db4 Merge pull request #21925 from edx/BOM-893 
BOM-893
 2019-10-04 11:23:40 +05:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
Stu Young
7de7bcb398 Revert "Upgrade edx-lint" (#21930) 2019-10-03 16:23:44 -04:00
Diana Huang
3599ee3878 Merge pull request #21912 from edx/diana/remove-notes 
Remove notes app and remaining js.
 2019-10-03 12:57:32 -04:00
Manjinder Singh
2213f524cf Merge pull request #21899 from edx/msingh/python3_test_parser_py 
BOM-749: Explicity creating byte strings
 2019-10-03 11:57:15 -04:00
Stu Young
31859fb930 remove flaky test (#21871) 2019-10-03 09:57:50 -04:00
adeelehsan
7908808911 Configuration model added for bulk unenroll command 
Users information will be available in model as csvfile

Prod-655
 2019-10-03 16:33:13 +05:00
Ayub khan
09843b993c BOM-893 
python3 compatibility: regex needs bytes type strings to check bytes type response
 2019-10-03 15:54:04 +05:00
Ayub khan
277afeb85e BOM-788 
python3 compatibility: etree returns a bytes type string so in py3 we need to decode it
to compare with a unicode string
 2019-10-03 15:26:36 +05:00
Aarif
8cf25ea81a Merge pull request #21883 from edx/BOM-874 
Updated the division operation to make the output compatible with both python versions - BOM-874
 2019-10-03 12:40:19 +05:00
Aarif
767a0a3a19 Merge pull request #21853 from edx/BOM-840 
BOM-840
 2019-10-03 11:19:14 +05:00
edX Transifex Bot
df6f54da9a geoip2: update maxmind geolite country database 2019-10-02 17:03:28 -04:00
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Diana Huang
c10292bc4a Merge pull request #21900 from edx/diana/notes-removal-migrations 
Drop notes tables.
 2019-10-02 14:46:30 -04:00