From db7b4c0e7435a1a5e10fab5958867426581d3c98 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Dec 08 2017 14:57:47 +0000
Subject: update setup.py for 1.14


Related: https://pagure.io/koji/issue/458

---

diff --git a/setup.py b/setup.py
index 6db3f60..5ab14ce 100644
--- a/setup.py
+++ b/setup.py
@@ -1,57 +1,86 @@
+import sys
 from setuptools import setup
 
+def get_install_requires():
+    # To install all build requires:
+    # $ dnf install python-pip git krb5-devel gcc redhat-rpm-config \
+    #               glib2-devel sqlite-devel libxml2-devel python-devel \
+    #               openssl-devel libffi-devel
+
+    # In a perfect world this would suffice:
+    # 'rpm',
+    # But rpm isn't available on PyPI so it needs to be installed other way.
+
+    # To install it from upstream one would need to run ./autogen.sh and
+    # ./configure just to create setup.py with correct paths to header
+    # files. I wasn't able run it successfully anyway so it is easier to
+    # grab system package instead.
+
+    # Install rpm python package system-wide:
+    # $ dnf install rpm-python
+
+    # If you are running in virtualenv use following command to make
+    # system-wide rpm python package inside virtualenv:
+    # $ ln -vs $(/usr/bin/python -c 'import rpm, os.path; print(os.path.dirname(rpm.__file__))') \
+    #          $(/usr/bin/env python -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())')
+    # resp. for python3
+    # $ ln -vs $(/usr/bin/python3 -c 'import rpm, os.path; print(os.path.dirname(rpm.__file__))') \
+    #          $(/usr/bin/env python -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())')
+    # Other options is to create virtualenv with --system-site-packages if
+    # it doesn't harm you.
+
+    # pycurl can come without ssl backend (or bad one). In such case use
+    # $ pip uninstall pycurl; pip install pycurl --global-option="--with-nss"
+    # or different backend mentioned in error message (openssl, ...)
+
+    requires = [
+        'pyOpenSSL',
+        'pycurl',
+        'python-dateutil',
+        'requests',
+        'requests-kerberos',
+        'six',
+        #'libcomps',
+        #'rpm',
+    ]
+    if sys.version_info[0] < 3:
+        # optional auth library for older hubs
+        # hubs >= 1.12 are using requests' default GSSAPI
+        requires.append('python-krbV')
+    return requires
+
 setup(
     name="koji",
-    version="1.11.1",
+    version="1.14.0",
     description=("Koji is a system for building and tracking RPMS. The base"
                  " package contains shared libraries and the command-line"
                  " interface."),
     license="LGPLv2 and GPLv2+",
     url="http://pagure.io/koji/",
+    author = 'Koji developers',
+    author_email = 'koji-devel@lists.fedorahosted.org',
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
-        "Programming Language :: Python :: 2 :: Only",
+        "Natural Language :: English",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Operating System :: POSIX :: Linux",
         "Topic :: Utilities"
     ],
-    package_dir={'koji': 'koji'},
-    packages=['koji', 'koji.ssl'],
+    packages=['koji', 'koji.ssl', 'koji_cli'],
+    package_dir={
+        'koji': 'koji',
+        'koji_cli': 'cli/koji_cli',
+    },
+    # doesn't make sense, as we have only example config
+    #data_files=[
+    #    ('/etc', ['cli/koji.conf']),
+    #],
     scripts=['cli/koji'],
-    install_requires=[
-        # To install all build requires:
-        # $ dnf install python-pip git krb5-devel gcc redhat-rpm-config \
-        #               glib2-devel sqlite-devel libxml2-devel python-devel \
-        #               openssl-devel libffi-devel
-
-        # In a perfect world this would suffice:
-        # 'rpm',
-        # But rpm isn't available on PyPI so it needs to be installed other way.
-
-        # To install it from upstream one would need to run ./autogen.sh and
-        # ./configure just to create setup.py with correct paths to header
-        # files. I wasn't able run it successfully anyway so it is easier to
-        # grab system package instead.
-
-        # Install rpm python package system-wide:
-        # $ dnf install rpm-python
-
-        # If you are running in virtualenv use following command to make
-        # system-wide rpm python package inside virtualenv:
-        # $ ln -vs $(/usr/bin/python -c 'import rpm, os.path; print os.path.dirname(rpm.__file__)') \
-        #          $(/usr/bin/env python -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())')
-
-        'pyOpenSSL',
-        'python-dateutil',
-        'python-krbV',
-        'yum-metadata-parser',
-        # Note: urlgrabber package on PyPI has still bug
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1200091 fixed yet.
-        'urlgrabber',
-    ],
-    dependency_links=[
-        'git+git://yum.baseurl.org/yum-metadata-parser.git#egg=yum-metadata-parser-1.1.4',
-        'git+git://yum.baseurl.org/urlgrabber.git#egg=urlgrabber-3.10.1',
-    ]
+    python_requires='>=2.6',
+    install_requires=get_install_requires(),
 )