diff --git a/Makefile b/Makefile index 7aa7334fdf..24aefcf61b 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,9 @@ $(COMMON_CONSTRAINTS_TXT): compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade compile-requirements: $(COMMON_CONSTRAINTS_TXT) ## Re-compile *.in requirements to *.txt +# Remove setuptools constraint from common constraints to bump version in edx-platform requirements. +# This will be removed after completing the testing of the setuptools updated version on pipelines. + sed -i 's/setuptools<60//g' requirements/common_constraints.txt pip install -q pip-tools pip-compile --allow-unsafe --upgrade -o requirements/edx/pip.txt requirements/edx/pip.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 5ef6d97266..8c4cd9672f 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -24,9 +24,7 @@ Django<4.0 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html elasticsearch<7.14.0 -# setuptools==60.0 had breaking changes and busted several service's pipeline. -# Details can be found here: https://github.com/pypa/setuptools/issues/2940 -setuptools<60 + # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected django-simple-history==3.0.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a84f26e71b..71f0ce1a0d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -16,7 +16,7 @@ aiohttp==3.8.3 # via geoip2 aiosignal==1.3.1 # via aiohttp -algoliasearch==2.6.2 +algoliasearch==2.6.3 # via -r requirements/edx/base.in amqp==5.1.1 # via kombu @@ -481,7 +481,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # learner-pathway-progress -edx-event-bus-kafka==3.6.0 +edx-event-bus-kafka==3.6.1 # via -r requirements/edx/base.in edx-i18n-tools==0.9.2 # via ora2 @@ -711,7 +711,7 @@ mock==5.0.1 # xblock-poll mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/github.in -mongoengine==0.25.0 +mongoengine==0.26.0 # via -r requirements/edx/base.in monotonic==1.6 # via @@ -755,11 +755,11 @@ openedx-calc==3.0.1 # via -r requirements/edx/base.in openedx-django-wiki==1.1.4 # via -r requirements/edx/base.in -openedx-events==4.1.0 +openedx-events==4.1.1 # via # -r requirements/edx/base.in # edx-event-bus-kafka -openedx-filters==0.8.0 +openedx-filters==1.0.0 # via # -r requirements/edx/base.in # lti-consumer-xblock diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 592bd7cc8b..34af35894e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -22,7 +22,7 @@ aiosignal==1.3.1 # aiohttp alabaster==0.7.13 # via sphinx -algoliasearch==2.6.2 +algoliasearch==2.6.3 # via -r requirements/edx/testing.txt amqp==5.1.1 # via @@ -51,7 +51,7 @@ asn1crypto==1.5.1 # -r requirements/edx/testing.txt # oscrypto # snowflake-connector-python -astroid==2.13.2 +astroid==2.13.3 # via # -r requirements/edx/testing.txt # pylint @@ -605,7 +605,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # learner-pathway-progress -edx-event-bus-kafka==3.6.0 +edx-event-bus-kafka==3.6.1 # via -r requirements/edx/testing.txt edx-i18n-tools==0.9.2 # via @@ -948,7 +948,7 @@ mock==5.0.1 # xblock-poll mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/testing.txt -mongoengine==0.25.0 +mongoengine==0.26.0 # via -r requirements/edx/testing.txt monotonic==1.6 # via @@ -1001,7 +1001,7 @@ openedx-calc==3.0.1 # via -r requirements/edx/testing.txt openedx-django-wiki==1.1.4 # via -r requirements/edx/testing.txt -openedx-events==4.1.0 +openedx-events==4.1.1 # via # -r requirements/edx/testing.txt # edx-event-bus-kafka @@ -1490,7 +1490,7 @@ sphinx==5.3.0 # sphinxcontrib-openapi sphinx-mdinclude==0.5.3 # via sphinxcontrib-openapi -sphinxcontrib-applehelp==1.0.3 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index bbd7c49785..0a74ca1087 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -65,7 +65,7 @@ sphinx==5.3.0 # -c requirements/edx/../common_constraints.txt # -r requirements/edx/doc.in # edx-sphinx-theme -sphinxcontrib-applehelp==1.0.3 +sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt index 98f533108d..3a6094c1fa 100644 --- a/requirements/edx/pip.txt +++ b/requirements/edx/pip.txt @@ -6,9 +6,7 @@ # pip==22.3.1 # via -r requirements/edx/pip.in -setuptools==59.8.0 - # via - # -c requirements/edx/../common_constraints.txt - # -r requirements/edx/pip.in +setuptools==66.1.1 + # via -r requirements/edx/pip.in wheel==0.38.4 # via -r requirements/edx/pip.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4b773e7e37..65b944a37a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -20,7 +20,7 @@ aiosignal==1.3.1 # via # -r requirements/edx/base.txt # aiohttp -algoliasearch==2.6.2 +algoliasearch==2.6.3 # via -r requirements/edx/base.txt amqp==5.1.1 # via @@ -47,7 +47,7 @@ asn1crypto==1.5.1 # -r requirements/edx/base.txt # oscrypto # snowflake-connector-python -astroid==2.13.2 +astroid==2.13.3 # via # pylint # pylint-celery @@ -584,7 +584,7 @@ edx-enterprise==3.60.15 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # learner-pathway-progress -edx-event-bus-kafka==3.6.0 +edx-event-bus-kafka==3.6.1 # via -r requirements/edx/base.txt edx-i18n-tools==0.9.2 # via @@ -903,7 +903,7 @@ mock==5.0.1 # xblock-poll mongodbproxy @ git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a # via -r requirements/edx/base.txt -mongoengine==0.25.0 +mongoengine==0.26.0 # via -r requirements/edx/base.txt monotonic==1.6 # via @@ -952,7 +952,7 @@ openedx-calc==3.0.1 # via -r requirements/edx/base.txt openedx-django-wiki==1.1.4 # via -r requirements/edx/base.txt -openedx-events==4.1.0 +openedx-events==4.1.1 # via # -r requirements/edx/base.txt # edx-event-bus-kafka