diff --git a/requirements/base.in b/requirements/base.in index 7d947d89a0..72412fdfe8 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -9,7 +9,7 @@ edx-toggles djangorestframework Xblock edx-opaque-keys -openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event +openedx-events @ git+https://github.com/edunext/openedx-events.git@9.4.0/edues django django-simple-history diff --git a/requirements/base.txt b/requirements/base.txt index 8a1a92aba4..3c154a0e2b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,9 +12,9 @@ attrs==23.2.0 # via openedx-events bleach==6.1.0 # via -r requirements/base.in -boto3==1.34.34 +boto3==1.34.35 # via -r requirements/base.in -botocore==1.34.34 +botocore==1.34.35 # via # boto3 # s3transfer @@ -32,7 +32,7 @@ code-annotations==1.6.0 # via edx-toggles defusedxml==0.7.1 # via -r requirements/base.in -django==3.2.23 +django==3.2.24 # via # -c requirements/constraints.txt # -r requirements/base.in @@ -80,8 +80,8 @@ edx-submissions==3.6.0 # via -r requirements/base.in edx-toggles==5.1.1 # via -r requirements/base.in -edx-toggles==5.1.1 - # via -r requirements/base.in +fastavro==1.9.3 + # via openedx-events fs==2.0.18 # via # -c requirements/constraints.txt @@ -122,7 +122,7 @@ markupsafe==2.1.5 # xblock newrelic==9.6.0 # via edx-django-utils -openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event +openedx-events @ git+https://github.com/edunext/openedx-events.git@9.4.0/edues # via -r requirements/base.in path==13.1.0 # via diff --git a/requirements/docs.txt b/requirements/docs.txt index d4f4b44c49..36b99c1820 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -34,15 +34,7 @@ jinja2==3.1.3 # via sphinx livereload==2.6.3 # via sphinx-autobuild -<<<<<<< HEAD -<<<<<<< HEAD markupsafe==2.1.5 -======= -markupsafe==2.1.4 ->>>>>>> 02e86292 (chore: add platform-plugin-turnitin in base requirements) -======= -markupsafe==2.1.5 ->>>>>>> 19e855be (chore: address PR review) # via jinja2 packaging==23.2 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 70197ccd7f..bdb339aec0 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -64,13 +64,13 @@ boto==2.49.0 # via # -r requirements/test.txt # moto -boto3==1.34.34 +boto3==1.34.35 # via # -r requirements/test.txt # aws-sam-translator # fs-s3fs # moto -botocore==1.34.34 +botocore==1.34.35 # via # -r requirements/test.txt # aws-xray-sdk @@ -170,7 +170,7 @@ distlib==0.3.8 # via # -r requirements/test.txt # virtualenv -django==3.2.23 +django==3.2.24 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -239,7 +239,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==22.6.0 +faker==22.7.0 # via # -r requirements/test.txt # factory-boy @@ -394,7 +394,7 @@ newrelic==9.6.0 # via # -r requirements/test.txt # edx-django-utils -openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event +openedx-events @ git+https://github.com/edunext/openedx-events.git@9.4.0/edues # via -r requirements/test.txt packaging==23.2 # via diff --git a/requirements/test-acceptance.txt b/requirements/test-acceptance.txt index e9d5463ab3..4a115efc7e 100644 --- a/requirements/test-acceptance.txt +++ b/requirements/test-acceptance.txt @@ -60,13 +60,13 @@ boto==2.49.0 # via # -r requirements/test.txt # moto -boto3==1.34.34 +boto3==1.34.35 # via # -r requirements/test.txt # aws-sam-translator # fs-s3fs # moto -botocore==1.34.34 +botocore==1.34.35 # via # -r requirements/test.txt # aws-xray-sdk @@ -160,7 +160,7 @@ distlib==0.3.8 # via # -r requirements/test.txt # virtualenv -django==3.2.23 +django==3.2.24 # via # -c requirements/constraints.txt # -r requirements/test.txt @@ -227,7 +227,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==22.6.0 +faker==22.7.0 # via # -r requirements/test.txt # factory-boy @@ -378,7 +378,7 @@ newrelic==9.6.0 # via # -r requirements/test.txt # edx-django-utils -openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event +openedx-events @ git+https://github.com/edunext/openedx-events.git@9.4.0/edues # via -r requirements/test.txt packaging==23.2 # via diff --git a/requirements/test.txt b/requirements/test.txt index 8a4e16988a..3b95909d92 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -42,13 +42,13 @@ bleach==6.1.0 # via -r requirements/base.txt boto==2.49.0 # via moto -boto3==1.34.34 +boto3==1.34.35 # via # -r requirements/base.txt # aws-sam-translator # fs-s3fs # moto -botocore==1.34.34 +botocore==1.34.35 # via # -r requirements/base.txt # aws-xray-sdk @@ -180,7 +180,7 @@ exceptiongroup==1.2.0 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==22.6.0 +faker==22.7.0 # via factory-boy fastavro==1.9.3 # via @@ -300,7 +300,7 @@ newrelic==9.6.0 # via # -r requirements/base.txt # edx-django-utils -openedx-events @ git+https://github.com/edunext/openedx-events.git@bav/ora-submission-created-event +openedx-events @ git+https://github.com/edunext/openedx-events.git@9.4.0/edues # via -r requirements/base.txt packaging==23.2 # via