From c112fa88e47af1848d6adb917d1be73fde35ad73 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 25 May 2022 09:25:10 +0200 Subject: [PATCH 1/3] Removed retry and types-retry decorators from requirements --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a7a970cb..724bf5cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -64,7 +64,6 @@ python-dateutil==2.8.2 pyzmq==22.1.0 requests==2.26.0 requests-unixsocket==0.2.0 -retry==0.9.2 scikit-learn==0.24.2 scipy==1.7.0 Send2Trash==1.7.1 @@ -77,7 +76,6 @@ threadpoolctl==2.2.0 timezonefinder==5.2.0 tornado==6.1 traitlets==5.0.5 -types-retry==0.9.7 urllib3==1.26.6 voila==0.2.10 wcwidth==0.2.5 From 844d403c9095a9da0015d6363c4ec7358b621aa4 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 30 May 2022 09:18:01 +0200 Subject: [PATCH 2/3] changed retry decorator to be only in the tests and not in the core installation --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bc035ea7..00accdec 100644 --- a/setup.py +++ b/setup.py @@ -30,12 +30,10 @@ REQUIREMENTS: dict = { 'numpy', 'psutil', 'python-dateutil', - 'retry', 'scipy', 'sklearn', 'timezonefinder', 'tornado', - 'types-retry', 'voila >=0.2.4', ], 'app': [], @@ -44,8 +42,10 @@ REQUIREMENTS: dict = { 'pytest-mypy', 'pytest-tornasync', 'numpy-stubs @ git+https://github.com/numpy/numpy-stubs.git', + 'retry', 'types-dataclasses', 'types-python-dateutil', + 'types-retry', ], 'dev': [ 'jupyterlab', From 1b4d297afb6ce99cdeb09a3c7d09e291d35c2cbe Mon Sep 17 00:00:00 2001 From: "CERN\\Andrejh" Date: Mon, 30 May 2022 10:08:45 +0200 Subject: [PATCH 3/3] new statement --- cara/apps/templates/cern/calculator.report.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2 index 11c6f5c2..cb518441 100644 --- a/cara/apps/templates/cern/calculator.report.html.j2 +++ b/cara/apps/templates/cern/calculator.report.html.j2 @@ -51,7 +51,7 @@
{% if cern_level == "green-1" %} {% elif cern_level == "yellow-2" %}