Make Fedora helpers a subpackage

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

Author: sgallagher

mmdzanata/cli.py

@@ -16,7 +16,7 @@
 import gi
 import koji
 import mmdzanata
-import requests
+import mmdzanata.fedora
 import subprocess
 import sys
 
@@ -25,36 +25,6 @@
 gi.require_version('Modulemd', '1.0')
 from gi.repository import Modulemd
 
-def get_fedora_rawhide_version(session, debug=False):
-    # Koji sometimes disconnects for no apparent reason. Retry up to 5
-    # times before failing.
-    for attempt in range(5):
-        try:
-            build_targets = session.getBuildTargets('rawhide')
-        except requests.exceptions.ConnectionError:
-            if debug:
-                print("Connection lost while retriving rawhide branch, "
-                      "retrying...",
-                      file=sys.stderr)
-        else:
-            # Succeeded this time, so break out of the loop
-            break
-
-    return build_targets[0][
-        'build_tag_name'].partition('-build')[0]
-
-
-def get_tags_for_fedora_branch(branch):
-    return ['%s-modular' % branch,
-            '%s-modular-override' % branch,
-            '%s-modular-pending' % branch,
-            '%s-modular-signing-pending' % branch,
-            '%s-modular-updates' % branch,
-            '%s-modular-updates-candidate' % branch,
-            '%s-modular-updates-pending' % branch,
-            '%s-modular-updates-testing' % branch,
-            '%s-modular-updates-testing-pending' % branch]
-
 
 ##############################################################################
 # Common options for all commands                                            #
@@ -106,7 +76,8 @@ def cli(ctx, debug, branch, koji_url, zanata_url, zanata_project,
     ctx.obj['branch'] = branch
 
     if branch == "rawhide":
-        ctx.obj['branch'] = get_fedora_rawhide_version(ctx.obj['session'])
+        ctx.obj['branch'] = mmdzanata.fedora.get_fedora_rawhide_version(
+            ctx.obj['session'])
 
     ctx.obj['zanata_url'] = zanata_url
     ctx.obj['zanata_project'] = zanata_project
@@ -132,7 +103,7 @@ def extract(ctx, upload):
     """
 
     catalog = mmdzanata.get_module_catalog_from_tags(
-        ctx.parent.obj['session'], get_tags_for_fedora_branch(
+        ctx.parent.obj['session'], mmdzanata.fedora.get_tags_for_fedora_branch(
             ctx.parent.obj['branch']),
         debug=ctx.parent.obj['debug'])
 

mmdzanata/fedora/__init__.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# This file is part of modulemd-zanata
+# Copyright (C) 2017-2018 Stephen Gallagher
+#
+# Fedora-License-Identifier: MIT
+# SPDX-2.0-License-Identifier: MIT
+# SPDX-3.0-License-Identifier: MIT
+#
+# This program is free software.
+# For more information on the license, see COPYING.
+# For more information on free software, see
+# <https://www.gnu.org/philosophy/free-sw.en.html>.
+
+import requests
+
+
+def get_fedora_rawhide_version(session, debug=False):
+    # Koji sometimes disconnects for no apparent reason. Retry up to 5
+    # times before failing.
+    for attempt in range(5):
+        try:
+            build_targets = session.getBuildTargets('rawhide')
+        except requests.exceptions.ConnectionError:
+            if debug:
+                print("Connection lost while retriving rawhide branch, "
+                      "retrying...",
+                      file=sys.stderr)
+        else:
+            # Succeeded this time, so break out of the loop
+            break
+
+    return build_targets[0][
+        'build_tag_name'].partition('-build')[0]
+
+
+def get_tags_for_fedora_branch(branch):
+    return ['%s-modular' % branch,
+            '%s-modular-override' % branch,
+            '%s-modular-pending' % branch,
+            '%s-modular-signing-pending' % branch,
+            '%s-modular-updates' % branch,
+            '%s-modular-updates-candidate' % branch,
+            '%s-modular-updates-pending' % branch,
+            '%s-modular-updates-testing' % branch,
+            '%s-modular-updates-testing-pending' % branch]

setup.py

@@ -17,7 +17,7 @@
 setup(
     name='mmdzanata',
     version='0.1',
-    packages=['mmdzanata'],
+    packages=['mmdzanata', 'mmdzanata.fedora'],
     url='',
     license='MIT',
     author='Stephen Gallagher',