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

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 687ceb8723c6232edbec071aab56eb2f67af5439
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2019-04-29T10:58:44+02:00
            Stats  : +68/-154 in 7 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/687ceb8723c6232edbec071aab56eb2f67af5439?branch=1.70-1

            Log:
            New release 1.58

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 24d080f..50128a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /rpkg-1.55.tar.gz
 /rpkg-1.56.tar.gz
 /rpkg-1.57.tar.gz
+/rpkg-1.58.tar.gz

diff --git a/0001-Upload-.crate-files-to-lookaside-cache.patch b/0001-Upload-.crate-files-to-lookaside-cache.patch
deleted file mode 100644
index 31edbbc..0000000
--- a/0001-Upload-.crate-files-to-lookaside-cache.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00a89ee07132a0d11ae35ce370cb0579b2b9defe Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 18 Mar 2019 13:00:12 +0100
-Subject: [PATCH] Upload .crate files to lookaside cache
-
-Fixes: https://pagure.io/fedpkg/issue/312
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- pyrpkg/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index a70f775..b3b8f5f 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -89,7 +89,7 @@ class Commands(object):
-     UPLOADEXTS = ['tar', 'gz', 'bz2', 'lzma', 'xz', 'Z', 'zip', 'tff',
-                   'bin', 'tbz', 'tbz2', 'tgz', 'tlz', 'txz', 'pdf', 'rpm',
-                   'jar', 'war', 'db', 'cpio', 'jisp', 'egg', 'gem', 'spkg',
--                  'oxt', 'xpi']
-+                  'oxt', 'xpi', 'crate']
- 
-     def __init__(self, path, lookaside, lookasidehash, lookaside_cgi,
-                  gitbaseurl, anongiturl, branchre, kojiconfig,
--- 
-2.21.0
-

diff --git a/0001-srpm_import-be-compatible-with-rhbz-1693751.patch b/0001-srpm_import-be-compatible-with-rhbz-1693751.patch
deleted file mode 100644
index ed8e9aa..0000000
--- a/0001-srpm_import-be-compatible-with-rhbz-1693751.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3d9523be1ae64a84ce849fa199b3c1e01b3d805b Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 19 Apr 2019 19:21:02 +0200
-Subject: [PATCH] srpm_import: be compatible with rhbz#1693751
-
-Older RPMs returned 'bytes' objects, newer return 'str'.
-
-If 'str' object is returned on Python 3 - it doesn't need to be
-decoded, and it actually raises error [1]:
-
-    >>> str('', encoding='utf-8')
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
-    TypeError: decoding str is not supported
-
-This change also OK for Python 2 where str() has decode method
-(str is alternative for bytes).
-
-[1] https://pagure.io/copr/copr/issue/677
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- pyrpkg/__init__.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index f1ecc6f..8fe4ed0 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -1248,8 +1248,8 @@ class Commands(object):
-         archlist = [pkg.header['arch'] for pkg in hdr.packages]
-         if not archlist:
-             raise rpkgError('No compatible build arches found in %s' % spec)
--        if six.PY3:
--            return [str(arch, encoding='utf-8') for arch in archlist]
-+        if hasattr(archlist[0], 'decode'):
-+            return [arch.decode('utf-8') for arch in archlist]
-         else:
-             return archlist
- 
-@@ -1339,9 +1339,10 @@ class Commands(object):
-             hdr = koji.get_rpm_header(srpm)
-             name = hdr[rpm.RPMTAG_NAME]
-             contents = hdr[rpm.RPMTAG_FILENAMES]
--            if six.PY3:
--                name = str(name, encoding='utf-8')
--                contents = [str(filename, encoding='utf-8')
-+            if hasattr(name, 'decode'):
-+                # RPM before rhbz#1693751 returned bytes
-+                name = name.decode('utf-8')
-+                contents = [filename.decode('utf-8')
-                             for filename in contents]
-         except Exception as e:
-             raise rpkgError('Error querying srpm: {0}'.format(str(e)))
--- 
-2.20.1
-

diff --git a/0002-Handle-data-from-python-RPM-binding-as-UTF-8-string.patch b/0002-Handle-data-from-python-RPM-binding-as-UTF-8-string.patch
deleted file mode 100644
index 473d9f1..0000000
--- a/0002-Handle-data-from-python-RPM-binding-as-UTF-8-string.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7f3f4b607948f1babb154b7946813fa6f8edb8fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Mon, 22 Apr 2019 16:13:24 +0200
-Subject: [PATCH] Handle data from python RPM binding as UTF-8 string
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The RPM python3 bindings return ALL string data as surrogate-escaped
-utf-8 string objects.
-See: https://bugzilla.redhat.com/show_bug.cgi?id=1693751
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
----
- pyrpkg/__init__.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index 8fe4ed0..23b1ed7 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -1248,8 +1248,11 @@ class Commands(object):
-         archlist = [pkg.header['arch'] for pkg in hdr.packages]
-         if not archlist:
-             raise rpkgError('No compatible build arches found in %s' % spec)
--        if hasattr(archlist[0], 'decode'):
--            return [arch.decode('utf-8') for arch in archlist]
-+        if six.PY3:
-+            return [str(arch, encoding='utf-8')
-+                    if not isinstance(arch, six.string_types)
-+                    else arch
-+                    for arch in archlist]
-         else:
-             return archlist
- 
-@@ -1339,10 +1342,10 @@ class Commands(object):
-             hdr = koji.get_rpm_header(srpm)
-             name = hdr[rpm.RPMTAG_NAME]
-             contents = hdr[rpm.RPMTAG_FILENAMES]
--            if hasattr(name, 'decode'):
-+            if six.PY3 and not isinstance(name, six.string_types):
-                 # RPM before rhbz#1693751 returned bytes
--                name = name.decode('utf-8')
--                contents = [filename.decode('utf-8')
-+                name = str(name, encoding='utf-8')
-+                contents = [str(filename, encoding='utf-8')
-                             for filename in contents]
-         except Exception as e:
-             raise rpkgError('Error querying srpm: {0}'.format(str(e)))
--- 
-2.20.1
-

diff --git a/remove-koji-and-rpm-py-installer-from-requires.patch b/remove-koji-and-rpm-py-installer-from-requires.patch
index 1a10be9..fd4188f 100644
--- a/remove-koji-and-rpm-py-installer-from-requires.patch
+++ b/remove-koji-and-rpm-py-installer-from-requires.patch
@@ -1,9 +1,18 @@
+From fe994884ad31feece96ccc05f1b1aa10c067ab94 Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Fri, 26 Apr 2019 21:38:06 +0200
+Subject: [PATCH] remove koji and rpm-py-installer from requires
+
+---
+ setup.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
 diff --git a/setup.py b/setup.py
-index ce86b0b..4490712 100755
+index e29a640..a96e972 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -50,6 +50,11 @@ else:
-         'PyGObject',
+@@ -44,6 +44,11 @@ if ver[0] <= 2 and ver[1] < 7:
+         'unittest2'
      ]
  
 +install_requires = [
@@ -14,3 +23,6 @@ index ce86b0b..4490712 100755
  readme_rst = os.path.join(setup_py_path, 'README.rst')
  with open(readme_rst, 'r') as readme:
      long_description = readme.read().rstrip()
+-- 
+2.20.1
+

diff --git a/rpkg.spec b/rpkg.spec
index 9eac3e2..6f80775 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,8 +3,8 @@
 %{!?__python2: %global __python2 %{__python}}
 
 Name:           rpkg
-Version:        1.57
-Release:        9%{?dist}
+Version:        1.58
+Release:        1%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -22,15 +22,6 @@ Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
 # remove rpm-py-installer for now.
 Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
 
-# https://pagure.io/rpkg/c/00a89ee07132a0d11ae35ce370cb0579b2b9defe
-Patch0001:      0001-Upload-.crate-files-to-lookaside-cache.patch
-
-# https://pagure.io/rpkg/pull-request/439
-Patch0002:      0001-srpm_import-be-compatible-with-rhbz-1693751.patch
-
-# https://pagure.io/rpkg/pull-request/440
-Patch0003:      0002-Handle-data-from-python-RPM-binding-as-UTF-8-string.patch
-
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Enable python3 build by default
 %global with_python3 1
@@ -150,7 +141,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-nose
 BuildRequires:  python3-gobject-base
 BuildRequires:  python3-PyYAML
-BuildRequires:  libmodulemd
+BuildRequires:  python3-libmodulemd
 BuildRequires:  rpmlint
 
 Requires:       mock
@@ -166,7 +157,7 @@ Requires:       python3-pycurl
 Requires:       python3-six >= 1.9.0
 Requires:       python3-gobject-base
 Requires:       python3-PyYAML
-Requires:       libmodulemd
+Requires:       python3-libmodulemd
 
 Requires:       %{name}-common = %{version}-%{release}
 
@@ -191,6 +182,10 @@ Common files for python2-%{name} and python3-%{name}.
 %prep
 %autosetup -p1
 
+# Removes section from setup.py that is relevant only for pip and
+# is not compatible with in RHEL-6 tools
+sed -i -n '/extras_require/,/}/!p' setup.py
+
 %build
 %if 0%{?with_python2}
 %{__python2} setup.py build
@@ -266,6 +261,43 @@ nosetests tests
 
 
 %changelog
+* Mon Apr 29 2019 Ondřej Nosek <onosek@redhat.com> - 1.58-1
+- Ignore files in a cloned repository - #355 (onosek)
+- Handle data from python RPM binding as UTF-8 string (zebob.m)
+- srpm_import: be compatible with rhbz#1693751 (praiskup)
+- Pass --enable-network to mock - 314 (onosek)
+- Enhance 'module-overview' sub-command to show scratch status of modules.
+  (mmathesi)
+- Remove the ability to parse a module's branch automatically to determine the
+  base module stream override (mprahl)
+- Improvements for scratch module builds (mmathesi)
+- Updates to support scratch module builds (mmathesi)
+- Refactor fake Koji credential handling from TestBuildPackage class into new
+  FakeKojiCreds class so it can be shared with TestModulesCli class. (mmathesi)
+- Make Koji upload methods more generic so they can be reused. (mmathesi)
+- Allow passing --offline and -r to mbs-manager build_module_locally. (jkaluza)
+- Depth param for clone - tuning (onosek)
+- Depth param for clone - #363 (onosek)
+- Pass --disablerepo and --enablerepo to mock - 313 (onosek)
+- Import srpm without uploading sources - rhbz#1175262 (onosek)
+- Ignore any specified profile when finding the Flatpak build target (otaylor)
+- Show module build links in output from command module-build (cqi)
+- Add 'retire' command supporting both packages and modules (mmathesi)
+- Fix "push --force" (tim)
+- Container-build returns its status to command-line - #415 (onosek)
+- Upload .crate files to lookaside cache - 312 (onosek)
+- Restrict version of PyYAML on Python 2.6 (lsedlar)
+- Simplify srpm method (onosek)
+- Permit setting arbitrary rpm macros during build (riehecky)
+- Add the ability to configure multiple regex expressions for
+  base_module_stream_regex_from_branch (mprahl)
+- Do not require PyGObject in setup.py - rhbz#1679365 (onosek)
+- Fixing failing Jenkins tests (onosek)
+- Unify update-docs script with fedpkg version (onosek)
+- README: add links (onosek)
+- Watch multiple module builds (cqi)
+- Added update-docs script (onosek)
+
 * Thu Apr 25 2019 Ondřej Nosek <onosek@redhat.com> - 1.57-9
 - yet another compat fix with RPM after rhbz#1693751
 
@@ -320,6 +352,12 @@ nosetests tests
 - TestContainerBuildWithKoji: tear down the mock appropriately (otaylor)
 - Refine test runner for py26 (cqi)
 
+* Thu Nov 15 2018 Ondřej Nosek <onosek@redhat.com> - 1.56-4
+- Allow build for RHEL-8  (onosek)
+
+* Wed Nov 14 2018 Ondřej Nosek <onosek@redhat.com> - 1.56-3
+- No mock warning (onosek)
+
 * Fri Sep  7 2018 Owen Taylor <otaylor@redhat.com> - 1.56-2
 - Add patch from upstream pull-request to add a flatpak-build subcommand
 - Add PyYAML dependencies so that the spec file at least builds on epel6/epel7

diff --git a/sources b/sources
index 277a827..6855be4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpkg-1.57.tar.gz) = 13ffb5282c46f8023bb0d1e0573fff12b84d1cbc3fd6cf332c054314a3192bcc2aca90de3ed002ac22e5ec03cc5602d6f900b171f6aab402bb26e6fd1c14d018
+SHA512 (rpkg-1.58.tar.gz) = 2bb8064fbf716d24a43a959be528214c90feef1b8ffdb24f8ed2338e22a4694182ae0977e074c60280605efacd6f02a6c13b9304eefa230d461311930d085e1f