From 584633ae9b12d1d3c9b3bb6b6a5158d47fa3174d Mon Sep 17 00:00:00 2001 From: Jen Patague Date: Wed, 5 Jun 2024 10:12:48 -0700 Subject: [PATCH 1/3] Fix scribereader imports to work with newer package --- sticht/slack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sticht/slack.py b/sticht/slack.py index dd6b6b8..2819b5e 100644 --- a/sticht/slack.py +++ b/sticht/slack.py @@ -29,8 +29,8 @@ try: from scribereader import scribereader - from clog.readers import construct_conn_msg - from clog.readers import find_tail_host + from scribereader.clog.readers import construct_conn_msg + from scribereader.clog.readers import find_tail_host except ImportError: scribereader = None construct_conn_msg = None From 373ce3b04eaa8b99b169ca6dd28e30f40b2cdc6e Mon Sep 17 00:00:00 2001 From: Jen Patague Date: Wed, 5 Jun 2024 10:29:32 -0700 Subject: [PATCH 2/3] Add minimal clog/scribereader versions to yelp_internal requirements --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index baa58bc..472db2e 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,8 @@ ], extras_require={ 'yelp_internal': [ - 'yelp-clog>=2.12.1', + 'yelp-clog>=7.1.1', + 'scribereader>=1.1.1' 'slo-transcoder>=3.2.3', ], }, From 6f1ae43074ad170fb738ac21488f1f2f9e221981 Mon Sep 17 00:00:00 2001 From: Jen Patague Date: Wed, 5 Jun 2024 10:29:58 -0700 Subject: [PATCH 3/3] whoops --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 472db2e..6736d1e 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ extras_require={ 'yelp_internal': [ 'yelp-clog>=7.1.1', - 'scribereader>=1.1.1' + 'scribereader>=1.1.1', 'slo-transcoder>=3.2.3', ], },