Commit Graph

3684 Commits

Author SHA1 Message Date
Feanil Patel
ef96137ca0 Merge branch 'master' into release-mergeback-to-master 2019-10-10 13:30:33 -04:00
Feanil Patel
7dd7f2344b Merge commit 'bbadf48b8e19a0c9f1e1ca750f5ad8b26856bcc1' into feanil/merge_more_of_master
Sorry for the merge commits but release was in a really bad state and so
we need to get changes out piecemeal on the release-candidate.

Slowly mergig master into RC.
2019-10-10 10:36:56 -04:00
zamanafzal
b52b4d09ea bump edx enterprise version to 2.0.3 2019-10-10 11:54:38 +05:00
Feanil Patel
5d7bdf91b1 Revert requirements changes due to memory issues.
Some change in the requirements here may be responsible for increased
CPU and memory usage.  This is causing production LMS for edx.org to run
into lots of performance issues.  Reverting for now until we can narrow
it down to which change caused the issue.
2019-10-09 16:47:26 -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
Waheed Ahmed
6d53ee98c2 Bump up version for xblock-lti-consumer.
PROD-744
2019-10-09 16:12:08 +05: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
Awais Qureshi
e76180cd8d BOM-470
run upgrade to update the dragndrop version.
2019-10-08 17:12:27 +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
Chris Pappas
96aa11d9d3 Bumping edx-enterprise to 2.0.1 (#21944) 2019-10-07 12:50:01 -04: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
edX requirements bot
ff1e18f358 Updating Python Requirements 2019-10-04 06:48:29 -04: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
Calen Pennington
b70d8e68c5 Merge pull request #21870 from cpennington/upgrade-edx-lint
Upgrade edx-lint
2019-10-01 14:56:20 -04:00
Calen Pennington
86be8d124a Upgrade edx-lint 2019-10-01 14:00:54 -04:00
root
a9564a622d Version upgrade for edx-enterprise 2019-10-01 14:18:28 +00:00
edX requirements bot
86c3843105 Updating Python Requirements 2019-09-30 06:55:44 -04:00
Simon Chen
59168c75af upgrade proctoring library 2019-09-27 13:32:48 -04:00
Matt Hughes
6085852c99 Attribute grade overrides from proctoring to the final reviewer
More generally, makes it so we don't ever pull in the user to whom
we're attributing overrides from the request, but always use the one
passed in via method parameters

Also pass through comments, if they're provided via this method

JIRA:EDUCATOR-4641
2019-09-27 10:58:58 -04:00
edX requirements bot
a91fcfceed Updating Python Requirements (#21807) 2019-09-27 10:04:44 -04:00
Ned Batchelder
bcc09a0148 Use edx-sga that has also been fixed 2019-09-26 10:53:55 -04:00
Alex Dusenbery
30655847f9 Upgrade django-user-tasks==0.2.1 2019-09-25 15:22:01 -04:00
Diana Huang
e80265bb9a Remove shoppingcart pdf generation.
DEPR-40
2019-09-25 09:07:09 -04:00
edX requirements bot
1cc925b624 Updating Python Requirements (#21771) 2019-09-25 09:06:00 -04:00
Alex Dusenbery
60fa989a39 edx-bulk-grades==0.6.4 2019-09-24 18:08:03 -04:00
Alex Dusenbery
07cf13ceae EDUCATOR-4638 | edx-bulk-grades==0.6.3 - make sure we pass a user_id attribute into GradeCSVProcessor.__init__() 2019-09-24 12:26:40 -04:00
Feanil Patel
4b64a44c3a Merge pull request #21736 from edx/feanil/update_for_py3_fixes
Feanil/update for py3 fixes
2019-09-24 11:23:20 -04:00
Feanil Patel
35cb40859d Update dependencies to pull in python3 fixes. 2019-09-24 10:41:56 -04:00
edX requirements bot
76d7270fe9 Updating Python Requirements (#21756) 2019-09-24 10:39:54 -04:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
Feanil Patel
9633e3cd1a Pull the recommender xblock from PyPI. 2019-09-23 11:52:26 -04:00
Alex Dusenbery
a379dddc1e Remove faker==2.0.1 constraint; upgrade edx-bulk-grades to 0.6.2 2019-09-23 11:38:19 -04:00
edX requirements bot
04aa8fb7fd Updating Python Requirements 2019-09-20 06:49:36 -04:00
Thomas Tracy
b0d731b829 Version bump 2019-09-19 15:39:27 -04:00
Jansen Kantor
b0f40a111c add requesting_user to simple-history model (#21683) 2019-09-19 13:43:35 -04:00
edX requirements bot
3dee5a5aac Updating Python Requirements 2019-09-19 06:48:26 -04:00
Ned Batchelder
71ce73d98e Merge pull request #21207 from edx/nedbat/api-docs
REST API docs
2019-09-18 16:42:10 -04:00
Ned Batchelder
bd207d47fc make upgrade 2019-09-17 17:37:20 -04:00
Ned Batchelder
de0afbfe96 Pin faker to get a consistent version for text-unidecode 2019-09-17 17:37:12 -04:00
Ned Batchelder
71e5faf307 make upgrade 2019-09-17 16:53:48 -04:00
Ned Batchelder
cdac1f4abb Doc tooling for static API docs 2019-09-17 16:53:07 -04:00
Feanil Patel
94cf0d3db8 Run make upgrade 2019-09-17 10:44:36 -04:00
Feanil Patel
dc99d61b9c pip-tools 4.x seems to have made this less of a problem.
Issue 851 seems to have been resolved and issue 8.5.2 while still open is
not occuring with the latest version of pip-tools.
2019-09-17 10:27:16 -04:00
Douglas Hall
bd4db303d6 Upgrading various packages. (#21674) 2019-09-16 18:27:24 -04:00
Braden MacDonald
ec97387d3e Move new Blockstore key types to external opaque-keys library. 2019-09-13 09:56:44 -07:00
Kyle McCormick
1eb6c884bb Upgrade requirements, specifically ora2==2.3.1
PR #21614 made this upgrade, but it was accidentally
undone by a later PR that merged an out-of-date
'make upgrade'.

EDUCATOR-4635
2019-09-12 17:05:22 -04:00
Feanil Patel
dfe77a968e Remove the mongo plugin for the djnago-debug-toolbar.
We are currently running this plugin from a has directly off of master
to get support for a newer version of DJDT.  However even on master
there is not yet support for python 3.  We're running into this when
running runserver and when collecting static assets.

A quick survey of the development team at edX shows that people are no
longer actively using this debug panel.(14 responders all saying no to
the question "In the last year have you used the mongo portion of the
django-debug-toolbar in edx-platform?")

This makes sense since the module store and courseware related
developement is not very active right now.  Given all this, I'm removing
this toolbar for now and if we need it again we can survey what's
available at that time to choose the best tool.
2019-09-12 10:18:46 -04:00