From e56621ad59e87324e7be169be52c7fc21ce38ce0 Mon Sep 17 00:00:00 2001 From: Pyotr Void Date: Thu, 29 Sep 2022 15:50:42 +0400 Subject: [PATCH 1/4] bump py-cpuinfo to 8.0.0 fix package error for M1 Mac computers --- src/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requirements.txt b/src/requirements.txt index de4fe88..9f3fbbc 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,7 +1,7 @@ Flask==1.1.2 -py-cpuinfo==7.0.0 +py-cpuinfo==8.0.0 psutil==5.8.0 gunicorn==20.1.0 black==20.8b1 flake8==3.9.0 -pytest==6.2.2 \ No newline at end of file +pytest==6.2.2 From 0c17e92ba2be8fe117778ed40f1f7f48de0bcf3e Mon Sep 17 00:00:00 2001 From: Pyotr Void Date: Thu, 29 Sep 2022 17:59:39 +0400 Subject: [PATCH 2/4] fix for M1 Mac thx to https://github.com/benc-uk/python-demoapp/issues/5#issuecomment-1247871725 --- src/app/tests/test_api.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/tests/test_api.py b/src/app/tests/test_api.py index 8b0ba9e..982b048 100644 --- a/src/app/tests/test_api.py +++ b/src/app/tests/test_api.py @@ -8,9 +8,11 @@ def test_api_process(client): assert resp.status_code == 200 assert resp.headers["Content-Type"] == "application/json" resp_payload = json.loads(resp.data) - assert len(resp_payload["processes"]) > 0 - assert resp_payload["processes"][0]["memory_percent"] > 0 - assert len(resp_payload["processes"][0]["name"]) > 0 + processes = resp_payload["processes"] + print(resp_payload["processes"][0]["memory_percent"]) + assert len(processes) > 0 + assert resp_payload["processes"][0]["memory_percent"] == None or processes[0]["memory_percent"] > 0 + assert len(processes[0]["name"]) == None or len(processes[0]["name"]) > 0 # Test the monitor API returns JSON results we expect From 42eafefcafb3ed8c8a18835b154d65d28a4855d8 Mon Sep 17 00:00:00 2001 From: Pyotr Void Date: Thu, 29 Sep 2022 18:00:31 +0400 Subject: [PATCH 3/4] Bump Flask version --- src/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requirements.txt b/src/requirements.txt index 9f3fbbc..cbcd481 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,4 +1,4 @@ -Flask==1.1.2 +Flask==2.1.0 py-cpuinfo==8.0.0 psutil==5.8.0 gunicorn==20.1.0 From f954268853f113d6a6e203bcec36955ac52fe3fa Mon Sep 17 00:00:00 2001 From: Pyotr Void Date: Sat, 1 Oct 2022 23:55:38 +0400 Subject: [PATCH 4/4] fix build process change image to prevent psutil install error --- build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index ae0775a..dadf458 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim-buster +FROM python:3.9 LABEL Name="Python Flask Demo App" Version=1.4.2 LABEL org.opencontainers.image.source = "https://github.com/benc-uk/python-demoapp" @@ -13,4 +13,4 @@ COPY $srcDir/app ./app EXPOSE 5000 -CMD ["gunicorn", "-b", "0.0.0.0:5000", "run:app"] \ No newline at end of file +CMD ["gunicorn", "-b", "0.0.0.0:5000", "run:app"]