From 721e5727968ec2ba4444d4f4f1e49df445205056 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 18 Aug 2023 07:50:48 -0700 Subject: [PATCH 1/4] notify-api-427 bug with worker failures --- app/config.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/config.py b/app/config.py index 67fec2ee1..9d3094778 100644 --- a/app/config.py +++ b/app/config.py @@ -195,11 +195,6 @@ class Config(object): 'schedule': crontab(), 'options': {'queue': QueueNames.PERIODIC} }, - 'tend-providers-back-to-middle': { - 'task': 'tend-providers-back-to-middle', - 'schedule': crontab(minute='*/5'), - 'options': {'queue': QueueNames.PERIODIC} - }, 'check-for-missing-rows-in-completed-jobs': { 'task': 'check-for-missing-rows-in-completed-jobs', 'schedule': crontab(minute='*/10'), From 3f62a3f55aeadc474e0e060bb8d8ffb61b8ba929 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 18 Aug 2023 08:01:42 -0700 Subject: [PATCH 2/4] fix flake8 --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index e59b45f18..b9fbeff80 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,7 +8,6 @@ from alembic.config import Config from flask import Flask from app import create_app -from app.config import configs from app.dao.provider_details_dao import get_provider_details_by_identifier @@ -97,7 +96,8 @@ def _notify_db(notify_api): # create a database for this worker thread - from flask import current_app - #current_app.config['SQLALCHEMY_DATABASE_URI'] += '_{}'.format(worker_id) + + # current_app.config['SQLALCHEMY_DATABASE_URI'] += '_{}'.format(worker_id) create_test_db(current_app.config['SQLALCHEMY_DATABASE_URI']) BASE_DIR = os.path.dirname(os.path.dirname(__file__)) From 245125fe38ad28bf1bc3dd00ae3b09396921a806 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 18 Aug 2023 08:31:46 -0700 Subject: [PATCH 3/4] downgrade a flask-marshmallow and psycopg2 to what UK notify has --- Pipfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 0e391c237..932b8419d 100644 --- a/Pipfile +++ b/Pipfile @@ -37,7 +37,7 @@ docutils = "==0.16" eventlet = "==0.33.3" flask = "~=2.3" flask-bcrypt = "==1.0.1" -flask-marshmallow = "==0.15.0" +flask-marshmallow = "==0.14.0" flask-migrate = "==4.0.4" flask-redis = "==0.4.0" flask-sqlalchemy = "==3.0.5" @@ -50,7 +50,7 @@ marshmallow = "==3.20.1" marshmallow-sqlalchemy = "==0.29.0" notifications-python-client = "==6.3.0" oscrypto = "==1.3.0" -psycopg2-binary = "==2.9.7" +psycopg2-binary = "==2.9.3" pyjwt = "==2.8.0" python-dotenv = "==1.0.0" radon = "==6.0.1" From 6b0a315281467f692f0ed562c489208a27fd1904 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 18 Aug 2023 08:37:54 -0700 Subject: [PATCH 4/4] fix flake8 --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 01082ef77..ad3ceebec 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -171,4 +171,4 @@ class Matcher: return self.key(other) def __repr__(self): - return ''.format(self.description) \ No newline at end of file + return ''.format(self.description)