From 0790a77c07efa11995f7d30d3a99e6dc8b372d75 Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Mon, 14 Oct 2024 15:19:15 +0100 Subject: [PATCH 1/3] update python to 3.13 and disable pytest-profiling --- tests/Dockerfile | 2 +- tests/requirements.txt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/Dockerfile b/tests/Dockerfile index d65b540794..9ce5f65e87 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -5,7 +5,7 @@ FROM kindest/node:v1.31.1@sha256:cd224d8da58d50907d1dd41d476587643dad2ffd9f6a4d9 # this is here so we can grab the latest version of skopeo and have dependabot keep it up to date FROM quay.io/skopeo/stable:v1.16.1 -FROM python:3.12@sha256:05855f5bf06f5a004b0c1a8aaac73a9d9ea54390fc289d3e80ef52c4f90d5585 +FROM python:3.13@sha256:45803c375b95ea33f482e53a461eca8f247617667d703660a06ccf5eb3d05326 RUN apt-get update \ && apt-get install -y curl git \ diff --git a/tests/requirements.txt b/tests/requirements.txt index 667939027d..644ffce718 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -537,10 +537,11 @@ pytest-metadata==3.1.1 \ # via # -r requirements.txt # pytest-html -pytest-profiling==1.7.0 \ - --hash=sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29 \ - --hash=sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019 - # via -r requirements.txt +# Broken on pyton version 3.13+ +# pytest-profiling==1.7.0 \ +# --hash=sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29 \ +# --hash=sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019 +# # via -r requirements.txt python-dateutil==2.9.0.post0 \ --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \ --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427 From 8ffffa88d210d4f857f111d4fdc871e06e145c8a Mon Sep 17 00:00:00 2001 From: Alex Fenlon Date: Mon, 14 Oct 2024 16:51:22 +0100 Subject: [PATCH 2/3] remove --profile from toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4f7d00cfd3..429f5e1057 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ pythonpath = [ "tests/suite/fixtures", "tests/suite/utils", ] -addopts = "--tb=native -ra --disable-warnings -x -l --profile -v --strict-markers" +addopts = "--tb=native -ra --disable-warnings -x -l -v --strict-markers" log_cli = true markers =[ "agent", From f5b33a09af258e7269d61b22c6bbb676a4aba93e Mon Sep 17 00:00:00 2001 From: AlexFenlon Date: Mon, 14 Oct 2024 16:57:55 +0100 Subject: [PATCH 3/3] Update python typo Signed-off-by: AlexFenlon --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 644ffce718..e83b393205 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -537,7 +537,7 @@ pytest-metadata==3.1.1 \ # via # -r requirements.txt # pytest-html -# Broken on pyton version 3.13+ +# Broken on python version 3.13+ # pytest-profiling==1.7.0 \ # --hash=sha256:93938f147662225d2b8bd5af89587b979652426a8a6ffd7e73ec4a23e24b7f29 \ # --hash=sha256:999cc9ac94f2e528e3f5d43465da277429984a1c237ae9818f8cfd0b06acb019