From 4abd94f52404a65e74ae194f1f91598a7d72b2af Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 19 Sep 2023 10:31:04 -0400 Subject: [PATCH] Update pinning Update charm-tools pin to allow it to pick up future 2.x releases. Pin PyYAML to the latest version that doesn't use Cython. Pins jsonschema in test-requirements.txt to fix test failures due to newer versions of jsonschema pulling in rpds-py and therefore the Rust toolchain. Change-Id: I450bec55ec3d12f24125caca149106bf84a9919d --- test-requirements.txt | 2 ++ tox.ini | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index af976b3..07417bb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -42,3 +42,5 @@ tempest<31.0.0;python_version<'3.8' and python_version>='3.6' tempest<24.0.0;python_version<'3.6' croniter # needed for charm-rabbitmq-server unit tests + +jsonschema<4.18.0 # jsonschema 4.18.0 depends on Rust (via rpds-py) diff --git a/tox.ini b/tox.ini index 7770606..1c905ff 100644 --- a/tox.ini +++ b/tox.ini @@ -90,7 +90,8 @@ deps = -r{toxinidir}/requirements.txt [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - charm-tools==2.8.4 + PyYAML==6.0.1 + charm-tools<3.0.0 commands = flake8 {posargs} hooks unit_tests tests actions lib files charm-proof