From 69e944d56a45081152562da0e4e1e52929b4e5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Tue, 22 Aug 2023 10:27:21 +0200 Subject: [PATCH 1/2] Revert "Fix LinuxTest package installation commands" This reverts commit 82fb7b277d211f206f0ed2edda9186e46e300816. --- tests/LinuxTest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/LinuxTest.py b/tests/LinuxTest.py index e5ef717e..0a5fe281 100644 --- a/tests/LinuxTest.py +++ b/tests/LinuxTest.py @@ -31,9 +31,9 @@ class LinuxTest(Test): if proc.returncode != 0: raise Exception("docker run failed (linux stack)") if distro in ("ubuntu", "debian"): - cmd = "apt install -y /opt/\\$(ls /opt | grep deb)" + cmd = "apt install -y /opt/\$(ls /opt | grep deb)" elif distro in ("centos", "fedora", "rhel"): - cmd = "dnf install -y /opt/\\$(ls /opt | grep rpm)" + cmd = "dnf install -y /opt/\$(ls /opt | grep rpm)" proc = LinuxTest.docker_exec(distro, cmd) if proc.returncode != 0: raise Exception("docker exec apt install failed (linux stack)") From 45a81203ed7681534e9251371110bca3490da594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Thu, 24 Aug 2023 14:59:10 +0200 Subject: [PATCH 2/2] Update python deps --- docs/requirements.txt | 2 +- src/common/gen/requirements.txt | 6 +++--- src/ui/requirements.in | 2 +- src/ui/requirements.txt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d9fb74db..24b5530e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ mkdocs==1.5.2 -mkdocs-material==9.1.21 +mkdocs-material==9.2.3 pytablewriter==1.0.0 mike==1.1.2 jinja2<3.1.0 diff --git a/src/common/gen/requirements.txt b/src/common/gen/requirements.txt index ba1d0b3c..a43751ff 100644 --- a/src/common/gen/requirements.txt +++ b/src/common/gen/requirements.txt @@ -272,9 +272,9 @@ urllib3==2.0.4 \ # docker # kubernetes # requests -websocket-client==1.6.1 \ - --hash=sha256:c951af98631d24f8df89ab1019fc365f2227c0892f12fd150e935607c79dd0dd \ - --hash=sha256:f1f9f2ad5291f0225a49efad77abf9e700b6fef553900623060dad6e26503b9d +websocket-client==1.6.2 \ + --hash=sha256:53e95c826bf800c4c465f50093a8c4ff091c7327023b10bfaff40cf1ef170eaa \ + --hash=sha256:ce54f419dfae71f4bdba69ebe65bf7f0a93fe71bc009ad3a010aacc3eebad537 # via # docker # kubernetes diff --git a/src/ui/requirements.in b/src/ui/requirements.in index 6db60b47..4e762542 100644 --- a/src/ui/requirements.in +++ b/src/ui/requirements.in @@ -1,6 +1,6 @@ bcrypt==4.0.1 beautifulsoup4==4.12.2 -Flask==2.3.2 +Flask==2.3.3 Flask_Login==0.6.2 Flask_WTF==1.1.1 gunicorn[gevent]==21.2.0 diff --git a/src/ui/requirements.txt b/src/ui/requirements.txt index 96d01bf7..0e1b9932 100644 --- a/src/ui/requirements.txt +++ b/src/ui/requirements.txt @@ -39,9 +39,9 @@ click==8.1.7 \ --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \ --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de # via flask -flask==2.3.2 \ - --hash=sha256:77fd4e1249d8c9923de34907236b747ced06e5467ecac1a7bb7115ae0e9670b0 \ - --hash=sha256:8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef +flask==2.3.3 \ + --hash=sha256:09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc \ + --hash=sha256:f69fcd559dc907ed196ab9df0e48471709175e696d6e698dd4dbe940f96ce66b # via # -r requirements.in # flask-login