diff --git a/pungi/phases/gather/__init__.py b/pungi/phases/gather/__init__.py
index 96b6d9af..b559cfbc 100644
--- a/pungi/phases/gather/__init__.py
+++ b/pungi/phases/gather/__init__.py
@@ -51,11 +51,8 @@ def get_gather_source(name):
def get_gather_method(name):
import pungi.phases.gather.methods
- from .method import GatherMethodContainer
- GatherMethodContainer.register_module(pungi.phases.gather.methods)
- container = GatherMethodContainer()
- return container["GatherMethod%s" % name]
+ return pungi.phases.gather.methods.ALL_METHODS[name.lower()]
class GatherPhase(PhaseBase):
diff --git a/pungi/phases/gather/method.py b/pungi/phases/gather/method.py
index 7feb835f..94e5460b 100644
--- a/pungi/phases/gather/method.py
+++ b/pungi/phases/gather/method.py
@@ -14,15 +14,6 @@
# along with this program; if not, see .
-import kobo.plugins
-
-
-class GatherMethodBase(kobo.plugins.Plugin):
+class GatherMethodBase(object):
def __init__(self, compose):
self.compose = compose
-
-
-class GatherMethodContainer(kobo.plugins.PluginContainer):
- @classmethod
- def normalize_name(cls, name):
- return name.lower()
diff --git a/pungi/phases/gather/methods/__init__.py b/pungi/phases/gather/methods/__init__.py
index e69de29b..905edf70 100644
--- a/pungi/phases/gather/methods/__init__.py
+++ b/pungi/phases/gather/methods/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see .
+
+from .method_deps import GatherMethodDeps
+from .method_nodeps import GatherMethodNodeps
+from .method_hybrid import GatherMethodHybrid
+
+ALL_METHODS = {
+ "deps": GatherMethodDeps,
+ "nodeps": GatherMethodNodeps,
+ "hybrid": GatherMethodHybrid,
+}
diff --git a/pungi/phases/gather/methods/method_deps.py b/pungi/phases/gather/methods/method_deps.py
index a0e0bee6..1f3f9659 100644
--- a/pungi/phases/gather/methods/method_deps.py
+++ b/pungi/phases/gather/methods/method_deps.py
@@ -31,8 +31,6 @@ import pungi.phases.gather.method
class GatherMethodDeps(pungi.phases.gather.method.GatherMethodBase):
- enabled = True
-
def __call__(
self,
arch,
diff --git a/pungi/phases/gather/methods/method_hybrid.py b/pungi/phases/gather/methods/method_hybrid.py
index 5d143199..3c673c0f 100644
--- a/pungi/phases/gather/methods/method_hybrid.py
+++ b/pungi/phases/gather/methods/method_hybrid.py
@@ -60,8 +60,6 @@ class FakePackage(object):
class GatherMethodHybrid(pungi.phases.gather.method.GatherMethodBase):
- enabled = True
-
def __init__(self, *args, **kwargs):
super(GatherMethodHybrid, self).__init__(*args, **kwargs)
self.package_maps = {}
diff --git a/pungi/phases/gather/methods/method_nodeps.py b/pungi/phases/gather/methods/method_nodeps.py
index cd625047..062a386b 100644
--- a/pungi/phases/gather/methods/method_nodeps.py
+++ b/pungi/phases/gather/methods/method_nodeps.py
@@ -28,8 +28,6 @@ from kobo.pkgset import SimpleRpmWrapper, RpmWrapper
class GatherMethodNodeps(pungi.phases.gather.method.GatherMethodBase):
- enabled = True
-
def __call__(self, arch, variant, *args, **kwargs):
fname = "gather-nodeps-%s" % variant.uid
if self.source_name: