From 0b5088e22f65cb08b80c5c51e349846c57ec4cdf Mon Sep 17 00:00:00 2001 From: Sven Kieske Date: Thu, 30 Nov 2023 09:20:16 +0000 Subject: [PATCH] Revert "podman: install "rich" dependency" This reverts commit 0b1a59dd8cc2b402b5a0ad9b02144edd1daf40ca. Reason for revert: Upstream Fix available at https://github.com/containers/podman-py/pull/351 Change-Id: Iadb74ffb5a747bd16e6acebd6a9c22b3b7198fd0 --- tests/templates/globals-default.j2 | 3 --- tox.ini | 1 - 2 files changed, 4 deletions(-) diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 3c70fc2d17..70dddf83cc 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -19,9 +19,6 @@ docker_restart_policy: "no" podman_debug: true podman_registry_mirrors: - {{ infra_dockerhub_mirror }} -podman_sdk_pip_packages: - - "podman>=4.7.0" - - rich {% if need_build_image and is_previous_release %} podman_registry: "primary:4000" podman_registry_insecure: true diff --git a/tox.ini b/tox.ini index b62e6a32dc..206f08cc28 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,6 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/up -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt podman>=4.3.0,<5 - rich passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY, \ OS_STDOUT_CAPTURE,OS_STDERR_CAPTURE,OS_LOG_CAPTURE,OS_TEST_TIMEOUT, \ PYTHON,OS_TEST_PATH,LISTOPT,IDOPTION