Merge remote-tracking branch 'upstream/master' into salman/remove-bok-choy
This commit is contained in:
salman2013
@@ -20,20 +20,17 @@ celery>=5.2.2,<6.0.0
|
||||
# required for celery>=5.2.0;<5.3.0
|
||||
click>=8.0,<9.0
|
||||
|
||||
# django-storages version upgrade
|
||||
django-storages==1.13.2
|
||||
|
||||
# each version upgrade need release notes review.
|
||||
django-storages==1.14
|
||||
|
||||
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
|
||||
# This is to allow them to better control its deployment and to do it in a process that works better
|
||||
# for them.
|
||||
edx-enterprise==4.3.1
|
||||
edx-enterprise==4.3.2
|
||||
|
||||
# 1. django-oauth-toolkit version >=2.0.0 has breaking changes. More details
|
||||
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
|
||||
# 2. Versions from 1.5.0 to 2.0.0 have some migrations related changes.
|
||||
# so we're upgrading minor versions one by one.
|
||||
django-oauth-toolkit==1.6.2
|
||||
# django-oauth-toolkit version >=2.0.0 has breaking changes. More details
|
||||
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
|
||||
django-oauth-toolkit==1.7.1
|
||||
|
||||
|
||||
# constrained in opaque_keys. migration guide here: https://pymongo.readthedocs.io/en/4.0/migrate-to-pymongo4.html
|
||||
@@ -78,8 +75,7 @@ pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticke
|
||||
# Deprecated version of the AWS SDK;
|
||||
# we should stop using this
|
||||
boto==2.39.0
|
||||
boto3==1.7.0 # Amazon Web Services SDK for Python
|
||||
botocore==1.10.84 # via boto3, s3transfer
|
||||
|
||||
|
||||
# adding these constraints to minimize boto3 and botocore changeset
|
||||
social-auth-core==4.3.0
|
||||
@@ -128,7 +124,7 @@ click==8.1.6
|
||||
openedx-events<8.6.0 # Open edX Events from Hooks Extension Framework (OEP-50)
|
||||
|
||||
# pinning this version to avoid updates while the library is being developed
|
||||
openedx-learning==0.1.6
|
||||
openedx-learning==0.1.7
|
||||
|
||||
# lti-consumer-xblock 9.6.2 contains a breaking change that makes
|
||||
# existing custom parameter configurations unusable.
|
||||
|
||||
@@ -77,16 +77,14 @@ boto==2.39.0
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
boto3==1.7.0
|
||||
boto3==1.28.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
# django-ses
|
||||
# fs-s3fs
|
||||
# ora2
|
||||
botocore==1.10.84
|
||||
botocore==1.31.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
# boto3
|
||||
# s3transfer
|
||||
@@ -259,7 +257,7 @@ django-celery-results==2.5.1
|
||||
# via -r requirements/edx/kernel.in
|
||||
django-classy-tags==4.1.0
|
||||
# via django-sekizai
|
||||
django-config-models==2.5.0
|
||||
django-config-models==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/kernel.in
|
||||
# edx-enterprise
|
||||
@@ -325,7 +323,7 @@ django-multi-email-field==0.7.0
|
||||
# via edx-enterprise
|
||||
django-mysql==4.11.0
|
||||
# via -r requirements/edx/kernel.in
|
||||
django-oauth-toolkit==1.6.2
|
||||
django-oauth-toolkit==1.7.1
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
@@ -357,7 +355,7 @@ django-statici18n==2.4.0
|
||||
# -r requirements/edx/kernel.in
|
||||
# lti-consumer-xblock
|
||||
# xblock-drag-and-drop-v2
|
||||
django-storages==1.13.2
|
||||
django-storages==1.14
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
@@ -402,10 +400,6 @@ djangorestframework==3.14.0
|
||||
# super-csv
|
||||
djangorestframework-xml==2.0.0
|
||||
# via edx-enterprise
|
||||
docutils==0.19
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# botocore
|
||||
done-xblock==2.1.0
|
||||
# via -r requirements/edx/bundled.in
|
||||
drf-jwt==1.19.2
|
||||
@@ -486,11 +480,11 @@ edx-drf-extensions==8.10.0
|
||||
# edx-when
|
||||
# edxval
|
||||
# openedx-learning
|
||||
edx-enterprise==4.3.1
|
||||
edx-enterprise==4.3.2
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
edx-event-bus-kafka==5.4.0
|
||||
edx-event-bus-kafka==5.5.0
|
||||
# via -r requirements/edx/kernel.in
|
||||
edx-event-bus-redis==0.3.1
|
||||
# via -r requirements/edx/kernel.in
|
||||
@@ -500,7 +494,7 @@ edx-milestones==0.5.0
|
||||
# via -r requirements/edx/kernel.in
|
||||
edx-name-affirmation==2.3.6
|
||||
# via -r requirements/edx/kernel.in
|
||||
edx-opaque-keys[django]==2.5.0
|
||||
edx-opaque-keys[django]==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/kernel.in
|
||||
# -r requirements/edx/paver.txt
|
||||
@@ -636,7 +630,7 @@ jinja2==3.1.2
|
||||
# via
|
||||
# code-annotations
|
||||
# coreschema
|
||||
jmespath==0.10.0
|
||||
jmespath==1.0.1
|
||||
# via
|
||||
# boto3
|
||||
# botocore
|
||||
@@ -790,7 +784,7 @@ openedx-filters==1.6.0
|
||||
# via
|
||||
# -r requirements/edx/kernel.in
|
||||
# lti-consumer-xblock
|
||||
openedx-learning==0.1.6
|
||||
openedx-learning==0.1.7
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/kernel.in
|
||||
@@ -1034,7 +1028,7 @@ rules==3.3
|
||||
# edx-enterprise
|
||||
# edx-proctoring
|
||||
# openedx-learning
|
||||
s3transfer==0.1.13
|
||||
s3transfer==0.6.2
|
||||
# via boto3
|
||||
sailthru-client==2.2.3
|
||||
# via edx-ace
|
||||
@@ -1169,6 +1163,7 @@ urllib3==1.26.16
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/paver.txt
|
||||
# botocore
|
||||
# elasticsearch
|
||||
# py2neo
|
||||
# requests
|
||||
|
||||
@@ -143,17 +143,15 @@ boto==2.39.0
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
boto3==1.7.0
|
||||
boto3==1.28.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# django-ses
|
||||
# fs-s3fs
|
||||
# ora2
|
||||
botocore==1.10.84
|
||||
botocore==1.31.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# boto3
|
||||
@@ -429,7 +427,7 @@ django-classy-tags==4.1.0
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# django-sekizai
|
||||
django-config-models==2.5.0
|
||||
django-config-models==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
@@ -522,7 +520,7 @@ django-mysql==4.11.0
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
django-oauth-toolkit==1.6.2
|
||||
django-oauth-toolkit==1.7.1
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
@@ -569,7 +567,7 @@ django-statici18n==2.4.0
|
||||
# -r requirements/edx/testing.txt
|
||||
# lti-consumer-xblock
|
||||
# xblock-drag-and-drop-v2
|
||||
django-storages==1.13.2
|
||||
django-storages==1.14
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
@@ -638,8 +636,6 @@ docutils==0.19
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# botocore
|
||||
# pydata-sphinx-theme
|
||||
# sphinx
|
||||
# sphinx-mdinclude
|
||||
@@ -752,12 +748,12 @@ edx-drf-extensions==8.10.0
|
||||
# edx-when
|
||||
# edxval
|
||||
# openedx-learning
|
||||
edx-enterprise==4.3.1
|
||||
edx-enterprise==4.3.2
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
edx-event-bus-kafka==5.4.0
|
||||
edx-event-bus-kafka==5.5.0
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
@@ -780,7 +776,7 @@ edx-name-affirmation==2.3.6
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
edx-opaque-keys[django]==2.5.0
|
||||
edx-opaque-keys[django]==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
@@ -948,7 +944,7 @@ gitdb==4.0.10
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# gitpython
|
||||
gitpython==3.1.36
|
||||
gitpython==3.1.37
|
||||
# via -r requirements/edx/doc.txt
|
||||
glob2==0.7
|
||||
# via
|
||||
@@ -1062,7 +1058,7 @@ jinja2==3.1.2
|
||||
# coreschema
|
||||
# diff-cover
|
||||
# sphinx
|
||||
jmespath==0.10.0
|
||||
jmespath==1.0.1
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
@@ -1318,7 +1314,7 @@ openedx-filters==1.6.0
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# lti-consumer-xblock
|
||||
openedx-learning==0.1.6
|
||||
openedx-learning==0.1.7
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
@@ -1789,7 +1785,7 @@ rules==3.3
|
||||
# edx-enterprise
|
||||
# edx-proctoring
|
||||
# openedx-learning
|
||||
s3transfer==0.1.13
|
||||
s3transfer==0.6.2
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
@@ -2110,6 +2106,7 @@ urllib3==1.26.16
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
# botocore
|
||||
# elasticsearch
|
||||
# pact-python
|
||||
# py2neo
|
||||
|
||||
@@ -103,16 +103,14 @@ boto==2.39.0
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
boto3==1.7.0
|
||||
boto3==1.28.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# django-ses
|
||||
# fs-s3fs
|
||||
# ora2
|
||||
botocore==1.10.84
|
||||
botocore==1.31.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
# s3transfer
|
||||
@@ -312,7 +310,7 @@ django-classy-tags==4.1.0
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# django-sekizai
|
||||
django-config-models==2.5.0
|
||||
django-config-models==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-enterprise
|
||||
@@ -386,7 +384,7 @@ django-multi-email-field==0.7.0
|
||||
# edx-enterprise
|
||||
django-mysql==4.11.0
|
||||
# via -r requirements/edx/base.txt
|
||||
django-oauth-toolkit==1.6.2
|
||||
django-oauth-toolkit==1.7.1
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -420,7 +418,7 @@ django-statici18n==2.4.0
|
||||
# -r requirements/edx/base.txt
|
||||
# lti-consumer-xblock
|
||||
# xblock-drag-and-drop-v2
|
||||
django-storages==1.13.2
|
||||
django-storages==1.14
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -470,8 +468,6 @@ djangorestframework-xml==2.0.0
|
||||
docutils==0.19
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# botocore
|
||||
# pydata-sphinx-theme
|
||||
# sphinx
|
||||
# sphinx-mdinclude
|
||||
@@ -560,11 +556,11 @@ edx-drf-extensions==8.10.0
|
||||
# edx-when
|
||||
# edxval
|
||||
# openedx-learning
|
||||
edx-enterprise==4.3.1
|
||||
edx-enterprise==4.3.2
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
edx-event-bus-kafka==5.4.0
|
||||
edx-event-bus-kafka==5.5.0
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-event-bus-redis==0.3.1
|
||||
# via -r requirements/edx/base.txt
|
||||
@@ -576,7 +572,7 @@ edx-milestones==0.5.0
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-name-affirmation==2.3.6
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-opaque-keys[django]==2.5.0
|
||||
edx-opaque-keys[django]==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-bulk-grades
|
||||
@@ -686,7 +682,7 @@ geoip2==4.7.0
|
||||
# via -r requirements/edx/base.txt
|
||||
gitdb==4.0.10
|
||||
# via gitpython
|
||||
gitpython==3.1.36
|
||||
gitpython==3.1.37
|
||||
# via -r requirements/edx/doc.in
|
||||
glob2==0.7
|
||||
# via -r requirements/edx/base.txt
|
||||
@@ -744,7 +740,7 @@ jinja2==3.1.2
|
||||
# code-annotations
|
||||
# coreschema
|
||||
# sphinx
|
||||
jmespath==0.10.0
|
||||
jmespath==1.0.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
@@ -928,7 +924,7 @@ openedx-filters==1.6.0
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# lti-consumer-xblock
|
||||
openedx-learning==0.1.6
|
||||
openedx-learning==0.1.7
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -1222,7 +1218,7 @@ rules==3.3
|
||||
# edx-enterprise
|
||||
# edx-proctoring
|
||||
# openedx-learning
|
||||
s3transfer==0.1.13
|
||||
s3transfer==0.6.2
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
@@ -1424,6 +1420,7 @@ urllib3==1.26.16
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# botocore
|
||||
# elasticsearch
|
||||
# py2neo
|
||||
# requests
|
||||
|
||||
@@ -10,7 +10,7 @@ charset-normalizer==2.0.12
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# requests
|
||||
edx-opaque-keys==2.5.0
|
||||
edx-opaque-keys==2.5.1
|
||||
# via -r requirements/edx/paver.in
|
||||
idna==3.4
|
||||
# via requests
|
||||
|
||||
@@ -108,16 +108,14 @@ boto==2.39.0
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
boto3==1.7.0
|
||||
boto3==1.28.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# django-ses
|
||||
# fs-s3fs
|
||||
# ora2
|
||||
botocore==1.10.84
|
||||
botocore==1.31.53
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
# s3transfer
|
||||
@@ -343,7 +341,7 @@ django-classy-tags==4.1.0
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# django-sekizai
|
||||
django-config-models==2.5.0
|
||||
django-config-models==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-enterprise
|
||||
@@ -417,7 +415,7 @@ django-multi-email-field==0.7.0
|
||||
# edx-enterprise
|
||||
django-mysql==4.11.0
|
||||
# via -r requirements/edx/base.txt
|
||||
django-oauth-toolkit==1.6.2
|
||||
django-oauth-toolkit==1.7.1
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -451,7 +449,7 @@ django-statici18n==2.4.0
|
||||
# -r requirements/edx/base.txt
|
||||
# lti-consumer-xblock
|
||||
# xblock-drag-and-drop-v2
|
||||
django-storages==1.13.2
|
||||
django-storages==1.14
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -498,11 +496,6 @@ djangorestframework-xml==2.0.0
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-enterprise
|
||||
docutils==0.19
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# botocore
|
||||
done-xblock==2.1.0
|
||||
# via -r requirements/edx/base.txt
|
||||
drf-jwt==1.19.2
|
||||
@@ -588,11 +581,11 @@ edx-drf-extensions==8.10.0
|
||||
# edx-when
|
||||
# edxval
|
||||
# openedx-learning
|
||||
edx-enterprise==4.3.1
|
||||
edx-enterprise==4.3.2
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
edx-event-bus-kafka==5.4.0
|
||||
edx-event-bus-kafka==5.5.0
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-event-bus-redis==0.3.1
|
||||
# via -r requirements/edx/base.txt
|
||||
@@ -607,7 +600,7 @@ edx-milestones==0.5.0
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-name-affirmation==2.3.6
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-opaque-keys[django]==2.5.0
|
||||
edx-opaque-keys[django]==2.5.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# edx-bulk-grades
|
||||
@@ -808,7 +801,7 @@ jinja2==3.1.2
|
||||
# code-annotations
|
||||
# coreschema
|
||||
# diff-cover
|
||||
jmespath==0.10.0
|
||||
jmespath==1.0.1
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
@@ -995,7 +988,7 @@ openedx-filters==1.6.0
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# lti-consumer-xblock
|
||||
openedx-learning==0.1.6
|
||||
openedx-learning==0.1.7
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
@@ -1356,7 +1349,7 @@ rules==3.3
|
||||
# edx-enterprise
|
||||
# edx-proctoring
|
||||
# openedx-learning
|
||||
s3transfer==0.1.13
|
||||
s3transfer==0.6.2
|
||||
# via
|
||||
# -r requirements/edx/base.txt
|
||||
# boto3
|
||||
@@ -1557,6 +1550,7 @@ urllib3==1.26.16
|
||||
# via
|
||||
# -c requirements/edx/../constraints.txt
|
||||
# -r requirements/edx/base.txt
|
||||
# botocore
|
||||
# elasticsearch
|
||||
# pact-python
|
||||
# py2neo
|
||||
|
||||
Reference in New Issue
Block a user