From: Vasek Sraier <git@vakabus.cz>
Date: Wed, 21 Sep 2022 14:46:05 +0000 (+0200)
Subject: manager packaging: kresctl fix
X-Git-Tag: v6.0.0a1~24^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f097ee00179b0cdada7131568b63514c504bb654;p=thirdparty%2Fknot-resolver.git

manager packaging: kresctl fix

- downgraded pinned version of supervisord
- installing procps in CI
---

diff --git a/distro/tests/manager-packaging/control b/distro/tests/manager-packaging/control
index f70a0b33a..6f9c01fd2 100644
--- a/distro/tests/manager-packaging/control
+++ b/distro/tests/manager-packaging/control
@@ -13,9 +13,9 @@ Tests: systemd_service.sh
 Tests-Directory: manager/tests/packaging
 Restrictions: needs-root
 {% if distro.match('fedora') -%}
-Depends: knot-utils, jq, curl
+Depends: knot-utils, jq, curl, procps
 {% elif distro.match('debian') or distro.match('ubuntu') -%}
-Depends: knot-dnsutils, jq, curl
+Depends: knot-dnsutils, jq, curl, procps
 {% elif distro.match('arch') -%}
 Depends: knot, jq, curl
 {% elif distro.match('opensuse') -%}
diff --git a/manager/pyproject.toml b/manager/pyproject.toml
index 08fc90ca0..821042ae6 100644
--- a/manager/pyproject.toml
+++ b/manager/pyproject.toml
@@ -15,12 +15,12 @@ generate-setup-file = true
 
 [tool.poetry.dependencies]
 python = "^3.6.8"
-aiohttp = "^3.6.12"
+aiohttp = "^3.6"
 Jinja2 = "^2.11.3"
 PyYAML = "*"
 typing-extensions = ">=3.7.2"
 prometheus-client = "^0.6"
-supervisor = "^4.2.2"
+supervisor = "^4"
 
 [tool.poetry.dev-dependencies]
 pytest-cov = "^2.11.1"
diff --git a/manager/setup.py b/manager/setup.py
index bde19d66a..7d9ea59df 100644
--- a/manager/setup.py
+++ b/manager/setup.py
@@ -21,9 +21,9 @@ package_data = \
 install_requires = \
 ['Jinja2>=2.11.3',
  'PyYAML',
- 'aiohttp>=3.6.12',
+ 'aiohttp>=3.6',
  'prometheus-client>=0.6',
- 'supervisor>=4.2.2',
+ 'supervisor>=4',
  'typing-extensions>=3.7.2']
 
 entry_points = \