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

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

[Chenxiong Qi]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : c9525621a9006a6925ed7cb20278daed991fc73d
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2018-01-25T18:12:38+08:00
            Stats  : +19/-127 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/c9525621a9006a6925ed7cb20278daed991fc73d?branch=1.48-1

            Log:
            New release 1.31

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

---
diff --git a/.gitignore b/.gitignore
index eaca0cf..08ff1d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /fedpkg-1.28.tar.bz2
 /fedpkg-1.29.tar.bz2
 /fedpkg-1.30.tar.bz2
+/fedpkg-1.31.tar.bz2

diff --git a/0001-Allow-any-parameters-in-construct_build_url.patch b/0001-Allow-any-parameters-in-construct_build_url.patch
deleted file mode 100644
index 7636e69..0000000
--- a/0001-Allow-any-parameters-in-construct_build_url.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ce8e9d4b5d03cd38a1362c04b386a08bc0138095 Mon Sep 17 00:00:00 2001
-From: Chenxiong Qi <cqi@redhat.com>
-Date: Wed, 8 Nov 2017 11:17:27 +0800
-Subject: [PATCH] Allow any parameters in construct_build_url
-
-Signed-off-by: Chenxiong Qi <cqi@redhat.com>
----
- fedpkg/__init__.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index 4acd564..b45645d 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -196,12 +196,12 @@ class Commands(pyrpkg.Commands):
-         in Koji.
-         """
- 
--    def construct_build_url(self):
-+    def construct_build_url(self, *args, **kwargs):
-         """Override build URL for Fedora Koji build
- 
-         In Fedora Koji, anonymous URL should have prefix "git+https://"
-         """
--        url = super(Commands, self).construct_build_url()
-+        url = super(Commands, self).construct_build_url(*args, **kwargs)
-         return 'git+{0}'.format(url)
- 
-     def retire(self, message):
--- 
-2.9.5
-

diff --git a/0001-Work-with-Bodhi-3.patch b/0001-Work-with-Bodhi-3.patch
deleted file mode 100644
index e829390..0000000
--- a/0001-Work-with-Bodhi-3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 62ac6647efb71bea220def61b75e33a1f121e8bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
-Date: Tue, 14 Nov 2017 14:41:57 +0100
-Subject: [PATCH] Work with Bodhi 3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507410
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
----
- fedpkg/__init__.py | 4 +++-
- test/test_cli.py   | 6 +++---
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
-index b45645d..dd1c2d9 100644
---- a/fedpkg/__init__.py
-+++ b/fedpkg/__init__.py
-@@ -237,7 +237,9 @@ class Commands(pyrpkg.Commands):
-                    '--new', '--release', self.branch_merge,
-                    '--file', 'bodhi.template', self.nvr, '--username',
-                    self.user]
--        elif bodhi_major_version == 2:
-+        elif bodhi_major_version < 4:
-+            # Version 3 is compatible with 2, it was bumped for server side
-+            # reasons.
-             cmd = ['bodhi', 'updates', 'new', '--file', 'bodhi.template',
-                    '--user', self.user]
-             if bodhi_config['staging']:
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 76e25d5..632367c 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -146,8 +146,8 @@ class TestUpdate(CliTestCase):
-     @patch('fedpkg.lookaside.FedoraLookasideCache.hash_file')
-     def test_fail_if_bodhi_version_is_not_supported(
-             self, hash_file, hashlib_new, isfile):
--        # As of writing this test, only supports version v2 and <v2.
--        self.mock_get_bodhi_version.return_value = [3, 1, 2]
-+        # As of writing this test, only supports version v3, v2, and <v2.
-+        self.mock_get_bodhi_version.return_value = [4, 1, 2]
-         hashlib_new.return_value.hexdigest.return_value = 'origin hash'
-         hash_file.return_value = 'different hash'
- 
-@@ -155,7 +155,7 @@ class TestUpdate(CliTestCase):
- 
-         cli = self.get_cli(cli_cmd)
-         six.assertRaisesRegex(
--            self, rpkgError, 'This system has bodhi v3, which is unsupported',
-+            self, rpkgError, 'This system has bodhi v4, which is unsupported',
-             self.create_bodhi_update, cli)
- 
-     @patch('os.path.isfile', return_value=True)
--- 
-2.13.6
-

diff --git a/fedpkg.spec b/fedpkg.spec
index f51a61b..e9482a9 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -1,14 +1,11 @@
-# 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())")}
-
 %define compdir %(pkg-config --variable=completionsdir bash-completion)
 %if "%{compdir}" == ""
 %define compdir "/etc/bash_completion.d"
 %endif
 
 Name:           fedpkg
-Version:        1.30
-Release:        5%{?dist}
+Version:        1.31
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
@@ -16,9 +13,6 @@ License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 # https://pagure.io/fedpkg/pull-request/162
-Patch0:         update-anongiturl.patch
-Patch1:         0001-Allow-any-parameters-in-construct_build_url.patch
-Patch2:         0001-Work-with-Bodhi-3.patch
 
 BuildArch:      noarch
 
@@ -33,6 +27,8 @@ BuildRequires:  python2-fedora
 BuildRequires:  git
 BuildRequires:  python2-mock
 
+BuildRequires:  python-bugzilla
+
 %if 0%{?rhel}
 BuildRequires:  python-unittest2
 %else
@@ -54,6 +50,7 @@ Requires:       redhat-rpm-config
 Requires:       pyrpkg >= 1.51
 Requires:       python2-fedora
 Requires:       python2-openidc-client
+Requires:       python-bugzilla
 
 
 %description
@@ -69,9 +66,6 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -104,8 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 %{_mandir}/*/*
 # For noarch packages: sitelib
-%{python_sitelib}/%{name}
-%{python_sitelib}/%{name}-%{version}-py*.egg-info
+%{python2_sitelib}/%{name}
+%{python2_sitelib}/%{name}-%{version}-py*.egg-info
 # zsh completion
 %{_datadir}/zsh/site-functions/_%{name}
 
@@ -115,6 +109,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 22 2018 Chenxiong Qi <cqi@redhat.com> - 1.31-1
+- Include missing conf file in test (cqi)
+- Add more document to request-repo and request-branch (cqi)
+- Stop allowing EPEL branches on official EL packages (mprahl)
+- Port fedrepo-req and fedrepo-req-branch to fedpkg (mprahl)
+- Fix test for unsupported Bodhi version (lsedlar)
+- Work with Bodhi 3 - rhbz#1507410 (lsedlar)
+- Allow any parameters in construct_build_url (cqi)
+- Fix the anongiturl (patrick)
+
 * Wed Nov 22 2017 Lubomír Sedlář <lsedlar@redhat.com> - 1.30-5
 - Work with Bodhi 3
 

diff --git a/sources b/sources
index 5a51c52..0d279c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.30.tar.bz2) = b86f14ff901c65eed1f1d6566b6e897a644598edb6052e787844a790e5688d3135c9b87a477fd3ea5446d008ae650ad9977c3865b823783079f235e24bd402cc
+SHA512 (fedpkg-1.31.tar.bz2) = 0b49fe3429ca140e588f55d3e817d8b90f77c07b83d76f3f2391ed7489d52eeb2e0b95d1caf3e7266e164b009374a1df32156a6a5ce7eabad439559626a39782

diff --git a/update-anongiturl.patch b/update-anongiturl.patch
deleted file mode 100644
index a28925d..0000000
--- a/update-anongiturl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg.conf
---- fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin	2017-10-27 15:26:56.973108529 +0800
-+++ fedpkg-1.30/conf/etc/rpkg/fedpkg.conf	2017-10-27 15:28:46.836006957 +0800
-@@ -3,7 +3,7 @@ lookaside = https://src.fedoraproject.or
- lookasidehash = sha512
- lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
- gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(module)s
--anongiturl = https://src.fedoraproject.org/git/%(module)s
-+anongiturl = https://src.fedoraproject.org/%(module)s.git
- branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
- kojiprofile = koji
- build_client = koji
-diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf
---- fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin	2017-10-27 15:26:53.629111621 +0800
-+++ fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf	2017-10-27 15:28:35.172017741 +0800
-@@ -3,7 +3,7 @@ lookaside = https://src.stg.fedoraprojec
- lookasidehash = sha512
- lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi
- gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(module)s
--anongiturl = https://src.stg.fedoraproject.org/git/%(module)s
-+anongiturl = https://src.stg.fedoraproject.org/%(module)s.git
- branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
- kojiprofile = stg
- build_client = koji