[rpms/fedpkg] 1.48-1: New release 1.34

[Chenxiong Qi <cqi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : e09c1d29f3f1d1b1762b2e6dfaee2434ab4c65d5
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-07-25T10:34:50+08:00
            Stats  : +124/-53 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/e09c1d29f3f1d1b1762b2e6dfaee2434ab4c65d5?branch=1.48-1

            Log:
            New release 1.34

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

---
diff --git a/.gitignore b/.gitignore
index 0cd9b15..37b4fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /fedpkg-1.31.tar.bz2
 /fedpkg-1.32.tar.bz2
 /fedpkg-1.33.tar.bz2
+/fedpkg-1.34.tar.bz2

diff --git a/0001-Fix-TypeError-raised-from-override-create-command.patch b/0001-Fix-TypeError-raised-from-override-create-command.patch
new file mode 100644
index 0000000..2d3fb0b
--- /dev/null
+++ b/0001-Fix-TypeError-raised-from-override-create-command.patch
@@ -0,0 +1,80 @@
+From c5dc032fb9a4331c1f7d0078beffe938dad071e3 Mon Sep 17 00:00:00 2001
+From: Chenxiong Qi <cqi@redhat.com>
+Date: Wed, 25 Jul 2018 10:28:02 +0800
+Subject: [PATCH] Fix TypeError raised from override create command
+
+This error does not block creating an override in Bodhi. It fails at
+step to print a summary of the created override. The reason is
+customized save_override does not return a value, so None is passed to
+the first parameter of override_str.
+
+Fixes #256
+
+Signed-off-by: Chenxiong Qi <cqi@redhat.com>
+---
+ fedpkg/__init__.py |  2 +-
+ test/test_cli.py   | 20 +++++++++++---------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index ba246b7..2f545ac 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -56,7 +56,7 @@ if _BodhiClient is not None:
+ 
+         @clear_csrf_and_retry
+         def save_override(self, *args, **kwargs):
+-            super(BodhiClient, self).save_override(*args, **kwargs)
++            return super(BodhiClient, self).save_override(*args, **kwargs)
+ 
+         @clear_csrf_and_retry
+         def extend_override(self, override, expiration_date):
+diff --git a/test/test_cli.py b/test/test_cli.py
+index 3d1441e..78e8c49 100644
+--- a/test/test_cli.py
++++ b/test/test_cli.py
+@@ -1200,16 +1200,18 @@ class TestBodhiOverride(CliTestCase):
+         self.cbv_p.stop()
+         super(TestBodhiOverride, self).tearDown()
+ 
+-    @patch('fedpkg.BodhiClient')
+-    def test_create_for_given_build(self, BodhiClient):
+-        bodhi_client = BodhiClient.return_value
+-        bodhi_client.list_overrides.return_value = {'total': 0}
++    @patch('bodhi.client.bindings.BodhiClient.list_overrides')
++    @patch('bodhi.client.bindings.BodhiClient.save_override')
++    @patch('bodhi.client.bindings.BodhiClient.override_str')
++    def test_create_for_given_build(
++            self, override_str, save_override, list_overrides):
++        list_overrides.return_value = {'total': 0}
+         expiration_date = datetime.now() + timedelta(days=7)
+         new_override = {
+             'expiration_date': expiration_date.strftime('%Y-%m-%d %H:%M:%S'),
+             'notes': 'build for fedpkg'
+         }
+-        bodhi_client.save_override.return_value = new_override
++        save_override.return_value = new_override
+ 
+         cli_cmd = [
+             'fedpkg', '--path', self.cloned_repo_path,
+@@ -1223,13 +1225,13 @@ class TestBodhiOverride(CliTestCase):
+             with patch.object(cli.cmd, 'log') as log:
+                 cli.create_buildroot_override()
+ 
+-                bodhi_client.override_str.assert_called_once_with(
+-                    bodhi_client.save_override.return_value,
++                override_str.assert_called_once_with(
++                    save_override.return_value,
+                     minimal=False)
+                 log.info.assert_any_call(
+-                    bodhi_client.override_str.return_value)
++                    override_str.return_value)
+ 
+-        bodhi_client.save_override.assert_called_once_with(
++        save_override.assert_called_once_with(
+             nvr='rpkg-1.54-1.fc28',
+             duration=7,
+             notes='build for fedpkg')
+-- 
+2.14.4
+

diff --git a/0001-Fix-argparse-error-in-Python-3.patch b/0001-Fix-argparse-error-in-Python-3.patch
deleted file mode 100644
index 8226cf1..0000000
--- a/0001-Fix-argparse-error-in-Python-3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4ee70510c86469b2b1f910ad85844e7bce9b94a8 Mon Sep 17 00:00:00 2001
-From: Chenxiong Qi <cqi@redhat.com>
-Date: Mon, 21 May 2018 23:22:59 +0800
-Subject: [PATCH] Fix argparse error in Python 3
-
-argparse behaves differently in Python 2 and 3 when no options and
-arguments are passed to executable fedpkg. That causes no attribute
-named command is set to parsed namespace object in Python 3. Command
-line help message has to be output explicitly.
-
-Fixes #221
-
-Signed-off-by: Chenxiong Qi <cqi@redhat.com>
----
- fedpkg/__main__.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/fedpkg/__main__.py b/fedpkg/__main__.py
-index e12f255..c7ea14c 100644
---- a/fedpkg/__main__.py
-+++ b/fedpkg/__main__.py
-@@ -57,6 +57,14 @@ def main():
-     client.do_imports(site='fedpkg')
-     client.parse_cmdline()
- 
-+    # This is due to a difference argparse behavior to Python 2 version.
-+    # In Python 3, argparse will proceed to here without reporting
-+    # "too few arguments". Instead, client.args does not have attribute
-+    # command.
-+    if not hasattr(client.args, 'command'):
-+        client.parser.print_help()
-+        sys.exit(1)
-+
-     if not client.args.path:
-         try:
-             client.args.path = pyrpkg.utils.getcwd()
--- 
-2.14.3
-

diff --git a/fedpkg.spec b/fedpkg.spec
index 8d2a51a..5be6e47 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,17 +4,18 @@
 %endif
 
 Name:           fedpkg
-Version:        1.33
-Release:        5%{?dist}
+Version:        1.34
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
-Patch0:         0001-Fix-argparse-error-in-Python-3.patch
 
 BuildArch:      noarch
 
+Patch0:         0001-Fix-TypeError-raised-from-override-create-command.patch
+
 # fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
 %if 0%{?fedora} > 28 || 0%{?rhel} > 7
 %bcond_with python2
@@ -26,7 +27,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  bash-completion
 BuildRequires:  git
 
-Requires:       bodhi-client
 Requires:       fedora-packager
 Requires:       koji
 Requires:       redhat-rpm-config
@@ -37,26 +37,29 @@ Requires:       redhat-rpm-config
 
 BuildRequires:  python2-devel
 # We br these things for man page generation due to imports
-BuildRequires:  python2-rpkg >= 1.54-2
+BuildRequires:  python2-rpkg >= 1.55-1
 # This until fedora-cert gets fixed
 BuildRequires:  python2-fedora
 # For testing
 BuildRequires:  python2-mock
 
-%if 0%{?rhel}
-BuildRequires:  python-unittest2
-%else
-BuildRequires:  python2-unittest2
-%endif
+BuildRequires:  python2-freezegun
 
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  python-nose
 BuildRequires:  python-setuptools
+BuildRequires:  python-unittest2
 %else
 BuildRequires:  python2-nose
 BuildRequires:  python2-setuptools
 %endif
 
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} == 7)
+# Only bodhi-client>=2.0 is supported. EL6 has older version bodhi-client<1.0
+BuildRequires:  bodhi-client >= 2.0
+Requires:       bodhi-client >= 2.0
+%endif
+
 %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7)
 BuildRequires:  python-bugzilla
 Requires:       python-bugzilla
@@ -65,7 +68,7 @@ BuildRequires:  python2-bugzilla
 Requires:       python2-bugzilla
 %endif
 
-Requires:       python2-rpkg >= 1.54-2
+Requires:       python2-rpkg >= 1.55-1
 Requires:       python2-fedora
 Requires:       python2-openidc-client
 
@@ -74,7 +77,7 @@ Requires:       python2-openidc-client
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.54-2
+BuildRequires:  python3-rpkg >= 1.55-1
 # This until fedora-cert gets fixed
 BuildRequires:  python3-fedora
 # For testing
@@ -83,11 +86,15 @@ BuildRequires:  python3-unittest2
 BuildRequires:  python3-nose
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-bugzilla
+BuildRequires:  python3-freezegun
+BuildRequires:  python3-bodhi-client
+
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.54-2
+Requires:       python3-rpkg >= 1.55-1
 Requires:       python3-fedora
 Requires:       python3-openidc-client
+Requires:       python3-bodhi-client
 %endif
 
 
@@ -149,6 +156,28 @@ nosetests
 
 
 %changelog
+* Tue Jul 24 2018 Chenxiong Qi <cqi@redhat.com> - 1.34-1
+- Get csrf token properly when retry bodhi API call (cqi)
+- Accept old config with module instead of repo (lsedlar)
+- Add option --namespace to command request-branch (cqi)
+- Add argument name and option --namespace to request-repo - #193 #200 (cqi)
+- Add explicit option --repo for request-branch - #244 (cqi)
+- Do not use deprecated option module-name (cqi)
+- Remove compatible code with EL5 in bash completion (cqi)
+- Handle Bodhi login automatically (cqi)
+- Refine command override create (cqi)
+- request-repo: Fix API token help text - #232 (tmz)
+- Use base_module in clone_config - #230 (tmz)
+- Extend override by number of days or specific date - #67 (cqi)
+- Use refactored man from pyrpkg (puiterwijk)
+- Add new command for creating override in Bodhi - #92 (cqi)
+- Also remove bodhi url from config (cqi)
+- Check bodhi version earlier (cqi)
+- Drop support of bodhi-client 0.9 - #223 (cqi)
+- Use custom ArgumentParser from pyrpkg.cli (jkucera)
+- Add OIDC config (puiterwijk)
+- Fix argparse error in Python 3 - #221 (cqi)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

diff --git a/sources b/sources
index 596034f..d6b465d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.33.tar.bz2) = 83064ed744d1e35dc889a70900582e3e59e92d657f08b1a2caef3cbb55a80f9009fa762fcbb40ce0e708262e35e99bd18cea6380f1a62ac99d548319cd589c79
+SHA512 (fedpkg-1.34.tar.bz2) = 3277c3a96aa1f2a45a564988c45ecb284eeb6f5158ef1778157808369f121886c7abefe51392b3e1083051da3cf55386a30c43b6872d910d751b03f8e0ff4171