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

Merge pull request #23221 from edx/diana/remove-dop-libraries

Browse Source 
Remove DOP libraries from INSTALLED_APPS.
This commit is contained in:
Diana Huang
2020-03-02 13:34:12 -05:00
committed by GitHub
parent ae0c051e9e 0024f00195
commit 1d5acb9d21
14 changed files with 37 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/envs/common.py
View File

@@ -1357,11 +1357,6 @@ INSTALLED_APPS = [
# Catalog integration
'openedx.core.djangoapps.catalog',
# django-oauth2-provider (deprecated)
'provider',
'provider.oauth2',
'edx_oauth2_provider',
# django-oauth-toolkit
'oauth2_provider',

13
common/djangoapps/third_party_auth/migrations/0001_initial.py
View File

@@ -11,7 +11,6 @@ class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('oauth2', '0001_initial'),
]
operations = [
@@ -59,18 +58,6 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Provider Configuration (OAuth)',
},
),
migrations.CreateModel(
name='ProviderApiPermissions',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('provider_id', models.CharField(help_text=u'Uniquely identify a provider. This is different from backend_name.', max_length=255)),
('client', models.ForeignKey(to='oauth2.Client', on_delete=models.CASCADE)),
],
options={
'verbose_name': 'Provider API Permission',
'verbose_name_plural': 'Provider API Permissions',
},
),
migrations.CreateModel(
name='SAMLConfiguration',
fields=[

15
common/test/db_fixtures/oauth.json
View File

@@ -1,15 +0,0 @@
[
{
"fields": {
"client_id": "test-id",
"client_secret": "test-secret",
"client_type": 0,
"name": "Test OAuth2 Client",
"redirect_uri": "http://does-not-exist/",
"url": "http://does-not-exist/",
"user": null
},
"model": "oauth2.client",
"pk": 3
}
]

15
common/test/db_fixtures/programs_client.json
View File

@@ -1,15 +0,0 @@
[
{
"pk": 2,
"model": "oauth2.client",
"fields": {
"name": "programs",
"url": "http://example.com/",
"client_type": 1,
"redirect_uri": "http://example.com/welcome",
"user": null,
"client_id": "programs-client-id",
"client_secret": "programs-client-secret"
}
}
]

19
lms/envs/common.py
View File

@@ -560,20 +560,6 @@ OPENID_PROVIDER_TRUSTED_ROOTS = ['cs50.net', '*.cs50.net']
OAUTH_OIDC_ISSUER = 'http://127.0.0.1:8000/oauth2'
# OpenID Connect claim handlers
OAUTH_OIDC_ID_TOKEN_HANDLERS = (
'edx_oauth2_provider.oidc.handlers.BasicIDTokenHandler',
'edx_oauth2_provider.oidc.handlers.ProfileHandler',
'edx_oauth2_provider.oidc.handlers.EmailHandler',
)
OAUTH_OIDC_USERINFO_HANDLERS = (
'edx_oauth2_provider.oidc.handlers.BasicUserInfoHandler',
'edx_oauth2_provider.oidc.handlers.ProfileHandler',
'edx_oauth2_provider.oidc.handlers.EmailHandler',
)
OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS = 365
OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS = 30
@@ -2293,11 +2279,6 @@ INSTALLED_APPS = [
# Student support tools
'support',
# django-oauth2-provider (deprecated)
'provider',
'provider.oauth2',
'edx_oauth2_provider',
# django-oauth-toolkit
'oauth2_provider',
'openedx.core.djangoapps.oauth_dispatch.apps.OAuthDispatchAppConfig',

70
lms/templates/provider/authorize.html
View File

@@ -1,70 +0,0 @@
## mako
<%page expression_filter="h"/>
<%!
from django.utils.translation import ugettext as _
from provider.templatetags.scope import scopes
from django.urls import reverse
from openedx.core.djangolib.markup import HTML, Text
%>
<%inherit file="../main.html"/>
<%block name="bodyclass">oauth2</%block>
<%block name="body">
<div class="authorization-confirmation">
% if not error:
<p>
${Text(_("{start_strong}{application_name}{end_strong} would like to access your data with the following permissions:")).format(
start_strong=HTML("<strong>"),
application_name=client.name,
end_strong=HTML("</strong>")
)}
</p>
<ul>
% for permission in scopes(oauth_data['scope']):
<li>
% if permission == "openid":
${_("Read your user ID")}
% elif permission == "profile":
${_("Read your user profile")}
% elif permission == "email":
${_("Read your email address")}
% elif permission == "course_staff":
${_("Read the list of courses in which you are a staff member.")}
% elif permission == "course_instructor":
${_("Read the list of courses in which you are an instructor.")}
% elif permission == "permissions":
${_("To see if you are a global staff user")}
% else:
${_("Manage your data: {permission}").format(permission=permission)}
% endif
</li>
% endfor
</ul>
<form method="post" action="${reverse('oauth2:authorize')}">
${form.errors}
${form.non_field_errors()}
<fieldset>
<div style="display: none;">
<select type="select" name="scope" multiple="multiple">
% for scope in scopes(oauth_data['scope']):
<option value="${scope}" selected="selected">${scope}</option>
% endfor
</select>
</div>
<input type="submit" class="btn login large danger" name="cancel" value="Cancel" />
<input type="submit" class="btn login large primary" name="authorize" value="Authorize" />
</fieldset>
<input type="hidden" id="csrf_token" name="csrfmiddlewaretoken" value="${csrf_token}" />
</form>
% else:
<p class="error">
${error}
${error_description}
</p>
% endif
</div>
</%block>

6
lms/urls.py
View File

@@ -836,14 +836,10 @@ if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
# These URLs dispatch to django-oauth-toolkit or django-oauth2-provider as appropriate.
# Developers should use these routes, to maintain compatibility for existing client code
url(r'^oauth2/', include('openedx.core.djangoapps.oauth_dispatch.urls')),
# These URLs contain the django-oauth2-provider default behavior. It exists to provide
# URLs for django-oauth2-provider to call using reverse() with the oauth2 namespace, and
# also to maintain support for views that have not yet been wrapped in dispatch views.
url(r'^oauth2/', include(('edx_oauth2_provider.urls', 'edx_oauth2_provider'), namespace='oauth2')),
# The /_o/ prefix exists to provide a target for code in django-oauth-toolkit that
# uses reverse() with the 'oauth2_provider' namespace. Developers should not access these
# views directly, but should rather use the wrapped views at /oauth2/
url(r'^_o/', include(('oauth2_provider.urls', 'edx_oauth2_provider'), namespace='oauth2_provider')),
url(r'^_o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
]

3
requirements/constraints.txt
View File

@@ -79,3 +79,6 @@ wrapt==1.11.*
# zipp 2.0.0 requires Python >= 3.6
zipp==1.0.0
# It seems like django-countries > 5.5 may cause performance issues for us.
django-countries==5.5

2
requirements/edx-sandbox/py35.txt
View File

@@ -11,7 +11,7 @@ cffi==1.14.0 # via -r requirements/edx-sandbox/shared.txt, cryptogr
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx-sandbox/py35.in
cryptography==2.8 # via -r requirements/edx-sandbox/shared.txt
cycler==0.10.0 # via matplotlib
decorator==4.4.1 # via networkx
decorator==4.4.2 # via networkx
kiwisolver==1.1.0 # via matplotlib
lxml==4.5.0 # via -r requirements/edx-sandbox/shared.txt
markupsafe==1.1.1 # via chem

2
requirements/edx/base.in
View File

@@ -71,14 +71,12 @@ edx-bulk-grades # LMS REST API for managing bulk grading ope
edx-ccx-keys
edx-celeryutils
edx-completion
edx-django-oauth2-provider
edx-django-release-util # Release utils for the edx release pipeline
edx-django-sites-extensions
edx-django-utils
edx-drf-extensions
edx-enterprise
edx-milestones
edx-oauth2-provider
edx-organizations
edx-proctoring>=2.0.1
edx-proctoring-proctortrack==1.0.5 # Intentionally and permanently pinned to ensure code changes are reviewed

19
requirements/edx/base.txt
View File

@@ -50,7 +50,7 @@ git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb
cryptography==2.8 # via -r requirements/edx/../edx-sandbox/shared.txt, django-fernet-fields, edx-enterprise
cssutils==1.0.2 # via pynliner
ddt==1.2.2 # via xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.1 # via pycontracts
decorator==4.4.2 # via pycontracts
defusedxml==0.5.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/github.in, django-statici18n
django-babel-underscore==0.5.2 # via -r requirements/edx/base.in
@@ -59,7 +59,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
django-classy-tags==1.0.0 # via django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/base.in, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-countries==5.5 # via -r requirements/edx/base.in, edx-enterprise
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.in, edx-enterprise
django-filter==2.2.0 # via -r requirements/edx/base.in, edx-enterprise
@@ -85,7 +85,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/base.in
django-waffle==0.18.0 # via -r requirements/edx/base.in, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/base.in, edx-proctoring
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-oauth2-provider, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-jwt==1.11.0 # via -r requirements/edx/base.in, edx-drf-extensions
djangorestframework-xml==1.4.0 # via edx-enterprise
djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
@@ -99,7 +99,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/base.in, staff-graded-xblock
edx-ccx-keys==1.0.0 # via -r requirements/edx/base.in
edx-celeryutils==0.3.2 # via -r requirements/edx/base.in, super-csv
edx-completion==3.1.1 # via -r requirements/edx/base.in
edx-django-oauth2-provider==1.3.5 # via -r requirements/edx/base.in, edx-oauth2-provider, edx-organizations, edxval
edx-django-release-util==0.3.6 # via -r requirements/edx/base.in
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in
edx-django-utils==3.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
@@ -107,9 +106,8 @@ edx-drf-extensions==3.0.0 # via -r requirements/edx/base.in, edx-completion, ed
edx-enterprise==2.4.1 # via -r requirements/edx/base.in
edx-i18n-tools==0.5.0 # via ora2
edx-milestones==0.2.6 # via -r requirements/edx/base.in
edx-oauth2-provider==1.3.1 # via -r requirements/edx/base.in
edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule
edx-organizations==3.0.0 # via -r requirements/edx/base.in
edx-organizations==4.0.0 # via -r requirements/edx/base.in
edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.in
edx-proctoring==2.3.0 # via -r requirements/edx/base.in, edx-proctoring-proctortrack
edx-rbac==1.1.0 # via edx-enterprise
@@ -120,7 +118,7 @@ edx-submissions==3.0.4 # via -r requirements/edx/base.in, ora2
edx-tincan-py35==0.0.5 # via edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.in
edx-when==1.0.2 # via -r requirements/edx/base.in, edx-proctoring
edxval==1.2.3 # via -r requirements/edx/base.in
edxval==1.2.4 # via -r requirements/edx/base.in
elasticsearch==1.9.0 # via edx-search
enum34==1.1.9 # via edxval
event-tracking==0.3.0 # via -r requirements/edx/base.in, edx-proctoring, edx-search
@@ -178,7 +176,7 @@ paver==1.3.4 # via -r requirements/edx/paver.txt
pbr==5.4.4 # via -r requirements/edx/paver.txt, stevedore
pdfminer.six==20200124 # via -r requirements/edx/base.in
piexif==1.1.3 # via -r requirements/edx/base.in
pillow==7.0.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations, edxval
pillow==7.0.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations
pkgconfig==1.5.1 # via xmlsec
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils, edx-drf-extensions
@@ -190,7 +188,7 @@ pycryptodome==3.9.7 # via pdfminer.six
pycryptodomex==3.9.7 # via -r requirements/edx/base.in, edx-proctoring, pyjwkest
pygments==2.5.2 # via -r requirements/edx/base.in
pyjwkest==1.3.2 # via -r requirements/edx/base.in, edx-drf-extensions
pyjwt==1.5.2 # via -r requirements/edx/base.in, djangorestframework-jwt, edx-oauth2-provider, edx-rest-api-client, social-auth-core
pyjwt==1.5.2 # via -r requirements/edx/base.in, djangorestframework-jwt, edx-rest-api-client, social-auth-core
pymongo==3.9.0 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, edx-opaque-keys, event-tracking, mongodbproxy, mongoengine
pynliner==0.8.0 # via -r requirements/edx/base.in
pyparsing==2.2.0 # via calc, chem, packaging, pycontracts
@@ -220,7 +218,6 @@ sailthru-client==2.2.3 # via -r requirements/edx/base.in, edx-ace
scipy==1.4.1 # via calc, chem
semantic-version==2.8.4 # via edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.in
shortuuid==0.5.0 # via edx-django-oauth2-provider
simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils
six==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, calc, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, nltk, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client
@@ -228,7 +225,7 @@ social-auth-core==3.2.0 # via -r requirements/edx/base.in, social-auth-app-dja
git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/github.in
sortedcontainers==2.1.0 # via -r requirements/edx/base.in, pdfminer.six
soupsieve==2.0 # via beautifulsoup4
sqlparse==0.3.0 # via -r requirements/edx/base.in
sqlparse==0.3.1 # via -r requirements/edx/base.in
staff-graded-xblock==0.7 # via -r requirements/edx/base.in
stevedore==1.32.0 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.6 # via -r requirements/edx/base.in, edx-bulk-grades

31
requirements/edx/development.txt
View File

@@ -59,7 +59,7 @@ cryptography==2.8 # via -r requirements/edx/testing.txt, django-fernet-f
cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery
cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner
ddt==1.2.2 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.1 # via -r requirements/edx/testing.txt, pycontracts
decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts
defusedxml==0.5.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
diff-cover==2.6.0 # via -r requirements/edx/testing.txt
distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv
@@ -70,7 +70,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-countries==5.5 # via -r requirements/edx/testing.txt, edx-enterprise
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-debug-toolbar==2.2 # via -r requirements/edx/development.in
django-fernet-fields==0.6 # via -r requirements/edx/testing.txt, edx-enterprise
@@ -97,7 +97,7 @@ django-storages==1.8 # via -c requirements/edx/../constraints.txt, -r requi
django-user-tasks==0.3.0 # via -r requirements/edx/testing.txt
django-waffle==0.18.0 # via -r requirements/edx/testing.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring
django-webpack-loader==0.7.0 # via -r requirements/edx/testing.txt, edx-proctoring
django==1.11.28 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-oauth2-provider, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.28 # via -r requirements/edx/testing.txt, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
djangorestframework-jwt==1.11.0 # via -r requirements/edx/testing.txt, edx-drf-extensions
djangorestframework-xml==1.4.0 # via -r requirements/edx/testing.txt, edx-enterprise
djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv
@@ -111,7 +111,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/testing.txt, staff-graded-xb
edx-ccx-keys==1.0.0 # via -r requirements/edx/testing.txt
edx-celeryutils==0.3.2 # via -r requirements/edx/testing.txt, super-csv
edx-completion==3.1.1 # via -r requirements/edx/testing.txt
edx-django-oauth2-provider==1.3.5 # via -r requirements/edx/testing.txt, edx-oauth2-provider, edx-organizations, edxval
edx-django-release-util==0.3.6 # via -r requirements/edx/testing.txt
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt
edx-django-utils==3.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
@@ -120,9 +119,8 @@ edx-enterprise==2.4.1 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2
edx-lint==1.4.1 # via -r requirements/edx/testing.txt
edx-milestones==0.2.6 # via -r requirements/edx/testing.txt
edx-oauth2-provider==1.3.1 # via -r requirements/edx/testing.txt
edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule
edx-organizations==3.0.0 # via -r requirements/edx/testing.txt
edx-organizations==4.0.0 # via -r requirements/edx/testing.txt
edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/testing.txt
edx-proctoring==2.3.0 # via -r requirements/edx/testing.txt, edx-proctoring-proctortrack
edx-rbac==1.1.0 # via -r requirements/edx/testing.txt, edx-enterprise
@@ -134,7 +132,7 @@ edx-submissions==3.0.4 # via -r requirements/edx/testing.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/testing.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/testing.txt
edx-when==1.0.2 # via -r requirements/edx/testing.txt, edx-proctoring
edxval==1.2.3 # via -r requirements/edx/testing.txt
edxval==1.2.4 # via -r requirements/edx/testing.txt
elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search
entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8
enum34==1.1.9 # via -r requirements/edx/testing.txt, edxval
@@ -159,7 +157,7 @@ httpretty==0.9.7 # via -r requirements/edx/testing.txt
idna==2.9 # via -r requirements/edx/testing.txt, requests
imagesize==1.2.0 # via sphinx
importlib-metadata==1.5.0 # via -r requirements/edx/testing.txt, inflect, jsonschema, path, pluggy, pytest, pytest-randomly, tox, virtualenv
importlib-resources==1.0.2 # via -r requirements/edx/testing.txt, virtualenv
importlib-resources==1.1.0 # via -r requirements/edx/testing.txt, virtualenv
inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, jinja2-pluralize
inflection==0.3.1 # via -r requirements/edx/testing.txt, drf-yasg
ipaddress==1.0.23 # via -r requirements/edx/testing.txt
@@ -214,7 +212,7 @@ paver==1.3.4 # via -r requirements/edx/testing.txt
pbr==5.4.4 # via -r requirements/edx/testing.txt, stevedore
pdfminer.six==20200124 # via -r requirements/edx/testing.txt
piexif==1.1.3 # via -r requirements/edx/testing.txt
pillow==7.0.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations, edxval
pillow==7.0.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations
pip-tools==4.5.1 # via -r requirements/edx/pip-tools.txt
pkgconfig==1.5.1 # via -r requirements/edx/testing.txt, xmlsec
pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox
@@ -232,7 +230,7 @@ pyflakes==2.1.1 # via -r requirements/edx/testing.txt, flake8
pygments==2.5.2 # via -r requirements/edx/testing.txt, diff-cover, sphinx
pyinotify==0.9.6 # via -r requirements/edx/development.in
pyjwkest==1.3.2 # via -r requirements/edx/testing.txt, edx-drf-extensions
pyjwt==1.5.2 # via -r requirements/edx/testing.txt, djangorestframework-jwt, edx-oauth2-provider, edx-rest-api-client, social-auth-core
pyjwt==1.5.2 # via -r requirements/edx/testing.txt, djangorestframework-jwt, edx-rest-api-client, social-auth-core
pylint-celery==0.3 # via -r requirements/edx/testing.txt, edx-lint
pylint-django==2.0.11 # via -r requirements/edx/testing.txt, edx-lint
pylint-plugin-utils==0.6 # via -r requirements/edx/testing.txt, pylint-celery, pylint-django
@@ -279,7 +277,6 @@ scipy==1.4.1 # via -r requirements/edx/testing.txt, calc, chem
selenium==3.141.0 # via -r requirements/edx/testing.txt, bok-choy
semantic-version==2.8.4 # via -r requirements/edx/testing.txt, edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/testing.txt
shortuuid==0.5.0 # via -r requirements/edx/testing.txt, edx-django-oauth2-provider
simplejson==3.17.0 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt
six==1.14.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, calc, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, nltk, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock
@@ -290,15 +287,15 @@ git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef793
sortedcontainers==2.1.0 # via -r requirements/edx/testing.txt, pdfminer.six
soupsieve==2.0 # via -r requirements/edx/testing.txt, beautifulsoup4
sphinx==2.4.3 # via edx-sphinx-theme, sphinxcontrib-httpdomain
sphinxcontrib-applehelp==1.0.1 # via sphinx
sphinxcontrib-devhelp==1.0.1 # via sphinx
sphinxcontrib-applehelp==1.0.2 # via sphinx
sphinxcontrib-devhelp==1.0.2 # via sphinx
sphinxcontrib-htmlhelp==1.0.3 # via sphinx
sphinxcontrib-httpdomain==1.7.0 # via sphinxcontrib-openapi
sphinxcontrib-jsmath==1.0.1 # via sphinx
sphinxcontrib-openapi[markdown]==0.6.0 # via -r requirements/edx/development.in
sphinxcontrib-qthelp==1.0.2 # via sphinx
sphinxcontrib-serializinghtml==1.1.3 # via sphinx
sqlparse==0.3.0 # via -r requirements/edx/testing.txt, django-debug-toolbar
sphinxcontrib-qthelp==1.0.3 # via sphinx
sphinxcontrib-serializinghtml==1.1.4 # via sphinx
sqlparse==0.3.1 # via -r requirements/edx/testing.txt, django-debug-toolbar
staff-graded-xblock==0.7 # via -r requirements/edx/testing.txt
stevedore==1.32.0 # via -r requirements/edx/testing.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.6 # via -r requirements/edx/testing.txt, edx-bulk-grades
@@ -330,7 +327,7 @@ xblock-utils==1.2.4 # via -r requirements/edx/testing.txt, edx-sga, lti-co
xblock==1.2.9 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.3 # via -r requirements/edx/testing.txt, python3-saml
xss-utils==0.1.2 # via -r requirements/edx/testing.txt
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata, importlib-resources
# The following packages are considered to be unsafe in a requirements file:
# setuptools

2
requirements/edx/django.txt
View File

@@ -1,2 +1,2 @@
django-oauth-toolkit==1.1.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-oauth2-provider, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-oauth2-provider, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils
django==1.11.28 # via -r requirements/edx/base.in, code-annotations, django-appconf, django-babel, django-babel-underscore, django-celery, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-splash, django-statici18n, django-storages, django-wiki, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-when, edxval, event-tracking, help-tokens, jsonfield2, ora2, rest-condition, super-csv, xss-utils

21
requirements/edx/testing.txt
View File

@@ -58,7 +58,7 @@ cryptography==2.8 # via -r requirements/edx/base.txt, django-fernet-fiel
cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery
cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner
ddt==1.2.2 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll
decorator==4.4.1 # via -r requirements/edx/base.txt, pycontracts
decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts
defusedxml==0.5.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
diff-cover==2.6.0 # via -r requirements/edx/coverage.txt
distlib==0.3.0 # via virtualenv
@@ -69,7 +69,7 @@ git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f3
django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai
django-config-models==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-countries==5.5 # via -r requirements/edx/base.txt, edx-enterprise
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise
django-crum==0.7.5 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
django-fernet-fields==0.6 # via -r requirements/edx/base.txt, edx-enterprise
django-filter==2.2.0 # via -r requirements/edx/base.txt, edx-enterprise
@@ -107,7 +107,6 @@ edx-bulk-grades==0.6.6 # via -r requirements/edx/base.txt, staff-graded-xbloc
edx-ccx-keys==1.0.0 # via -r requirements/edx/base.txt
edx-celeryutils==0.3.2 # via -r requirements/edx/base.txt, super-csv
edx-completion==3.1.1 # via -r requirements/edx/base.txt
edx-django-oauth2-provider==1.3.5 # via -r requirements/edx/base.txt, edx-oauth2-provider, edx-organizations, edxval
edx-django-release-util==0.3.6 # via -r requirements/edx/base.txt
edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt
edx-django-utils==3.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client
@@ -116,9 +115,8 @@ edx-enterprise==2.4.1 # via -r requirements/edx/base.txt
edx-i18n-tools==0.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
edx-lint==1.4.1 # via -r requirements/edx/testing.in
edx-milestones==0.2.6 # via -r requirements/edx/base.txt
edx-oauth2-provider==1.3.1 # via -r requirements/edx/base.txt
edx-opaque-keys[django]==2.0.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, xmodule
edx-organizations==3.0.0 # via -r requirements/edx/base.txt
edx-organizations==4.0.0 # via -r requirements/edx/base.txt
edx-proctoring-proctortrack==1.0.5 # via -r requirements/edx/base.txt
edx-proctoring==2.3.0 # via -r requirements/edx/base.txt, edx-proctoring-proctortrack
edx-rbac==1.1.0 # via -r requirements/edx/base.txt, edx-enterprise
@@ -129,7 +127,7 @@ edx-submissions==3.0.4 # via -r requirements/edx/base.txt, ora2
edx-tincan-py35==0.0.5 # via -r requirements/edx/base.txt, edx-enterprise
edx-user-state-client==1.1.2 # via -r requirements/edx/base.txt
edx-when==1.0.2 # via -r requirements/edx/base.txt, edx-proctoring
edxval==1.2.3 # via -r requirements/edx/base.txt
edxval==1.2.4 # via -r requirements/edx/base.txt
elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search
entrypoints==0.3 # via flake8
enum34==1.1.9 # via -r requirements/edx/base.txt, edxval
@@ -153,7 +151,7 @@ httplib2==0.17.0 # via -r requirements/edx/base.txt, oauth2
httpretty==0.9.7 # via -r requirements/edx/testing.in
idna==2.9 # via -r requirements/edx/base.txt, requests
importlib-metadata==1.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, inflect, path, pluggy, pytest, pytest-randomly, tox, virtualenv
importlib-resources==1.0.2 # via virtualenv
importlib-resources==1.1.0 # via virtualenv
inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize
inflection==0.3.1 # via -r requirements/edx/base.txt, drf-yasg
ipaddress==1.0.23 # via -r requirements/edx/base.txt
@@ -205,7 +203,7 @@ paver==1.3.4 # via -r requirements/edx/base.txt
pbr==5.4.4 # via -r requirements/edx/base.txt, stevedore
pdfminer.six==20200124 # via -r requirements/edx/base.txt
piexif==1.1.3 # via -r requirements/edx/base.txt
pillow==7.0.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations, edxval
pillow==7.0.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations
pkgconfig==1.5.1 # via -r requirements/edx/base.txt, xmlsec
pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox
polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools
@@ -221,7 +219,7 @@ pycryptodomex==3.9.7 # via -r requirements/edx/base.txt, edx-proctoring, py
pyflakes==2.1.1 # via flake8
pygments==2.5.2 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, diff-cover
pyjwkest==1.3.2 # via -r requirements/edx/base.txt, edx-drf-extensions
pyjwt==1.5.2 # via -r requirements/edx/base.txt, djangorestframework-jwt, edx-oauth2-provider, edx-rest-api-client, social-auth-core
pyjwt==1.5.2 # via -r requirements/edx/base.txt, djangorestframework-jwt, edx-rest-api-client, social-auth-core
pylint-celery==0.3 # via edx-lint
pylint-django==2.0.11 # via edx-lint
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
@@ -267,7 +265,6 @@ scipy==1.4.1 # via -r requirements/edx/base.txt, calc, chem
selenium==3.141.0 # via -r requirements/edx/testing.in, bok-choy
semantic-version==2.8.4 # via -r requirements/edx/base.txt, edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.txt
shortuuid==0.5.0 # via -r requirements/edx/base.txt, edx-django-oauth2-provider
simplejson==3.17.0 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.4.0.3 # via -r requirements/edx/testing.in
six==1.14.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, calc, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, nltk, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock
@@ -276,7 +273,7 @@ social-auth-core==3.2.0 # via -r requirements/edx/base.txt, social-auth-app-dj
git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail # via -r requirements/edx/base.txt
sortedcontainers==2.1.0 # via -r requirements/edx/base.txt, pdfminer.six
soupsieve==2.0 # via -r requirements/edx/base.txt, beautifulsoup4
sqlparse==0.3.0 # via -r requirements/edx/base.txt
sqlparse==0.3.1 # via -r requirements/edx/base.txt
staff-graded-xblock==0.7 # via -r requirements/edx/base.txt
stevedore==1.32.0 # via -r requirements/edx/base.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.6 # via -r requirements/edx/base.txt, edx-bulk-grades
@@ -307,7 +304,7 @@ xblock-utils==1.2.4 # via -r requirements/edx/base.txt, edx-sga, lti-consu
xblock==1.2.9 # via -r requirements/edx/base.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils
xmlsec==1.3.3 # via -r requirements/edx/base.txt, python3-saml
xss-utils==0.1.2 # via -r requirements/edx/base.txt
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-metadata
zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-metadata, importlib-resources
# The following packages are considered to be unsafe in a requirements file:
# setuptools