From 968ad5c7139e927a3babf1a08ec54657d4d6d1e4 Mon Sep 17 00:00:00 2001 From: Jason Litton Date: Tue, 22 Oct 2024 15:49:44 -0600 Subject: [PATCH 1/3] bug(core-ticket): Add dispatch_weblink field to core ticket plugin (#5377) * fix(core-ticket): Add dispatch_weblink field to core ticket plugin When using the core ticket plugin, we're getting the error `TypeError: DispatchTicketPlugin.update() got an unexpected keyword argument 'dispatch_weblink'` This field was added for the Jira ticket plugin but never added to the core plugin. Since the plugin returns no matter the arguments, I've simply added the field. * add newline that ide removed --- src/dispatch/plugins/dispatch_core/plugin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dispatch/plugins/dispatch_core/plugin.py b/src/dispatch/plugins/dispatch_core/plugin.py index 2dbeb354a615..f8e881f160aa 100644 --- a/src/dispatch/plugins/dispatch_core/plugin.py +++ b/src/dispatch/plugins/dispatch_core/plugin.py @@ -211,6 +211,7 @@ def update( document_weblink: str, storage_weblink: str, conference_weblink: str, + dispatch_weblink: str, cost: float, incident_type_plugin_metadata: dict = None, ): From 63ae82068078544cc100b5a32d3d5915e7d71c37 Mon Sep 17 00:00:00 2001 From: Jason Litton Date: Tue, 22 Oct 2024 15:58:23 -0600 Subject: [PATCH 2/3] Revert python version bump (#5379) The move to python 3.14 breaks the docker build. The srsly package doesn't have a compatible wheel with anything above 3.12 right now, and it's using deprecated methods, so it can't be built by 3.14 yet. Because of this, `docker build .` is broken on master. Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 23ae6081f361..a0f0e10ce95f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13.0-slim-bullseye as sdist +FROM python:3.11.4-slim-bullseye as sdist LABEL maintainer="oss@netflix.com" LABEL org.opencontainers.image.title="Dispatch PyPI Wheel" @@ -56,7 +56,7 @@ RUN YARN_CACHE_FOLDER="$(mktemp -d)" \ && mv /usr/src/dispatch/dist /dist # This is the image to be run -FROM python:3.13.0-slim-bullseye +FROM python:3.11.4-slim-bullseye LABEL maintainer="oss@dispatch.io" LABEL org.opencontainers.image.title="Dispatch" From 295a60feba435c56bc3158d47e6a7efe4bde563e Mon Sep 17 00:00:00 2001 From: Alicia Matsumoto <56315176+aliciamatsumoto@users.noreply.github.com> Date: Tue, 22 Oct 2024 18:03:34 -0400 Subject: [PATCH 3/3] fix get_signal_filter args (#5376) Co-authored-by: Alicia Matsumoto Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> --- src/dispatch/signal/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dispatch/signal/views.py b/src/dispatch/signal/views.py index 6b38f20c5568..e8dab18aabe7 100644 --- a/src/dispatch/signal/views.py +++ b/src/dispatch/signal/views.py @@ -241,7 +241,7 @@ def update_filter( signal_filter_in: SignalFilterUpdate, ): """Updates an existing signal filter.""" - signal_filter = get_signal_filter(db_session=db_session, signal_id=signal_filter_id) + signal_filter = get_signal_filter(db_session=db_session, signal_filter_id=signal_filter_id) if not signal_filter: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND,