Merge branch 'manager-kresctl-packaging-fixes' into 'manager'

fix kresctl packaging

See merge request !1344

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') -%}

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"

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 = \

manager/tests/packaging/interactive/workers.sh

 #!/bin/bash
 
-# set -e
+set -e
 
-# kresctl config /workers 5
+kresctl config /workers 5
 
-# test "$(ps -a -x | grep kresd | grep -v grep | wc -l)" -eq 5
+test "$(ps -a -x | grep kresd | grep -v grep | wc -l)" -eq 5