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

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 4cd8d2a9432fc20c49af9ce0cc5947b4e4e90a99
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2025-03-19T02:20:26+00:00
            Stats  : +19/-372 in 9 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/4cd8d2a9432fc20c49af9ce0cc5947b4e4e90a99?branch=1.70-1

            Log:
            New release 1.68

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

---
diff --git a/.gitignore b/.gitignore
index 7a933c4..0e7689d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /rpkg-1.65.tar.gz
 /rpkg-1.66.tar.gz
 /rpkg-1.67.tar.gz
+/rpkg-1.68.tar.gz

diff --git a/0001-clog-is-duplicating-changelog-lines.patch b/0001-clog-is-duplicating-changelog-lines.patch
deleted file mode 100644
index 7df4239..0000000
--- a/0001-clog-is-duplicating-changelog-lines.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7b3f92f6f3caa15bda19f557f5eb33405dcd7147 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Tue, 21 Jan 2025 18:09:57 +0100
-Subject: [PATCH] `clog` is duplicating changelog lines
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-`clog` have to read the tag CHANGELOGTEXT (not macro) appropriately
-as an array: --qf '[%{CHANGELOGTEXT}\n]'.
-Whole array is read, so the <SEPARATOR> is used to extract the first
-changelog.
-
-Fixes: https://pagure.io/fedpkg/issue/581
-Resolves: rhbz#2310713
-JIRA: RHELCMP-14285
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyrpkg/__init__.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index dfccad3..5b77453 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -2643,7 +2643,10 @@ class Commands(object):
-         # Command contains workaround (undefines _changelog_trimtime) described at:
-         # https://github.com/rpm-software-management/rpm/issues/1301
-         # It caused, that older changelog records were not displayed.
--        cmd = ["rpm"] + self.rpmdefines + ["-q", "--qf", "%{CHANGELOGTEXT}\n",
-+        #
-+        # [%{CHANGELOGTEXT}] is an array that contains all changelog records in a specfile
-+        # <SEPARATOR> tag is placed between changelogs records to be able to extract the first one
-+        cmd = ["rpm"] + self.rpmdefines + ["-q", "--qf", "[%{CHANGELOGTEXT}\n<SEPARATOR>]",
-                                            "--undefine", "_changelog_trimtime",
-                                            "--specfile", "%s" % spec_file]
-         proc = subprocess.Popen(cmd,
-@@ -2660,6 +2663,8 @@ class Commands(object):
-             clog_lines = []
-         buf = six.StringIO(stdout)
-         for line in buf:
-+            if line.startswith("<SEPARATOR>"):
-+                break
-             if line == '\n' or line.startswith('$'):
-                 continue
-             if line == '(none)\n':
--- 
-2.48.1
-

diff --git a/0004-Fix-package-in-Pypi.patch b/0004-Fix-package-in-Pypi.patch
deleted file mode 100644
index e82222f..0000000
--- a/0004-Fix-package-in-Pypi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 69a62d90ccab505bdd95b9817415b93582541d6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Mon, 8 Jul 2024 02:29:04 +0200
-Subject: [PATCH 1/2] Fix package in Pypi
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The pyrpkg module couldn't be imported.
-Flake8 doesn't need installation of all dependencies - quicker.
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyproject.toml | 4 ++--
- tox.ini        | 2 ++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 9d41225..dc4a285 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -83,5 +83,5 @@ include = [
- 
- [tool.hatch.build.targets.wheel]
- packages = [
--    "dist/rpkg",
-+    "pyrpkg",
- ]
-diff --git a/tox.ini b/tox.ini
-index 3357e2d..2638246 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -34,10 +34,12 @@ sitepackages=true
- sitepackages=true
- 
- [testenv:flake8]
-+skip_install = True
- deps = flake8
- commands = python -m flake8 pyrpkg/ tests/
- 
- [testenv:flake8python2]
-+skip_install = True
- deps = flake8
- commands = python -m flake8 pyrpkg/ tests/
- 
--- 
-2.46.0
-

diff --git a/0005-Fixing-encoding-of-the-url-when-checking-lookaside.patch b/0005-Fixing-encoding-of-the-url-when-checking-lookaside.patch
deleted file mode 100644
index 0801d00..0000000
--- a/0005-Fixing-encoding-of-the-url-when-checking-lookaside.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 4a1ed7633aad84c8e3bd9e856b5d8d95136a739d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Thu, 12 Sep 2024 00:28:04 +0200
-Subject: [PATCH 2/2] Fixing encoding of the url when checking lookaside
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In RHEL-7 (Python 2.7) encoding of the url was unicode. Curl's
-method 'setopt' expects utf-8.
-
-JIRA: RHELCMP-13939
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyrpkg/lookaside.py     |  4 +++-
- tests/test_lookaside.py | 10 ++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/pyrpkg/lookaside.py b/pyrpkg/lookaside.py
-index 72109bf..5929fc9 100644
---- a/pyrpkg/lookaside.py
-+++ b/pyrpkg/lookaside.py
-@@ -167,7 +167,7 @@ class CGILookasideCache(object):
-         self.log.info("Downloading %s from %s", filename, self.download_url)
-         urled_file = urllib.parse.quote(filename)
-         url = self.get_download_url(name, urled_file, hash, hashtype, **kwargs)
--        if isinstance(url, six.text_type):
-+        if six.PY2 and isinstance(url, six.text_type):
-             url = url.encode('utf-8')
-         self.log.debug("Full url: %s", url)
- 
-@@ -215,6 +215,8 @@ class CGILookasideCache(object):
- 
-         urled_file = urllib.parse.quote(filename)
-         url = self.get_download_url(name, urled_file, hash, hashtype or self.hashtype)
-+        if six.PY2 and isinstance(url, six.text_type):
-+            url = url.encode('utf-8')
- 
-         c = pycurl.Curl()
-         c.setopt(pycurl.URL, url)
-diff --git a/tests/test_lookaside.py b/tests/test_lookaside.py
-index 12da113..6bace2e 100644
---- a/tests/test_lookaside.py
-+++ b/tests/test_lookaside.py
-@@ -112,7 +112,10 @@ class CGILookasideCacheTestCase(unittest.TestCase):
-         lc = CGILookasideCache('sha512', 'http://example.com', '_')
-         lc.download(name, filename, hash, outfile, hashtype='sha512')
-         self.assertEqual(curl.perform.call_count, 1)
--        self.assertEqual(curlopts[pycurl.URL].decode('utf-8'), full_url)
-+        if six.PY2:
-+            self.assertEqual(curlopts[pycurl.URL].decode('utf-8'), full_url)
-+        else:
-+            self.assertEqual(curlopts[pycurl.URL], full_url)
-         self.assertEqual(os.path.getmtime(outfile), 0)
- 
-         with open(outfile) as f:
-@@ -167,7 +170,10 @@ class CGILookasideCacheTestCase(unittest.TestCase):
-         lc.download(name, filename, hash, outfile, hashtype='sha512',
-                     branch=branch)
-         self.assertEqual(curl.perform.call_count, 1)
--        self.assertEqual(curlopts[pycurl.URL].decode('utf-8'), full_url)
-+        if six.PY2:
-+            self.assertEqual(curlopts[pycurl.URL].decode('utf-8'), full_url)
-+        else:
-+            self.assertEqual(curlopts[pycurl.URL], full_url)
- 
-     @mock.patch('pyrpkg.lookaside.pycurl.Curl')
-     def test_download_corrupted(self, mock_curl):
--- 
-2.46.0
-

diff --git a/0006-Add-draft-builds-support.patch b/0006-Add-draft-builds-support.patch
deleted file mode 100644
index 9eb57fb..0000000
--- a/0006-Add-draft-builds-support.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 53a12c6fea813598851af65390695a69c8f29b76 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Wed, 9 Oct 2024 03:24:51 +0200
-Subject: [PATCH 1/3] Add draft builds support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Generally, it means adding `--draft` argument to the koji build
-command.
-
-JIRA: RHELCMP-14108
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyrpkg/__init__.py |  6 +++++-
- pyrpkg/cli.py      | 11 +++++++++--
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index 573fc36..c3e1722 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -2456,7 +2456,7 @@ class Commands(object):
- 
-     def build(self, skip_tag=False, scratch=False, background=False,
-               url=None, chain=None, arches=None, sets=False, nvr_check=True,
--              fail_fast=False, custom_user_metadata=None):
-+              fail_fast=False, custom_user_metadata=None, draft=False):
-         """Initiate a build in build system
- 
-         :param bool skip_tag: Skip the tag action after the build.
-@@ -2473,6 +2473,7 @@ class Commands(object):
-             will cause the entire build to fail if any subtask/architecture
-             build fails.
-         :param str custom_user_metadata: JSON string of custom metadata
-+        :param bool draft: Perform a draft build. Default is False.
-         :return: task ID returned from Koji API ``build`` and ``chainBuild``.
-         :rtype: int
-         """
-@@ -2524,6 +2525,9 @@ class Commands(object):
-         if scratch:
-             opts['scratch'] = True
-             cmd.append('--scratch')
-+        if draft:
-+            opts['draft'] = True
-+            cmd.append('--draft')
-         if background:
-             cmd.append('--background')
-             priority = 5  # magic koji number :/
-diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
-index 97c2904..bf2cfa1 100644
---- a/pyrpkg/cli.py
-+++ b/pyrpkg/cli.py
-@@ -548,9 +548,13 @@ class cliClient(object):
-         build_parser.add_argument(
-             '--skip-tag', action='store_true', default=False,
-             help='Do not attempt to tag package')
--        build_parser.add_argument(
-+        build_type_group = build_parser.add_mutually_exclusive_group()
-+        build_type_group.add_argument(
-             '--scratch', action='store_true', default=False,
-             help='Perform a scratch build')
-+        build_type_group.add_argument(
-+            '--draft', action='store_true', default=False,
-+            help='Perform a draft build')
-         build_parser.add_argument(
-             '--srpm', nargs='?', const='CONSTRUCT',
-             help='Build from an srpm. If no srpm is provided with this option'
-@@ -2125,7 +2129,8 @@ class cliClient(object):
-             sets=sets,
-             nvr_check=nvr_check,
-             fail_fast=self.args.fail_fast,
--            custom_user_metadata=custom_user_metadata)
-+            custom_user_metadata=custom_user_metadata,
-+            draft=self.args.draft)
- 
-     def chainbuild(self):
-         """Implement chain-build command"""
-@@ -2176,6 +2181,7 @@ class cliClient(object):
-         self.args.chain = urls
-         self.args.skip_tag = False
-         self.args.scratch = False
-+        self.args.draft = False
-         return self.build(sets)
- 
-     def clean(self):
-@@ -2936,6 +2942,7 @@ class cliClient(object):
-         # A scratch build is just a build with --scratch
-         self.args.scratch = True
-         self.args.skip_tag = False
-+        self.args.draft = False
-         return self.build()
- 
-     def sources(self):
--- 
-2.47.1
-

diff --git a/0007-Fix-regular-expression-for-parsing-Source-lines.patch b/0007-Fix-regular-expression-for-parsing-Source-lines.patch
deleted file mode 100644
index d6301c8..0000000
--- a/0007-Fix-regular-expression-for-parsing-Source-lines.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2a9507f1882bc6dbcf49f9dd39cbff451d41f1c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Mon, 14 Oct 2024 01:39:42 +0200
-Subject: [PATCH 2/3] Fix regular expression for parsing Source lines
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When pushing changes to the dist-git repo, the `pre-push-check`
-didn't identify hidden files (.file) among 'SourceX|PatchX'
-definitions. The regular expression was taken from another part
-of the code and improved.
-
-Fixes: #721
-JIRA: RHELCMP-13881
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyrpkg/__init__.py | 5 +++--
- pyrpkg/spec.py     | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index c3e1722..fd953b3 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -4575,8 +4575,9 @@ class Commands(object):
-         source_files = []
-         # extract source files from the spectool's output
-         for line in stdout.split('\n'):
--            file_location = re.sub(r'(?:Source|Patch)\d+\s*:\s*(\w+)', r'\1', line, re.IGNORECASE)
--            if file_location:
-+            match = SpecFile.sourcefile_expression.match(line)
-+            if match:
-+                file_location = match.group('val')
-                 # find out the format of the source file path. From URL use just the file name.
-                 # We want to keep hierarchy of the files if possible
-                 res = urllib.parse.urlparse(file_location)
-diff --git a/pyrpkg/spec.py b/pyrpkg/spec.py
-index 5400de3..28e3a27 100644
---- a/pyrpkg/spec.py
-+++ b/pyrpkg/spec.py
-@@ -15,7 +15,7 @@ from pyrpkg.errors import rpkgError
- class SpecFile(object):
-     """Simple specfile parser that finds source file names"""
-     sourcefile_expression = re.compile(
--        r'^((source[0-9]*|patch[0-9]*)\s*:\s*(?P<val>.*))\s*$',
-+        r'^(?:Source|Patch)\d*\s*:\s*(?P<val>[^\s]+)\s*$',
-         re.IGNORECASE)
- 
-     def __init__(self, spec, rpmdefines):
--- 
-2.47.1
-

diff --git a/0008-chain-build-correct-the-info-message.patch b/0008-chain-build-correct-the-info-message.patch
deleted file mode 100644
index 89119a7..0000000
--- a/0008-chain-build-correct-the-info-message.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f3cbcdd3b08311755940cb23dae131bbed901f9c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
-Date: Wed, 16 Oct 2024 02:57:52 +0200
-Subject: [PATCH 3/3] `chain-build`: correct the info message
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The info message was missing the whole 'chain' which says what
-components will be built. Originally, it didn't contain the last
-group of components. It was confusing for users.
-
-Fixes: https://pagure.io/fedpkg/issue/567
-JIRA: RHELCMP-14076
-
-Signed-off-by: Ondřej Nosek <onosek@redhat.com>
----
- pyrpkg/__init__.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
-index fd953b3..dfccad3 100644
---- a/pyrpkg/__init__.py
-+++ b/pyrpkg/__init__.py
-@@ -2596,8 +2596,8 @@ class Commands(object):
-             cmd.extend(' : '.join(
-                 [' '.join(build_sets) for build_sets in chain]
-             ).split())
--            self.log.info('Chain building %s + %s for %s',
--                          build_reference, chain[:-1], self.target)
-+            self.log.info('Chain building %s, chain consists of %s, for %s',
-+                          build_reference, chain, self.target)
-             self.log.debug(
-                 'Building chain %s for %s with options %s and a priority '
-                 'of %s', chain, self.target, opts, priority)
--- 
-2.47.1
-

diff --git a/rpkg.spec b/rpkg.spec
index 8018f00..1e432cd 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
-Version:        1.67
-Release:        7%{?dist}
+Version:        1.68
+Release:        1%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 # Automatically converted from old format: GPLv2+ and LGPLv2 - review is highly recommended.
@@ -45,15 +45,6 @@ Patch2:         0002-Remove-pytest-coverage-execution.patch
 %if 0%{?with_python2}
 Patch3:         0003-Remove-Environment-Markers-syntax.patch
 %endif
-Patch4:         0004-Fix-package-in-Pypi.patch
-Patch5:         0005-Fixing-encoding-of-the-url-when-checking-lookaside.patch
-Patch6:         0006-Add-draft-builds-support.patch
-Patch7:         0007-Fix-regular-expression-for-parsing-Source-lines.patch
-Patch8:         0008-chain-build-correct-the-info-message.patch
-# https://pagure.io/rpkg/c/7b3f92f6
-# https://pagure.io/fedpkg/issue/581
-# Fixes duplication of changelog lines (which affected fedpkg also)
-Patch9:          0001-clog-is-duplicating-changelog-lines.patch
 
 
 %description
@@ -285,6 +276,21 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 
 
 %changelog
+* Wed Mar 19 2025 Ondřej Nosek <onosek@redhat.com> - 1.68-1
+- Restrict Git index version to what GitPython supports (otto.liljalaakso)
+- `set-pagure-token`: config - more restrictive permissions (git)
+- `pre-push-check`: show spectool command output - #732 (onosek)
+- `prep`: added an argument to check dependencies - 585 (onosek)
+- Python 3.13 environment and renew testing image (onosek)
+- Fix formatting for error when mockbuild sources fails (otto.liljalaakso)
+- `clog` is duplicating changelog lines - 581 (onosek)
+- Fixing unittests for py36 (onosek)
+- `chain-build`: correct the info message - 567 (onosek)
+- Fix regular expression for parsing Source lines - #721 (onosek)
+- Add draft builds support (onosek)
+- Fixing encoding of the url when checking lookaside (onosek)
+- Fix package in Pypi (onosek)
+
 * Mon Mar 03 2025 Adam Williamson <awilliam@redhat.com> - 1.67-7
 - Patch: `clog` is duplicating changelog lines
 

diff --git a/sources b/sources
index e7e9a14..e997688 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpkg-1.67.tar.gz) = 64ae09c980203cd7033e280ff7e89a3e54dd40be8d09414d928d57e23f1514516520c69dcf8c2bbc0c3253a4ffa556ba21adb0c2f590e2245a706dcd264fe18b
+SHA512 (rpkg-1.68.tar.gz) = 13b8812913020ea7aa4a3c3fe25d329755c112703c72fd66ce00fd0b64e2278ca9b032546849b0ab4004df46f234f1391bd8e49684b9eefa1d08f3ed2d89892a