From dc602cad865f63a8c92236dac8366f859a969641 Mon Sep 17 00:00:00 2001 From: LucaNicosia Date: Fri, 31 Jan 2025 15:07:00 +0100 Subject: [PATCH 1/4] Dockerfile-sqbase: update base to python:3.9.21-slim Signed-off-by: LucaNicosia --- Dockerfile-sqbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-sqbase b/Dockerfile-sqbase index 45072af4cc..745a4b456d 100644 --- a/Dockerfile-sqbase +++ b/Dockerfile-sqbase @@ -1,4 +1,4 @@ -FROM python:3.8.14-slim-buster AS sqbase +FROM python:3.9.21-slim-bullseye AS sqbase ENV PATH=/root/.local/bin:$PATH ENV PYTHONPATH=/root/.local/lib From a2f927d7bddf6192f1caed5a0783ededa535885e Mon Sep 17 00:00:00 2001 From: LucaNicosia Date: Fri, 31 Jan 2025 15:14:17 +0100 Subject: [PATCH 2/4] Dockerfile: update PATH env variable to python3.9 Signed-off-by: LucaNicosia --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3877a6ecf..d220b45a73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,8 @@ RUN python3 -m pip install --no-cache-dir /tmp/suzieq-$version-py3-none-any.whl rm -rf /tmp/* /var/tmp/* VOLUME [ "/home/$username/parquet" ] - -ENV PATH=/root/.local/bin:$PATH:/root/.local/lib/python3.7/site-packages/suzieq/cli/:/root/.local/lib/python3.7/site-packages/suzieq/poller/:/root/.local/lib/python3.7/site-packages/suzieq/restServer + +ENV PATH=/root/.local/bin:$PATH:/root/.local/lib/python3.9/site-packages/suzieq/cli/:/root/.local/lib/python3.9/site-packages/suzieq/poller/:/root/.local/lib/python3.9/site-packages/suzieq/restServer ENV SQENV=docker From c5c1cbfd110725392336d079a50cedc17e210978 Mon Sep 17 00:00:00 2001 From: LucaNicosia Date: Fri, 31 Jan 2025 15:16:25 +0100 Subject: [PATCH 3/4] pyproject: update uvicon to ^0.15.0 Signed-off-by: LucaNicosia --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index eb4f2a0c13..14b34a6986 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4727,19 +4727,19 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uvicorn" -version = "0.14.0" +version = "0.15.0" description = "The lightning-fast ASGI server." category = "main" optional = false python-versions = "*" files = [ - {file = "uvicorn-0.14.0-py3-none-any.whl", hash = "sha256:2a76bb359171a504b3d1c853409af3adbfa5cef374a4a59e5881945a97a93eae"}, - {file = "uvicorn-0.14.0.tar.gz", hash = "sha256:45ad7dfaaa7d55cab4cd1e85e03f27e9d60bc067ddc59db52a2b0aeca8870292"}, + {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, + {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, ] [package.dependencies] -asgiref = ">=3.3.4" -click = ">=7" +asgiref = ">=3.4.0" +click = ">=7.0" h11 = ">=0.8" [package.extras] @@ -5111,4 +5111,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">3.8.1, < 3.10" -content-hash = "ece1db60a0522861ddeff3f1274a91e08181ac0bafc0955199cbd0a934b6b2f8" +content-hash = "52baef73e079105051f17534c6fd05f66e760560dcf44b6f4541d625687a2bdc" diff --git a/pyproject.toml b/pyproject.toml index a6bd7bad57..07d32a18a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ faker = "~4.18" netconan = "~0.11.2" jsonpath-ng = "~1.6" fastapi = "~0.95.2" -uvicorn = "^0.14.0" +uvicorn = "^0.15.0" tabulate = "^0.8.7" streamlit = "1.11.1" graphviz = "^0.15" From df811ecd296c01601436322ea0ade9b6ebcb08c7 Mon Sep 17 00:00:00 2001 From: LucaNicosia Date: Fri, 31 Jan 2025 15:16:41 +0100 Subject: [PATCH 4/4] update requirements.txt Signed-off-by: LucaNicosia --- build/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/requirements.txt b/build/requirements.txt index 4da43b63d9..ece2e75a4a 100644 --- a/build/requirements.txt +++ b/build/requirements.txt @@ -111,6 +111,7 @@ python-dateutil==2.8.2 ; python_full_version > "3.8.1" and python_version < "3.1 python-dotenv==0.19.2 ; python_full_version > "3.8.1" and python_version < "3.10" python-nubia==0.2b5 ; python_full_version > "3.8.1" and python_version < "3.10" pytz==2023.3 ; python_full_version > "3.8.1" and python_version < "3.10" +pyvmomi==8.0.2.0.1 ; python_full_version > "3.8.1" and python_version < "3.10" pywin32==306 ; sys_platform == "win32" and platform_python_implementation != "PyPy" and python_full_version > "3.8.1" and python_version < "3.10" pywinpty==2.0.11 ; python_full_version > "3.8.1" and python_version < "3.10" and os_name == "nt" pyyaml==6.0 ; python_full_version > "3.8.1" and python_version < "3.10" @@ -145,7 +146,7 @@ typing-extensions==4.7.1 ; python_full_version > "3.8.1" and python_version < "3 typing-inspect==0.9.0 ; python_full_version > "3.8.1" and python_version < "3.10" tzlocal==2.1 ; python_full_version > "3.8.1" and python_version < "3.10" urllib3==1.26.16 ; python_full_version > "3.8.1" and python_version < "3.10" -uvicorn==0.14.0 ; python_full_version > "3.8.1" and python_version < "3.10" +uvicorn==0.15.0 ; python_full_version > "3.8.1" and python_version < "3.10" uvloop==0.17.0 ; python_full_version > "3.8.1" and python_version < "3.10" validators==0.20.0 ; python_full_version > "3.8.1" and python_version < "3.10" watchdog==3.0.0 ; python_full_version > "3.8.1" and python_version < "3.10" and platform_system != "Darwin"