From 7f217c967d0da66db7ef79d7e208854c89919da1 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek@redhat.com>
Date: Feb 18 2026 03:06:33 +0000
Subject: Modularity retired - remove corresponding commands


Modularity was discontinued in Fedora 39.
See: https://fedoraproject.org/wiki/Changes/RetireModularity
Override module-related commands to hide them, thus not to list
them among the available commands.

Fixes: #595

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---

diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
index d33b4cc..01ad376 100644
--- a/conf/etc/rpkg/fedpkg-stage.conf
+++ b/conf/etc/rpkg/fedpkg-stage.conf
@@ -13,12 +13,6 @@ clone_config_rpms =
   bz.default-version rawhide
   bz.default-component %(repo)s
   sendemail.to %(repo)s-maintainers@fedoraproject.org
-clone_config_modules =
-  bz.default-tracker partner-bugzilla.redhat.com
-  bz.default-product Fedora Modules
-  bz.default-version rawhide
-  bz.default-component %(repo)s
-  sendemail.to module-%(repo)s-maintainers@fedoraproject.org
 clone_config_container =
   bz.default-tracker partner-bugzilla.redhat.com
   bz.default-product Fedora Container Images
@@ -60,14 +54,6 @@ staging = True
 releases_service = https://bodhi.stg.fedoraproject.org/releases/%(release)s
 url = https://bodhi.stg.fedoraproject.org/
 
-[fedpkg-stage.mbs]
-auth_method = oidc
-api_url = https://mbs.stg.fedoraproject.org/module-build-service/1/
-oidc_id_provider = https://id.stg.fedoraproject.org/openidc/
-oidc_client_id = mbs-authorizer
-oidc_client_secret = notsecret
-oidc_scopes = openid,https://id.fedoraproject.org/scope/groups,https://mbs.fedoraproject.org/oidc/submit-build
-
 [fedpkg-stage.bugzilla]
 # Use production Bugzilla for read-only data
 url = https://bugzilla.redhat.com/
diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
index fa08a8a..d528a96 100644
--- a/conf/etc/rpkg/fedpkg.conf
+++ b/conf/etc/rpkg/fedpkg.conf
@@ -13,12 +13,6 @@ clone_config_rpms =
   bz.default-version rawhide
   bz.default-component %(repo)s
   sendemail.to %(repo)s-maintainers@fedoraproject.org
-clone_config_modules =
-  bz.default-tracker bugzilla.redhat.com
-  bz.default-product Fedora Modules
-  bz.default-version rawhide
-  bz.default-component %(repo)s
-  sendemail.to module-%(repo)s-maintainers@fedoraproject.org
 clone_config_container =
   bz.default-tracker bugzilla.redhat.com
   bz.default-product Fedora Container Images
@@ -62,14 +56,6 @@ staging = False
 releases_service = https://bodhi.fedoraproject.org/releases/%(release)s
 url = https://bodhi.fedoraproject.org/
 
-[fedpkg.mbs]
-auth_method = oidc
-api_url = https://mbs.fedoraproject.org/module-build-service/1/
-oidc_id_provider = https://id.fedoraproject.org/openidc/
-oidc_client_id = mbs-authorizer
-oidc_client_secret = notsecret
-oidc_scopes = openid,https://id.fedoraproject.org/scope/groups,https://mbs.fedoraproject.org/oidc/submit-build
-
 [fedpkg.bugzilla]
 url = https://bugzilla.redhat.com/
 
diff --git a/fedpkg/cli.py b/fedpkg/cli.py
index 1cccbb5..b230e1e 100644
--- a/fedpkg/cli.py
+++ b/fedpkg/cli.py
@@ -924,6 +924,36 @@ class fedpkgClient(cliClient):
 
         ''').format('\n'.join(textwrap.wrap(retire_parser.description)), self.name)
 
+    # Override module-related command registration methods
+    # Modularity was discontinued in Fedora 39 and disabled in EPEL8
+    # See: https://fedoraproject.org/wiki/Changes/RetireModularity
+
+    # Just don't register module-build-* methods - they won't be displayed in the list
+    # of available commands.
+    def register_module_build_common(self):
+        pass
+
+    def register_module_build(self):
+        pass
+
+    def register_module_scratch_build(self):
+        pass
+
+    def register_module_build_cancel(self):
+        pass
+
+    def register_module_build_info(self):
+        pass
+
+    def register_module_local_build(self):
+        pass
+
+    def register_module_build_watch(self):
+        pass
+
+    def register_module_overview(self):
+        pass
+
     # Target functions go here
     def _format_update_clog(self, clog):
         ''' Format clog for the update template. '''