From ce526dac3c1ea1fd3f572618d6e43f0cfe726749 Mon Sep 17 00:00:00 2001 From: marwoodandrew Date: Mon, 20 Feb 2023 15:11:34 +1100 Subject: [PATCH 1/2] [SDAAP-60] Update newrelic --- server/requirements.in | 2 +- server/requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/requirements.in b/server/requirements.in index 8020ff36d..4f597be09 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -2,7 +2,7 @@ gunicorn==20.0.4 honcho==1.0.1 pyodbc==4.0.32 unidecode==0.04.21 -newrelic>=2.66,<2.67 +newrelic==8.7.0 titlecase==0.8.2 pyasn1==0.4.8 geopy==1.11.0 diff --git a/server/requirements.txt b/server/requirements.txt index 37c944c21..610f4a626 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: # # pip-compile requirements.in # @@ -154,7 +154,7 @@ mongolock==1.3.4 # via superdesk-core natsort==8.2.0 # via croniter -newrelic==2.66.0.49 +newrelic==8.7.0 # via -r requirements.in oauth2client==4.1.3 # via From 9cf34a6dc55604a852a12c3a07fc81ce1f656ba3 Mon Sep 17 00:00:00 2001 From: marwoodandrew Date: Mon, 20 Feb 2023 15:45:16 +1100 Subject: [PATCH 2/2] Fix failing tests --- server/aap/macros/clean_keywords.py | 2 +- server/aap/macros/rename_genre_value.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/aap/macros/clean_keywords.py b/server/aap/macros/clean_keywords.py index 1c000dd85..02036c42c 100644 --- a/server/aap/macros/clean_keywords.py +++ b/server/aap/macros/clean_keywords.py @@ -20,7 +20,7 @@ def clean_keywords(**kwargs): service = superdesk.get_resource_service(repo) counter = 0 - for items in IndexFromMongo().get_mongo_items(repo, 500, None): + for items in IndexFromMongo().get_mongo_items(repo, 500, None, False): print('Processing items from {} to {}'.format(counter * 500, counter * 500 + len(items))) for item in items: diff --git a/server/aap/macros/rename_genre_value.py b/server/aap/macros/rename_genre_value.py index af15c9ea0..ef3557e7a 100644 --- a/server/aap/macros/rename_genre_value.py +++ b/server/aap/macros/rename_genre_value.py @@ -20,7 +20,7 @@ def rename_genre_value(**kwargs): service = superdesk.get_resource_service(repo) counter = 0 - for items in IndexFromMongo().get_mongo_items(repo, 500, None): + for items in IndexFromMongo().get_mongo_items(repo, 500, None, False): print('Processing items from {} to {}'.format(counter * 500, counter * 500 + len(items))) for item in items: