diff --git a/src/batou/lib/resources/supervisor.buildout.cfg b/src/batou/lib/resources/supervisor.buildout.cfg index 1b9dd5cd8..550bd0de6 100644 --- a/src/batou/lib/resources/supervisor.buildout.cfg +++ b/src/batou/lib/resources/supervisor.buildout.cfg @@ -5,13 +5,14 @@ versions = versions allow-picked-versions = false [versions] -setuptools = 50.3.2 +setuptools = 68.0.0 meld3 = 2.0.1 nagiosplugin = 1.3.2 superlance = 1.0 supervisor = 4.2.1 -zc.buildout = 2.13.3 +zc.buildout = 3.0.1 zc.recipe.egg = 2.0.7 +wheel = 0.40.0 [nagiosplugin] recipe = zc.recipe.egg diff --git a/src/batou/lib/supervisor.py b/src/batou/lib/supervisor.py index e8bfd54df..112078963 100644 --- a/src/batou/lib/supervisor.py +++ b/src/batou/lib/supervisor.py @@ -169,6 +169,8 @@ def configure(self): class Supervisor(Component): address = Attribute(Address, default=ConfigString("localhost:9001")) + buildout_version = Attribute(default="3.0.1") + setuptools_version = Attribute(default="68.0.0") buildout_cfg = os.path.join( os.path.dirname(__file__), "resources", "supervisor.buildout.cfg" ) @@ -203,12 +205,13 @@ class Supervisor(Component): def configure(self): self.provide("supervisor", self) - buildout_cfg = File("buildout.cfg", source=self.buildout_cfg) + buildout_cfg = File("buildout3.cfg", source=self.buildout_cfg) self += Buildout( - version="2.13.3", - setuptools="50.3.2", + version=self.buildout_version, + setuptools=self.setuptools_version, config=buildout_cfg, python="3", + wheel="0.40.0", ) self.program_config_dir = Directory("etc/supervisor.d", leading=True)