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

unpin sailthru-client and django-cookies samesite (#24358)

Browse Source
This commit is contained in:
M. Zulqarnain
2020-06-30 20:26:58 +05:00
committed by GitHub
parent a678f43e37
commit 061faba726
5 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/constraints.txt
View File

@@ -19,10 +19,6 @@ ddt<1.4.0
# Stay on the latest LTS release of Django
Django<2.3
# 0.6.0 has a missing dependency declaration on ua-parser: https://github.com/jotes/django-cookies-samesite/issues/25
# 0.6.1 throws on some requests from iOS app: https://github.com/jotes/django-cookies-samesite/issues/28
django-cookies-samesite<0.6.0
# The CORS_ORIGIN_WHITELIST changes in a backwards incompatible way in 3.0.0, needs matching configuration repo changes
django-cors-headers<3.0.0

2
requirements/edx/base.in
View File

@@ -145,7 +145,7 @@ requests-oauthlib # Simplifies use of OAuth via the requests l
random2
rules # Django extension for rules-based authorization checks
simplejson
sailthru-client==2.2.3 # For Sailthru integration
sailthru-client # For Sailthru integration
Shapely # Geometry library, used for image click regions in capa
six # Utilities for supporting Python 2 & 3 in the same codebase
social-auth-app-django

13
requirements/edx/base.txt
View File

@@ -50,10 +50,10 @@ ddt==1.3.1 # via -c requirements/edx/../constraints.txt, xblock-d
decorator==4.4.2 # via pycontracts
defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n
django-celery==3.3.1 # via -r requirements/edx/base.in
django-celery==3.3.1 # via -r requirements/edx/base.in, edx-bulk-grades
django-classy-tags==1.0.0 # via django-sekizai
django-config-models==2.0.2 # via -r requirements/edx/base.in, edx-enterprise
django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-cookies-samesite==0.6.4 # via -r requirements/edx/base.in
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise
django-crum==0.7.6 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring, edx-rbac, super-csv
@@ -91,7 +91,7 @@ drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, edx-api-
edx-ace==0.1.15 # via -r requirements/edx/base.in
edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/base.in
edx-api-doc-tools==1.3.1 # via -r requirements/edx/base.in
edx-bulk-grades==0.6.8 # via -r requirements/edx/base.in, staff-graded-xblock
edx-bulk-grades==0.7.0 # via -r requirements/edx/base.in, staff-graded-xblock
edx-ccx-keys==1.1.0 # via -r requirements/edx/base.in
edx-celeryutils==0.5.0 # via -r requirements/edx/base.in, super-csv
edx-completion==3.2.1 # via -r requirements/edx/base.in
@@ -174,7 +174,7 @@ paver==1.3.4 # via -r requirements/edx/paver.txt
pbr==5.4.5 # via -r requirements/edx/paver.txt, stevedore
pdfminer.six==20200517 # via -r requirements/edx/base.in
piexif==1.1.3 # via -r requirements/edx/base.in
pillow==7.1.2 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations
pillow==7.2.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils
py2neo==3.1.2 # via -r requirements/edx/base.in
@@ -193,7 +193,7 @@ pysrt==1.1.2 # via -r requirements/edx/base.in, edxval
python-dateutil==2.4.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, analytics-python, botocore, edx-ace, edx-drf-extensions, edx-enterprise, edx-proctoring, icalendar, ora2, xblock
python-levenshtein==0.12.0 # via -r requirements/edx/base.in
python-memcached==1.59 # via -r requirements/edx/paver.txt
python-slugify==4.0.0 # via code-annotations
python-slugify==4.0.1 # via code-annotations
python-swiftclient==3.10.0 # via ora2
python3-openid==3.2.0 ; python_version >= "3" # via -r requirements/edx/base.in, social-auth-core
python3-saml==1.9.0 # via -r requirements/edx/base.in
@@ -217,7 +217,7 @@ scipy==1.4.1 # via -c requirements/edx/../constraints.txt, chem, op
semantic-version==2.8.5 # via edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.in
simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils
six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, crowdsourcehinter-xblock, cryptography, 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, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, crowdsourcehinter-xblock, cryptography, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-bulk-grades, 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, openedx-calc, 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
social-auth-app-django==4.0.0 # via -r requirements/edx/base.in
social-auth-core==3.3.3 # via -r requirements/edx/base.in, social-auth-app-django
@@ -232,6 +232,7 @@ sympy==1.6 # via symmath
testfixtures==6.14.1 # via edx-enterprise
text-unidecode==1.3 # via python-slugify
tqdm==4.47.0 # via -r requirements/edx/../edx-sandbox/shared.txt, nltk
ua-parser==0.10.0 # via django-cookies-samesite
unicodecsv==0.14.1 # via -r requirements/edx/base.in, edx-enterprise
uritemplate==3.0.1 # via coreapi, drf-yasg
urllib3==1.25.9 # via -r requirements/edx/paver.txt, elasticsearch, geoip2, requests

15
requirements/edx/development.txt
View File

@@ -61,10 +61,10 @@ defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframe
diff-cover==3.0.1 # via -r requirements/edx/testing.txt
distlib==0.3.1 # via -r requirements/edx/testing.txt, virtualenv
django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n
django-celery==3.3.1 # via -r requirements/edx/testing.txt
django-celery==3.3.1 # via -r requirements/edx/testing.txt, edx-bulk-grades
django-classy-tags==1.0.0 # via -r requirements/edx/testing.txt, django-sekizai
django-config-models==2.0.2 # via -r requirements/edx/testing.txt, edx-enterprise
django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-cookies-samesite==0.6.4 # via -r requirements/edx/testing.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise
django-crum==0.7.6 # via -r requirements/edx/testing.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
@@ -103,7 +103,7 @@ drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requi
edx-ace==0.1.15 # via -r requirements/edx/testing.txt
edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/testing.txt
edx-api-doc-tools==1.3.1 # via -r requirements/edx/testing.txt
edx-bulk-grades==0.6.8 # via -r requirements/edx/testing.txt, staff-graded-xblock
edx-bulk-grades==0.7.0 # via -r requirements/edx/testing.txt, staff-graded-xblock
edx-ccx-keys==1.1.0 # via -r requirements/edx/testing.txt
edx-celeryutils==0.5.0 # via -r requirements/edx/testing.txt, super-csv
edx-completion==3.2.1 # via -r requirements/edx/testing.txt
@@ -210,7 +210,7 @@ paver==1.3.4 # via -r requirements/edx/testing.txt
pbr==5.4.5 # via -r requirements/edx/testing.txt, stevedore
pdfminer.six==20200517 # via -r requirements/edx/testing.txt
piexif==1.1.3 # via -r requirements/edx/testing.txt
pillow==7.1.2 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations
pillow==7.2.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations
pip-tools==4.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/pip-tools.txt
pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox
polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools
@@ -249,7 +249,7 @@ pytest==5.3.5 # via -c requirements/edx/../constraints.txt, -r requi
python-dateutil==2.4.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, analytics-python, botocore, edx-ace, edx-drf-extensions, edx-enterprise, edx-proctoring, faker, freezegun, icalendar, ora2, xblock
python-levenshtein==0.12.0 # via -r requirements/edx/testing.txt
python-memcached==1.59 # via -r requirements/edx/testing.txt
python-slugify==4.0.0 # via -r requirements/edx/testing.txt, code-annotations, transifex-client
python-slugify==4.0.1 # via -r requirements/edx/testing.txt, code-annotations, transifex-client
python-swiftclient==3.10.0 # via -r requirements/edx/testing.txt, ora2
python3-openid==3.2.0 ; python_version >= "3" # via -r requirements/edx/testing.txt, social-auth-core
python3-saml==1.9.0 # via -r requirements/edx/testing.txt
@@ -277,7 +277,7 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi
shapely==1.7.0 # via -r requirements/edx/testing.txt
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.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, 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, openedx-calc, 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
six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-bulk-grades, 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, openedx-calc, 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
slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
smmap==3.0.4 # via -r requirements/edx/testing.txt, gitdb
snowballstemmer==2.0.0 # via sphinx
@@ -308,8 +308,9 @@ tox==3.16.1 # via -r requirements/edx/testing.txt, tox-battery
tqdm==4.47.0 # via -r requirements/edx/testing.txt, nltk
transifex-client==0.13.10 # via -r requirements/edx/testing.txt
typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid
ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite
unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise
unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin
unidiff==0.6.0 # via -r requirements/edx/testing.txt
uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg
urllib3==1.25.9 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.2 # via -r requirements/edx/testing.txt

15
requirements/edx/testing.txt
View File

@@ -60,10 +60,10 @@ defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframewor
diff-cover==3.0.1 # via -r requirements/edx/coverage.txt
distlib==0.3.1 # via virtualenv
django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n
django-celery==3.3.1 # via -r requirements/edx/base.txt
django-celery==3.3.1 # via -r requirements/edx/base.txt, edx-bulk-grades
django-classy-tags==1.0.0 # via -r requirements/edx/base.txt, django-sekizai
django-config-models==2.0.2 # via -r requirements/edx/base.txt, edx-enterprise
django-cookies-samesite==0.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-cookies-samesite==0.6.4 # via -r requirements/edx/base.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise
django-crum==0.7.6 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring, edx-rbac, super-csv
@@ -100,7 +100,7 @@ drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requi
edx-ace==0.1.15 # via -r requirements/edx/base.txt
edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/base.txt
edx-api-doc-tools==1.3.1 # via -r requirements/edx/base.txt
edx-bulk-grades==0.6.8 # via -r requirements/edx/base.txt, staff-graded-xblock
edx-bulk-grades==0.7.0 # via -r requirements/edx/base.txt, staff-graded-xblock
edx-ccx-keys==1.1.0 # via -r requirements/edx/base.txt
edx-celeryutils==0.5.0 # via -r requirements/edx/base.txt, super-csv
edx-completion==3.2.1 # via -r requirements/edx/base.txt
@@ -202,7 +202,7 @@ paver==1.3.4 # via -r requirements/edx/base.txt
pbr==5.4.5 # via -r requirements/edx/base.txt, stevedore
pdfminer.six==20200517 # via -r requirements/edx/base.txt
piexif==1.1.3 # via -r requirements/edx/base.txt
pillow==7.1.2 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations
pillow==7.2.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations
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
psutil==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils
@@ -239,7 +239,7 @@ pytest==5.3.5 # via -c requirements/edx/../constraints.txt, -r requi
python-dateutil==2.4.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, analytics-python, botocore, edx-ace, edx-drf-extensions, edx-enterprise, edx-proctoring, faker, freezegun, icalendar, ora2, xblock
python-levenshtein==0.12.0 # via -r requirements/edx/base.txt
python-memcached==1.59 # via -r requirements/edx/base.txt
python-slugify==4.0.0 # via -r requirements/edx/base.txt, code-annotations, transifex-client
python-slugify==4.0.1 # via -r requirements/edx/base.txt, code-annotations, transifex-client
python-swiftclient==3.10.0 # via -r requirements/edx/base.txt, ora2
python3-openid==3.2.0 ; python_version >= "3" # via -r requirements/edx/base.txt, social-auth-core
python3-saml==1.9.0 # via -r requirements/edx/base.txt
@@ -266,7 +266,7 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.txt
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.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, 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, openedx-calc, 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
six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-bulk-grades, 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, openedx-calc, 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
slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
smmap==3.0.4 # via gitdb
social-auth-app-django==4.0.0 # via -r requirements/edx/base.txt
@@ -287,8 +287,9 @@ tox==3.16.1 # via -r requirements/edx/testing.in, tox-battery
tqdm==4.47.0 # via -r requirements/edx/base.txt, nltk
transifex-client==0.13.10 # via -r requirements/edx/testing.in
typed-ast==1.4.1 # via astroid
ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite
unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise
unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin
unidiff==0.6.0 # via -r requirements/edx/testing.in
uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg
urllib3==1.25.9 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.2 # via -r requirements/edx/base.txt