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

[Chenxiong Qi <cqi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : cea241e92c1caed73301d8be7228662a8740bb9e
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-08-21T21:56:28+08:00
            Stats  : +35/-91 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/cea241e92c1caed73301d8be7228662a8740bb9e?branch=1.48-1

            Log:
            New release 1.35

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

---
diff --git a/.gitignore b/.gitignore
index 37b4fd5..32fb718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /fedpkg-1.32.tar.bz2
 /fedpkg-1.33.tar.bz2
 /fedpkg-1.34.tar.bz2
+/fedpkg-1.35.tar.bz2

diff --git a/0001-Fix-TypeError-raised-from-override-create-command.patch b/0001-Fix-TypeError-raised-from-override-create-command.patch
deleted file mode 100644
index 2d3fb0b..0000000
--- a/0001-Fix-TypeError-raised-from-override-create-command.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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/fedpkg.spec b/fedpkg.spec
index 425810f..b4a8f19 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
 %endif
 
 Name:           fedpkg
-Version:        1.34
-Release:        3%{?dist}
+Version:        1.35
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -14,8 +14,6 @@ Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 
 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
@@ -37,21 +35,22 @@ Requires:       redhat-rpm-config
 
 BuildRequires:  python2-devel
 # We br these things for man page generation due to imports
-BuildRequires:  python2-rpkg >= 1.55-1
+BuildRequires:  python2-rpkg >= 1.56-1
 # This until fedora-cert gets fixed
 BuildRequires:  python2-fedora
 # For testing
 BuildRequires:  python2-mock
 
-BuildRequires:  python2-freezegun
 
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  python-nose
 BuildRequires:  python-setuptools
 BuildRequires:  python-unittest2
+BuildRequires:  python-freezegun
 %else
 BuildRequires:  python2-nose
 BuildRequires:  python2-setuptools
+BuildRequires:  python2-freezegun
 %endif
 
 %if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} == 7)
@@ -68,7 +67,7 @@ BuildRequires:  python2-bugzilla
 Requires:       python2-bugzilla
 %endif
 
-Requires:       python2-rpkg >= 1.55-1
+Requires:       python2-rpkg >= 1.56-1
 Requires:       python2-fedora
 Requires:       python2-openidc-client >= 0.6.0
 
@@ -77,7 +76,7 @@ Requires:       python2-openidc-client >= 0.6.0
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.55-1
+BuildRequires:  python3-rpkg >= 1.56-1
 # This until fedora-cert gets fixed
 BuildRequires:  python3-fedora
 # For testing
@@ -91,7 +90,7 @@ BuildRequires:  python3-bodhi-client
 
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.55-1
+Requires:       python3-rpkg >= 1.56-1
 Requires:       python3-fedora
 Requires:       python3-openidc-client >= 0.6.0
 Requires:       python3-bodhi-client
@@ -110,7 +109,6 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %py_build
@@ -160,6 +158,31 @@ nosetests
 
 
 %changelog
+* Tue Aug 21 2018 Chenxiong Qi <cqi@redhat.com> - 1.35-1
+- Reserve last bodhi template on error - rhbz#1467897 (cqi)
+- New command releases-info - #247 (cqi)
+- Fix a test for request-repo command (cqi)
+- New option to request a repo without an initial commit - #215 (cqi)
+- Add --shell to bash completion for mockbuild (cqi)
+- Greenwave conf and support for gating validation (gnaponie)
+- Allow to create update directly with CLI options - #93 rhbz#1007157 (cqi)
+- Add more tests for utils (cqi)
+- Rewrite method to create bodhi update - rhbz#1492480 (cqi)
+- Mock fedora.client.OpenIdBaseClient._load_cookies (cqi)
+- Do not use configparser.SafeConfigParser in tests (cqi)
+- Fix test_retire to use unittest2 in el6 (cqi)
+- Submit builds from stream branch (cqi)
+- The create new project is not needed for packager (pingou)
+- Add py37 testenv (cqi)
+- Set PYCURL_SSL_LIBRARY directly for installing pycurl (cqi)
+- Fix flake8 errors and typo in tests (cqi)
+- Add tests for some commands (cqi)
+- Add tests for utils.py (cqi)
+- Convert test case for utils.py as normal test case (cqi)
+- Add some tests for BugzillaClient (cqi)
+- Fix TypeError raised from override create command - #256 (cqi)
+- Add missing command and options in bash completion (cqi)
+
 * Fri Aug 03 2018 Chenxiong Qi <cqi@redhat.com> - 1.34-3
 - Require python-openidc-client 0.6.0 as minimum version
 

diff --git a/sources b/sources
index d6b465d..726ec74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.34.tar.bz2) = 3277c3a96aa1f2a45a564988c45ecb284eeb6f5158ef1778157808369f121886c7abefe51392b3e1083051da3cf55386a30c43b6872d910d751b03f8e0ff4171
+SHA512 (fedpkg-1.35.tar.bz2) = 53ae1a6f9d2e2a8c9513ffcd10f90fbf56849e0141808f4bdabdc15711b0ca39fc09196f056a8c6210a713d029d34517f042683768d26c551fbf37c6412ddb3c