From fa14382c2dec343db719d1fe0c6ac45b6c7e374c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:10:13 -0400 Subject: [PATCH 1/2] feat: Upgrade Python dependency openedx-events (#33637) fix: event bus producer config merging Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` Co-authored-by: rgraber --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index bd08da99a6..78aaea42d6 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -776,7 +776,7 @@ openedx-django-require==2.1.0 # via -r requirements/edx/kernel.in openedx-django-wiki==2.0.3 # via -r requirements/edx/kernel.in -openedx-events==9.0.0 +openedx-events==9.0.1 # via # -r requirements/edx/kernel.in # edx-event-bus-kafka diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index bc583442dc..7d11576e5b 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1307,7 +1307,7 @@ openedx-django-wiki==2.0.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -openedx-events==9.0.0 +openedx-events==9.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 26f86893e4..6f75fc9813 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -916,7 +916,7 @@ openedx-django-require==2.1.0 # via -r requirements/edx/base.txt openedx-django-wiki==2.0.3 # via -r requirements/edx/base.txt -openedx-events==9.0.0 +openedx-events==9.0.1 # via # -r requirements/edx/base.txt # edx-event-bus-kafka diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 218485e8fa..a0ccb5ebfb 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -983,7 +983,7 @@ openedx-django-require==2.1.0 # via -r requirements/edx/base.txt openedx-django-wiki==2.0.3 # via -r requirements/edx/base.txt -openedx-events==9.0.0 +openedx-events==9.0.1 # via # -r requirements/edx/base.txt # edx-event-bus-kafka From b9ee4a9ad26ff2aaa40f8ea93356c81e1b319b56 Mon Sep 17 00:00:00 2001 From: alangsto <46360176+alangsto@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:11:02 -0400 Subject: [PATCH 2/2] test: remove echoes in dockerfile (#33639) --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bb7011395..a159d32464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -158,9 +158,6 @@ ENV SERVICE_PORT="${SERVICE_PORT}" ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS" EXPOSE ${SERVICE_PORT} -RUN echo "${SERVICE_VARIANT}" -RUN echo "${DJANGO_SETTINGS_MODULE}" - CMD gunicorn \ -c /edx/app/edxapp/edx-platform/${SERVICE_VARIANT}/docker_${SERVICE_VARIANT}_gunicorn.py \ --name ${SERVICE_VARIANT} \