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

[Chenxiong Qi <cqi@redhat.com>]

A new commit has been pushed.

Repo   : rpms/rpkg
Branch : 1.70-1
Commit : cce350abb2972fe0d2992a4c3b252da22efccdbb
Author : Chenxiong Qi <cqi@redhat.com>
Date   : 2017-02-22T14:04:56+08:00
Stats  : +8/-135 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/rpkg/c/cce350abb2972fe0d2992a4c3b252da22efccdbb?branch=1.70-1

Log:
New release 1.49

---
diff --git a/.gitignore b/.gitignore
index 1fb298c..a390fd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
 /rpkg-1.46.tar.gz
 /rpkg-1.47.tar.gz
 /rpkg-1.48.tar.gz
+/rpkg-1.49.tar.gz

diff --git a/0001-Move-tag-inheritance-check-into-a-separate-method.patch b/0001-Move-tag-inheritance-check-into-a-separate-method.patch
deleted file mode 100644
index 337cf68..0000000
--- a/0001-Move-tag-inheritance-check-into-a-separate-method.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 5d25a9186842c0a67fea3557dfda571f8eceef4f Mon Sep 17 00:00:00 2001
-From: Chenxiong Qi <cqi@redhat.com>
-Date: Tue, 10 Jan 2017 15:28:34 +0800
-Subject: [PATCH] Move tag inheritance check into a separate method
-
-Tag inheritance check may not be required by all downstream package
-tools built on top of rpkg. Moving this check into a separate method
-would be easy for downstream tools to customize the behavior. By
-default, tag inheritance check happens when doing a chain build. Once
-some tool does not need the check, it can be disabled in derived
-Commands class.
-
-Signed-off-by: Chenxiong Qi <cqi@redhat.com>
----
- CHANGELOG.rst          |  5 +++++
- pyrpkg/__init__.py     | 19 ++++++++++---------
- tests/test_commands.py | 37 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 52 insertions(+), 9 deletions(-)
-
-diff --git a/CHANGELOG.rst b/CHANGELOG.rst
-index 3b0031c..b25a4db 100644
---- a/CHANGELOG.rst
-+++ b/CHANGELOG.rst
-@@ -1,6 +1,11 @@
- ChangeLog
- =========
- 
-+NEXT
-+----
-+
-+- Move tag inheritance check into a separate method (cqi)
-+
- v1.48 (2016-12-22)
- ------------------
- 
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index 61907a2..61039f3 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -1822,6 +1822,14 @@ class Commands(object):
-             if self.repo.git.rev_list('%s...%s' % (merge, branch)):
-                 raise rpkgError('There are unpushed changes in your repo')
- 
-+    def check_inheritance(self, build_target, dest_tag):
-+        """Check if build tag inherits from dest tag"""
-+        ancestors = self.kojisession.getFullInheritance(build_target['build_tag'])
-+        ancestors = [ancestor['parent_id'] for ancestor in ancestors]
-+        if dest_tag['id'] not in [build_target['build_tag']] + ancestors:
-+            raise rpkgError('Packages in destination tag %(dest_tag_name)s are not inherited by'
-+                            ' build tag %(build_tag_name)s' % build_target)
-+
-     def build(self, skip_tag=False, scratch=False, background=False,
-               url=None, chain=None, arches=None, sets=False, nvr_check=True):
-         """Initiate a build of the module.  Available options are:
-@@ -1876,17 +1884,10 @@ class Commands(object):
-                             % build_target['dest_tag_name'])
-         if dest_tag['locked'] and not scratch:
-             raise rpkgError('Destination tag %s is locked' % dest_tag['name'])
--        # If we're chain building, make sure inheritance works
-         if chain:
-             cmd.append('chain-build')
--            ancestors = self.kojisession.getFullInheritance(
--                build_target['build_tag'])
--            ancestors = [ancestor['parent_id'] for ancestor in ancestors]
--            if dest_tag['id'] not in [build_target['build_tag']] + ancestors:
--                raise rpkgError('Packages in destination tag '
--                                '%(dest_tag_name)s are not inherited by'
--                                'build tag %(build_tag_name)s' %
--                                build_target)
-+            # We're chain building, make sure inheritance works
-+            self.check_inheritance(build_target, dest_tag)
-         else:
-             cmd.append('build')
-         # define our dictionary for options
-diff --git a/tests/test_commands.py b/tests/test_commands.py
-index 0d08eb1..9765d6d 100644
---- a/tests/test_commands.py
-+++ b/tests/test_commands.py
-@@ -7,6 +7,7 @@ import tempfile
- import git
- import rpm
- from mock import patch
-+from mock import Mock
- 
- from pyrpkg import rpkgError
- 
-@@ -504,3 +505,39 @@ class TestGetLatestCommit(CommandTestCase):
-         self.assertEqual(str(git.Repo(self.repo_path).iter_commits().next()),
-                          cmd.get_latest_commit(os.path.basename(self.repo_path),
-                                                'eng-rhel-6'))
-+
-+
-+def load_kojisession(self):
-+    self._kojisession = Mock()
-+    self._kojisession.getFullInheritance.return_value = [
-+        {'child_id': 342, 'currdepth': 1, 'filter': [], 'intransitive': False,
-+         'maxdepth': None, 'name': 'f25-override', 'nextdepth': None, 'noconfig': False,
-+         'parent_id': 341, 'pkg_filter': '', 'priority': 0},
-+        {'child_id': 341, 'currdepth': 2, 'filter': [], 'intransitive': False,
-+         'maxdepth': None, 'name': 'f25-updates', 'nextdepth': None, 'noconfig': False,
-+         'parent_id': 336, 'pkg_filter': '', 'priority': 0},
-+        {'child_id': 336, 'currdepth': 3, 'filter': [], 'intransitive': False,
-+         'maxdepth': None, 'name': 'f25', 'nextdepth': None, 'noconfig': False,
-+         'parent_id': 335, 'pkg_filter': '', 'priority': 0},
-+        ]
-+
-+
-+class TestTagInheritanceTag(CommandTestCase):
-+
-+    @patch('pyrpkg.Commands.load_kojisession', new=load_kojisession)
-+    def test_error_if_not_inherit(self):
-+        build_target = {
-+            'build_tag': 342, 'build_tag_name': 'f25-build',
-+            'dest_tag': 337, 'dest_tag_name': 'f25-updates-candidate',
-+            'id': 167, 'name': 'f25-candidate',
-+            }
-+        dest_tag = {
-+            'arches': None, 'extra': {},
-+            'id': 337, 'locked': False,
-+            'maven_include_all': False, 'maven_support': False,
-+            'name': 'f25-updates-candidate',
-+            'perm': None, 'perm_id': None,
-+            }
-+
-+        cmd = self.make_commands()
-+        self.assertRaises(rpkgError, cmd.check_inheritance, build_target, dest_tag)
--- 
-2.9.3
-

diff --git a/rpkg.spec b/rpkg.spec
index 5699ffc..a22c3e1 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -2,16 +2,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           rpkg
-Version:        1.48
-Release:        3%{?dist}
+Version:        1.49
+Release:        1%{?dist}
 Summary:        Utility for interacting with rpm+git packaging systems
 
 Group:          Applications/System
 License:        GPLv2+ and LGPLv2
 URL:            https://pagure.io/rpkg
 Source0:        https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz
-# Backported from git; drop for next upstream release
-Patch0:         0001-Move-tag-inheritance-check-into-a-separate-method.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pyrpkg >= %{version}-%{release}
@@ -64,7 +62,6 @@ A python library for managing RPM package sources in a git repository.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -99,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 22 2017 Chenxiong Qi <cqi@redhat.com> - 1.49-1
+- More upload PyCURL fixes for EL 7 (merlin)
+- Move tag inheritance check into a separate method (cqi)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.48-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

diff --git a/sources b/sources
index 289ddd3..71074ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpkg-1.48.tar.gz) = edce021e422c3ec85f847ef45d7d536e860b086d75c7ba5be4d2e49dd5a45ce1885afdbd3e708f0a26069bf376c62c746bb1f2832c08d231be5969e889a941a8
+SHA512 (rpkg-1.49.tar.gz) = a3b3ab6ee9124e9ac098f78086e3f188babcce62769fa37d6baccfed8261eea13c0fc93a366f954f7e99ae26c5108b1055206b177825a42b70b18895faca1e73