From 2415065ce107552b3141c232ac6eb3e2a29277c0 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 21 Jul 2023 13:49:52 -0600 Subject: [PATCH 1/2] Exclude PyYAML 5.4.0,5.4.1 See https://github.com/yaml/pyyaml/issues/601 Signed-off-by: Zack Cerza --- requirements.txt | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f2e2ce3de..b093b43e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -274,7 +274,7 @@ pytz==2021.1 # via # oslo-serialization # oslo-utils -pyyaml==5.4.1 +pyyaml==5.3.1 # via # ansible-base # cliff diff --git a/setup.cfg b/setup.cfg index ae201dac1..90f06fb69 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ summary = Ceph test framework [options] packages = find: install_requires = - PyYAML + PyYAML<6.0,!=5.4.0,!=5.4.1 ansible>=2.10,<3.0 apache-libcloud backports.ssl-match-hostname From c205639f6c21566038fd50d55a04edf3d22a59e0 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 21 Jul 2023 13:53:29 -0600 Subject: [PATCH 2/2] Update pip-tools Signed-off-by: Zack Cerza --- requirements.txt | 5 +++-- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b093b43e9..725a77650 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --extra=test pyproject.toml @@ -207,7 +207,7 @@ pep517==0.11.0 # via build pexpect==4.8.0 # via teuthology (pyproject.toml) -pip-tools==6.11.0 +pip-tools==6.14.0 # via teuthology (pyproject.toml) platformdirs==2.4.0 # via virtualenv @@ -333,6 +333,7 @@ tomli==2.0.1 # via # build # pep517 + # pip-tools # pytest tox==3.25.0 # via teuthology (pyproject.toml) diff --git a/setup.cfg b/setup.cfg index 90f06fb69..9e1422a56 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,7 @@ install_requires = netaddr paramiko pexpect - pip-tools>=6.10.0 + pip-tools<7.0.0 prettytable psutil>=2.1.0 pyasn1