poetry: prometheus-client is now optional

Description and authors update. New setup.py also generated.

diff --git a/manager/pyproject.toml b/manager/pyproject.toml
index fca593aac5ae332420229aca9b9e2c1fac688e62..3b63350f53fbc840745ce6a1de923c2856ae03f2 100644 (file)
--- a/manager/pyproject.toml
+++ b/manager/pyproject.toml
@@ -1,10 +1,11 @@
 [tool.poetry]
 name = "knot-resolver-manager"
-version = "0.1.0"
-description = "A central management tool for multiple instances of Knot Resolver"
+version = "6.0.7"
+description = "A central tool for managing individual parts of Knot Resolver"
+
 authors = [
-    "Václav Šraier <vaclav.sraier@nic.cz>",
-    "Aleš Mrázek <ales.mrazek@nic.cz>"
+    "Aleš Mrázek <ales.mrazek@nic.cz>",
+    "Václav Šraier <vaclav.sraier@nic.cz>"
 ]
 
 # See currently open issue about building C extensions here:
@@ -20,7 +21,10 @@ jinja2 = "*"
 pyyaml = "*"
 supervisor = "*"
 typing-extensions = "*"
-prometheus-client = "*"
+prometheus-client = { version = "*", optional = true }
+
+[tool.poetry.extras]
+prometheus = ["prometheus-client"]
 
 [tool.poetry.group.dev.dependencies]
 poetry = "^1.7.1"

diff --git a/manager/setup.py b/manager/setup.py
index ec3b32fc91acc44fd7022bda9041ec83efdb1624..bbd244d7e5261a8ace745692059f92af262798a3 100644 (file)
--- a/manager/setup.py
+++ b/manager/setup.py
@@ -19,12 +19,10 @@ package_data = \
 {'': ['*'], 'knot_resolver_manager.datamodel.templates': ['macros/*']}
 
 install_requires = \
-['aiohttp',
- 'jinja2',
- 'prometheus-client',
- 'pyyaml',
- 'supervisor',
- 'typing-extensions']
+['aiohttp', 'jinja2', 'pyyaml', 'supervisor', 'typing-extensions']
+
+extras_require = \
+{'prometheus': ['prometheus-client']}
 
 entry_points = \
 {'console_scripts': ['knot-resolver = knot_resolver_manager.__main__:run',
@@ -32,17 +30,18 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'knot-resolver-manager',
-    'version': '0.1.0',
-    'description': 'A central management tool for multiple instances of Knot Resolver',
+    'version': '6.0.7',
+    'description': 'A central tool for managing individual parts of Knot Resolver',
     'long_description': 'None',
-    'author': 'Václav Šraier',
-    'author_email': 'vaclav.sraier@nic.cz',
+    'author': 'Aleš Mrázek',
+    'author_email': 'ales.mrazek@nic.cz',
     'maintainer': 'None',
     'maintainer_email': 'None',
     'url': 'None',
     'packages': packages,
     'package_data': package_data,
     'install_requires': install_requires,
+    'extras_require': extras_require,
     'entry_points': entry_points,
     'python_requires': '>=3.8,<4.0',
 }