manager dependencies: accept just about any pyyaml (problems with kresctl refusing...

diff --git a/manager/pyproject.toml b/manager/pyproject.toml
index b9b66a656ce44306da6294f1a35483aa72fda738..08fc90ca086a1d6bdba850cb6f37aa63e4d93094 100644 (file)
--- a/manager/pyproject.toml
+++ b/manager/pyproject.toml
@@ -17,7 +17,7 @@ generate-setup-file = true
 python = "^3.6.8"
 aiohttp = "^3.6.12"
 Jinja2 = "^2.11.3"
-PyYAML = "^5.4.1"
+PyYAML = "*"
 typing-extensions = ">=3.7.2"
 prometheus-client = "^0.6"
 supervisor = "^4.2.2"

diff --git a/manager/setup.py b/manager/setup.py
index 6377e5e11541937cbe820864cc125ad3d4457184..bde19d66a49d7f52f8b30878db113e259144505a 100644 (file)
--- a/manager/setup.py
+++ b/manager/setup.py
@@ -20,7 +20,7 @@ package_data = \
 
 install_requires = \
 ['Jinja2>=2.11.3',
- 'PyYAML>=5.4.1',
+ 'PyYAML',
  'aiohttp>=3.6.12',
  'prometheus-client>=0.6',
  'supervisor>=4.2.2',

diff --git a/manager/tests/packaging/dependencies.py b/manager/tests/packaging/dependencies.py
index 20ad02d9a3711502df0bd489abdfb9e62a8b168b..6f3d4f404f68d0ae0446ff8ee95f31a8f06759c6 100755 (executable)
--- a/manager/tests/packaging/dependencies.py
+++ b/manager/tests/packaging/dependencies.py
@@ -20,8 +20,8 @@ mod = importlib.util.module_from_spec(spec)
 spec.loader.exec_module(mod)
 install_requires = mod.install_requires
 
-# stip version codes
-deps = set((x[: x.index(">")].lower() for x in install_requires))
+# strip version codes
+deps = set((x[: x.index(">")].lower() if ">" in x else x.lower() for x in install_requires))
 
 # find out which packages are missing
 installed = {pkg.key for pkg in pkg_resources.working_set}