[rpms/rpkg] 1.70-1: New release 1.52

[Chenxiong Qi <cqi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 74d47a4cea76d6d53b57879cd30065fd16ecb248
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-02-26T20:54:06+08:00
            Stats  : +45/-250 in 7 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/74d47a4cea76d6d53b57879cd30065fd16ecb248?branch=1.70-1

            Log:
            New release 1.52

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 3b05d6c..83228a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /rpkg-1.49.tar.gz
 /rpkg-1.50.tar.gz
 /rpkg-1.51.tar.gz
+/rpkg-1.52.tar.gz

diff --git a/0001-Add-compose-id-and-signing-intent-arguments.patch b/0001-Add-compose-id-and-signing-intent-arguments.patch
deleted file mode 100644
index 3d0ef0f..0000000
--- a/0001-Add-compose-id-and-signing-intent-arguments.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 00a8c40153b276a63088b7891f866f62161d6f5c Mon Sep 17 00:00:00 2001
-From: Bret Fontecchio <bfontecc@redhat.com>
-Date: Thu, 30 Nov 2017 15:30:00 -0500
-Subject: [PATCH] Add compose-id and signing-intent arguments
-
-Signed-off-by: Bret Fontecchio <bfontecc@redhat.com>
----
- pyrpkg/cli.py     | 27 +++++++++++++++++++++------
- tests/test_cli.py |  6 ++++++
- 2 files changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
-index c8ce3d7..7799d29 100644
---- a/pyrpkg/cli.py
-+++ b/pyrpkg/cli.py
-@@ -1026,11 +1026,24 @@ see API KEY section of copr-cli(1) man page.
-             help='Build a container',
-             description='Build a container')
- 
--        self.container_build_parser.add_argument(
--            '--repo-url',
--            metavar="URL",
--            help=('URL of yum repo file'),
--            nargs='*')
-+        group = self.container_build_parser.add_mutually_exclusive_group()
-+        group.add_argument(
-+                           '--compose-id',
-+                           dest='compose_ids',
-+                           metavar='COMPOSE_ID',
-+                           help='ODCS composes used. '
-+                                'Cannot be used with --signing-intent or --repo-url',
-+                           nargs='*')
-+        group.add_argument(
-+                          '--signing-intent',
-+                          help='Signing intent of the ODCS composes. Cannot be '
-+                               'used with --compose-id or --repo-url')
-+        group.add_argument(
-+                          '--repo-url',
-+                          metavar="URL",
-+                          help='URL of yum repo file'
-+                               'Cannot be used with --signing-intent or --compose-id',
-+                          nargs='*')
- 
-         self.container_build_parser.add_argument(
-             '--target',
-@@ -1280,7 +1293,9 @@ see API KEY section of copr-cli(1) man page.
-                 "quiet": self.args.q,
-                 "yum_repourls": self.args.repo_url,
-                 "git_branch": self.cmd.branch_merge,
--                "arches": self.args.arches}
-+                "arches": self.args.arches,
-+                "compose_ids": self.args.compose_ids,
-+                "signing_intent": self.args.signing_intent}
- 
-         section_name = "%s.container-build" % self.name
-         err_msg = "Missing %(option)s option in [%(plugin.section)s] section. " \
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index 11b9bc8..2ba93ea 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -205,6 +205,8 @@ class TestContainerBuildWithKoji(CliTestCase):
-                 'yum_repourls': None,
-                 'git_branch': 'eng-rhel-7',
-                 'arches': None,
-+                'signing_intent': None,
-+                'compose_ids': None
-             },
-             kojiconfig=None,
-             kojiprofile='koji',
-@@ -230,6 +232,8 @@ class TestContainerBuildWithKoji(CliTestCase):
-                 'yum_repourls': None,
-                 'git_branch': 'eng-rhel-7',
-                 'arches': None,
-+                'signing_intent': None,
-+                'compose_ids': None
-             },
-             kojiconfig=None,
-             kojiprofile='koji',
-@@ -264,6 +268,8 @@ class TestContainerBuildWithKoji(CliTestCase):
-                 'yum_repourls': None,
-                 'git_branch': 'eng-rhel-7',
-                 'arches': None,
-+                'signing_intent': None,
-+                'compose_ids': None
-             },
-             kojiconfig='/path/to/koji.conf',
-             kojiprofile=None,
--- 
-2.14.3
-

diff --git a/0001-Change-type-of-compose-id-from-string-to-int.patch b/0001-Change-type-of-compose-id-from-string-to-int.patch
deleted file mode 100644
index 7575e65..0000000
--- a/0001-Change-type-of-compose-id-from-string-to-int.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cbd8e35111b90074e690f46b82fadd8ab51abcf9 Mon Sep 17 00:00:00 2001
-From: Bret Fontecchio <bfontecc@redhat.com>
-Date: Mon, 11 Dec 2017 13:01:57 -0500
-Subject: [PATCH] Change type of compose id from string to int
-
-Signed-off-by: Bret Fontecchio <bfontecc@redhat.com>
----
- pyrpkg/cli.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
-index 30129ce..c75827d 100644
---- a/pyrpkg/cli.py
-+++ b/pyrpkg/cli.py
-@@ -1031,6 +1031,7 @@ see API KEY section of copr-cli(1) man page.
-                            '--compose-id',
-                            dest='compose_ids',
-                            metavar='COMPOSE_ID',
-+                           type=int,
-                            help='ODCS composes used. '
-                                 'Cannot be used with --signing-intent or --repo-url',
-                            nargs='*')
--- 
-2.14.3
-

diff --git a/0001-Fix-construct-anongiturl-for-chain-build.patch b/0001-Fix-construct-anongiturl-for-chain-build.patch
deleted file mode 100644
index f4a8f63..0000000
--- a/0001-Fix-construct-anongiturl-for-chain-build.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 6373f0f785918e6e15e6541ad8f195c48e29002f Mon Sep 17 00:00:00 2001
-From: Chenxiong Qi <cqi@redhat.com>
-Date: Wed, 8 Nov 2017 11:11:26 +0800
-Subject: [PATCH 1/2] Fix construct anongiturl for chain-build
-
-Signed-off-by: Chenxiong Qi <cqi@redhat.com>
----
- pyrpkg/__init__.py     | 19 +++++++++++++++----
- pyrpkg/cli.py          |  5 ++++-
- tests/test_commands.py | 14 ++++++++++++++
- 3 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index 527133e..253b454 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -1882,11 +1882,22 @@ class Commands(object):
-             raise rpkgError('Packages in destination tag %(dest_tag_name)s are not inherited by'
-                             ' build tag %(build_tag_name)s' % build_target)
- 
--    def construct_build_url(self):
--        """Construct build URL with namespaced anongiturl and commit hash"""
-+    def construct_build_url(self, module_name=None, commit_hash=None):
-+        """Construct build URL with namespaced anongiturl and commit hash
-+
-+        :param str module_name: name of the module part of the build URL. If
-+            omitted, module name with namespace will be guessed from current
-+            repository. The given module name will be used in URL directly
-+            without guessing namespace.
-+        :param str commit_hash: the commit hash appended to build URL. It
-+            omitted, the latest commit hash got from current repository will be
-+            used.
-+        :return: URL built from anongiturl.
-+        :rtype: str
-+        """
-         return '{0}?#{1}'.format(
--            self._get_namespace_anongiturl(self.ns_module_name),
--            self.commithash)
-+            self._get_namespace_anongiturl(module_name or self.ns_module_name),
-+            commit_hash or self.commithash)
- 
-     def build(self, skip_tag=False, scratch=False, background=False,
-               url=None, chain=None, arches=None, sets=False, nvr_check=True):
-diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
-index 24c97d1..c8ce3d7 100644
---- a/pyrpkg/cli.py
-+++ b/pyrpkg/cli.py
-@@ -1156,7 +1156,10 @@ see API KEY section of copr-cli(1) man page.
-             else:
-                 # Figure out the scm url to build from package name
-                 hash = self.cmd.get_latest_commit(component, self.cmd.branch_merge)
--                url = self.cmd.anongiturl % {'module': component} + '#%s' % hash
-+                # Passing given package name to module_name parameter directly without
-+                # guessing namespace as no way to guess that. rpms/ will be
-+                # added by default if namespace is not given.
-+                url = self.cmd.construct_build_url(component, hash)
-                 # If there are no ':' in the chain list, treat each object as
-                 # an individual chain
-                 if ':' in self.args.package:
-diff --git a/tests/test_commands.py b/tests/test_commands.py
-index 2641b90..ca63377 100644
---- a/tests/test_commands.py
-+++ b/tests/test_commands.py
-@@ -697,6 +697,20 @@ class TestConstructBuildURL(CommandTestCase):
-             commithash.return_value)
-         self.assertEqual(expected_url, url)
- 
-+    def test_construct_with_given_module_name_and_hash(self):
-+        cmd = self.make_commands()
-+
-+        anongiturl = 'https://src.example.com/%(module)s'
-+        with patch.object(cmd, 'anongiturl', new=anongiturl):
-+            for module_name in ('extra-cmake-modules',
-+                                'rpms/kf5-kfilemetadata'):
-+                url = cmd.construct_build_url(module_name, '123456')
-+
-+                expected_url = '{0}?#{1}'.format(
-+                    anongiturl % {'module': module_name},
-+                    '123456')
-+                self.assertEqual(expected_url, url)
-+
- 
- class TestCleanupTmpDir(CommandTestCase):
-     """Test Commands._cleanup_tmp_dir for mockbuild command"""
--- 
-2.9.5
-

diff --git a/0002-Fix-giturl-as-well-by-calling-construct_build_url.patch b/0002-Fix-giturl-as-well-by-calling-construct_build_url.patch
deleted file mode 100644
index f9884fb..0000000
--- a/0002-Fix-giturl-as-well-by-calling-construct_build_url.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 511ae50a2c5ef327e8b19f429fb2fbf483633eb4 Mon Sep 17 00:00:00 2001
-From: Chenxiong Qi <cqi@redhat.com>
-Date: Wed, 8 Nov 2017 12:18:28 +0800
-Subject: [PATCH 2/2] Fix giturl as well by calling construct_build_url
-
-Make giturl command call construct_build_url instead of constructing
-URL from anongiturl directly. This should be useful for downstream
-client tools to return correct build URL specific to their own build
-environment configuration.
-
-Signed-off-by: Chenxiong Qi <cqi@redhat.com>
----
- pyrpkg/__init__.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index 253b454..7783ef4 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -2109,9 +2109,7 @@ class Commands(object):
-     def giturl(self):
-         """Return the git url that would be used for building"""
-         self.check_repo(is_dirty=False, all_pushed=False)
--        url = self._get_namespace_anongiturl(self.ns_module_name) + \
--            '?#%s' % self.commithash
--        return url
-+        return self.construct_build_url()
- 
-     def koji_upload(self, file, path, callback=None):
-         """Upload a file to koji
--- 
-2.9.5
-

diff --git a/rpkg.spec b/rpkg.spec
index e4cb01b..d4cc6be 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,18 +1,13 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           rpkg
-Version:        1.51
-Release:        4%{?dist}
+Version:        1.52
+Release:        1%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
 URL:            https://pagure.io/rpkg
 Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
-Patch0:         0001-Fix-construct-anongiturl-for-chain-build.patch
-Patch1:         0002-Fix-giturl-as-well-by-calling-construct_build_url.patch
-Patch2:         0001-Add-compose-id-and-signing-intent-arguments.patch
-Patch3:         0001-Change-type-of-compose-id-from-string-to-int.patch
 BuildArch:      noarch
 
 
@@ -95,10 +90,6 @@ A python library for managing RPM package sources in a git repository.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 
 %build
@@ -107,7 +98,6 @@ A python library for managing RPM package sources in a git repository.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 # Create configuration directory to holding downstream clients config files
@@ -138,13 +128,52 @@ nosetests tests
 %doc README.rst CHANGELOG.rst
 %license COPYING COPYING-koji LGPL
 # For noarch packages: sitelib
-%{python_sitelib}/pyrpkg
-%{python_sitelib}/%{name}-%{version}-py*.egg-info
+%{python2_sitelib}/pyrpkg
+%{python2_sitelib}/%{name}-%{version}-py*.egg-info
 %{_datadir}/%{name}
 %{_sysconfdir}/rpkg
 
 
 %changelog
+* Thu Feb 22 2018 Chenxiong Qi <cqi@redhat.com> - 1.52-1
+- Mock ThreadPool in test_module_overview (cqi)
+- Drop rpmfluff in test (cqi)
+- Fix hardcoded directory name in test (lsedlar)
+- Improve testenv for py26 (cqi)
+- Run tests with old GitPython in py26 testenv (cqi)
+- Compile pycurl with openssl after F27 (cqi)
+- Ignore .egg/ from git (cqi)
+- Add py26 to testenv (cqi)
+- Install koji from PyPI (cqi)
+- Make compose-id and repo-url to take one or more values (csomh)
+- Let git ignore more directories (cqi)
+- Exclude pyc and __pycache__ globally in sdist (cqi)
+- Handle nonexisting mbs-manager (cqi)
+- Add dependent packages for Python 2.6 in setup.py (cqi)
+- Updated module cli API (mcurlej)
+- Declare Python versions rpkg can work with - #278 (cqi)
+- Fix flake8 errors (cqi)
+- Fix tests that do not work with Python 3 (cqi)
+- Fix tests: not impact by dict.items call (cqi)
+- Add py36 to testenv - #274 (cqi)
+- Run tox to run tests and check code styles - #276 (cqi)
+- Use flake8 3.5.0 (cqi)
+- Add files under requirements/ to sdist package (cqi)
+- Install Koji shared library via setuptools (cqi)
+- Set install and tests requires in setup.py (cqi)
+- Split pypi requirements and refine versions (cqi)
+- Change type of compose id from string to int (bfontecc)
+- Install RPM Python binding from PyPI (cqi)
+- Fix test test_lint_each_file_once (cqi)
+- Add compose-id and signing-intent arguments (bfontecc)
+- Use env's python (lucarval)
+- Use progress callback and TaskWatcher from koji_cli.lib (cqi)
+- Get buildhash from git+https:// url (lsedlar)
+- lint: Avoid checking rpm's multiple times (tmz)
+- Fix giturl as well by calling construct_build_url (cqi)
+- Fix construct anongiturl for chain-build (cqi)
+- Fix mock openidc_client (cqi)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.51-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

diff --git a/sources b/sources
index add3828..3fba9fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpkg-1.51.tar.gz) = ebde6ead9bcd762020a8ea997d4ba1fd277146d18d047e33c9b713cb137bb9d69ce505a18d78c328d43e3c3cd08e426b8f7e1c11a930b97a2a184da1f7bdc854
+SHA512 (rpkg-1.52.tar.gz) = 6ed96d86e1ae39da556f261337a8062eb7160611d8bc57d5e829c8ddf47af0d4ce8264becb11a2b7b01d8719e1da57f50558dba661b16e1726289694df3626d6