Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into EDUCATOR-926

Browse Source
This commit is contained in:
Tyler Hallada
2017-08-09 11:22:05 -04:00
committed by GitHub
parent 4953cf30d9 7f32e03dd2
commit 623ea5eb40
272 changed files with 10826 additions and 5553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
requirements/edx/base.txt
View File

@@ -16,31 +16,30 @@ dealer==2.0.4
defusedxml==0.4.1
django-babel-underscore==0.5.1
markey==0.8 # From django-babel-underscore
django-celery==3.2.1
django-config-models==0.1.8
django-countries==4.0
django-extensions==1.5.9
django-filter==1.0.4
django-ipware==1.1.0
django-model-utils==2.3.1
django-mptt==0.7.4
django-mptt>=0.8.6,<0.9
django-oauth-plus==2.2.8
django-oauth-toolkit==0.12.0
django-pipeline-forgiving==1.0.0
django-pyfs==1.0.6
django-sekizai==0.8.2
django-sekizai>=0.10
django-ses==0.7.1
django-simple-history==1.6.3
django-statici18n==1.4.0
django-storages==1.4.1
django-method-override==0.1.0
django-user-tasks==0.1.4
django-user-tasks==0.1.5
django==1.8.18
django-waffle==0.12.0
djangorestframework-jwt==1.11.0
enum34==1.1.6
edx-ccx-keys==0.2.1
edx-celeryutils==0.2.4
edx-celeryutils==0.2.6
edx-drf-extensions==1.2.3
edx-i18n-tools==0.3.9
edx-lint==0.4.3
@@ -49,14 +48,14 @@ edx-lint==0.4.3
astroid==1.3.8
edx-django-oauth2-provider==1.1.4
edx-django-sites-extensions==2.3.0
edx-enterprise==0.39.1
edx-enterprise==0.39.9
edx-oauth2-provider==1.2.0
edx-opaque-keys==0.4.0
edx-organizations==0.4.5
edx-rest-api-client==1.7.1
edx-search==1.1.0
edx-submissions==2.0.5
edxval==0.1.0
edx-submissions==2.0.9
edxval==0.1.1
event-tracking==0.2.4
facebook-sdk==0.4.0
feedparser==5.1.3
@@ -68,7 +67,7 @@ help-tokens==1.0.3
httpretty==0.8.3
lazy==1.1
mako==1.0.2
Markdown==2.2.1
Markdown>=2.6,<2.7
--allow-external meliae
--allow-unverified meliae
meliae==0.4.0
@@ -104,13 +103,13 @@ scipy==0.14.0
Shapely==1.2.16
singledispatch==3.4.0.2
six>=1.10.0,<2.0.0
sorl-thumbnail==12.3
sorl-thumbnail>=12.3,<13
sortedcontainers==0.9.2
stevedore==1.10.0
sure==1.2.3
sympy==0.7.1
xmltodict==0.4.1
django-ratelimit-backend==1.0
django-ratelimit-backend==1.1.1
unicodecsv==0.14.1
django-require==1.0.11
django-webpack-loader==0.4.1
@@ -149,7 +148,7 @@ ipaddr==2.1.11
django-cors-headers==1.1.0
# Debug toolbar
django_debug_toolbar==1.5
django_debug_toolbar==1.8
sqlparse>=0.2.0,<0.3.0
# Used for testing

2
requirements/edx/edx-private.txt
View File

@@ -8,7 +8,7 @@
# For Harvard courses:
-e git+https://github.com/gsehub/xblock-mentoring.git@4d1cce78dc232d5da6ffd73817b5c490e87a6eee#egg=xblock-mentoring
git+https://github.com/open-craft/problem-builder.git@v2.6.5#egg=xblock-problem-builder==2.6.5
git+https://github.com/open-craft/problem-builder.git@v2.6.10#egg=xblock-problem-builder==2.6.10
# Oppia XBlock
-e git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock

8
requirements/edx/github.txt
View File

@@ -47,7 +47,7 @@
# Third-party:
git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline==1.5.3
git+https://github.com/edx/django-wiki.git@v0.0.10#egg=django-wiki==0.0.10
git+https://github.com/edx/django-wiki.git@v0.0.11#egg=django-wiki==0.0.11
git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8
git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0
git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6
@@ -76,11 +76,15 @@ git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc8685
# This dependency will be removed by this work: https://openedx.atlassian.net/browse/PLAT-1660
git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1
# Why a django-celery fork? To add Django 1.11 compatibility to the abandoned repo.
# This dependency will be removed by the Celery 4 upgrade: https://openedx.atlassian.net/browse/PLAT-1684
git+https://github.com/edx/django-celery.git@f87c6f914a1410463f54aebf68458c0653b20602#egg=django-celery==3.2.1+edx.1
# Our libraries:
-e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail==0.0
-e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2
-e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock
git+https://github.com/edx/edx-ora2.git@1.4.8#egg=ora2==1.4.8
git+https://github.com/edx/edx-ora2.git@1.4.11#egg=ora2==1.4.11
git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3
git+https://github.com/edx/RecommenderXBlock.git@0e744b393cf1f8b886fe77bc697e7d9d78d65cd6#egg=recommender-xblock==1.2
git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1