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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 7be1b5d82ccd1f6afeee933bc62628b9562577ec
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2020-09-09T01:23:16+00:00
            Stats  : +55/-522 in 10 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/7be1b5d82ccd1f6afeee933bc62628b9562577ec?branch=1.48-1

            Log:
            New release 1.39

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

---
diff --git a/.gitignore b/.gitignore
index e29498e..52b6f2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /fedpkg-1.36.tar.bz2
 /fedpkg-1.37.tar.bz2
 /fedpkg-1.38.tar.bz2
+/fedpkg-1.39.tar.bz2

diff --git a/0001-Do-not-use-pytest-related-dependencies-temporarily.patch b/0001-Do-not-use-pytest-related-dependencies-temporarily.patch
new file mode 100644
index 0000000..c622ada
--- /dev/null
+++ b/0001-Do-not-use-pytest-related-dependencies-temporarily.patch
@@ -0,0 +1,25 @@
+From f977b49afd95262127bc17131d81b18eeaaad929 Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Wed, 9 Sep 2020 03:20:15 +0200
+Subject: [PATCH] Do not use pytest-related dependencies temporarily
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2b1d1fd..40c5cbe 100755
+--- a/setup.py
++++ b/setup.py
+@@ -54,7 +54,6 @@ setup(
+                 ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
+                 ],
+ 
+-    setup_requires=['setuptools_scm', 'pytest-runner'],
+     install_requires=install_requires,
+     tests_require=tests_require,
+ 
+-- 
+2.26.2
+

diff --git a/0006-display_name-added-to-bodhi.template.patch b/0006-display_name-added-to-bodhi.template.patch
deleted file mode 100644
index 4262cad..0000000
--- a/0006-display_name-added-to-bodhi.template.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6797e34e97cd0636d4becd8e3d77e9b41b34685b Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Thu, 15 Aug 2019 14:42:31 +0200
-Subject: [PATCH] display_name added to bodhi.template
-
-User is able to set 'display_name' during bodhi update operation which
-allows the user to customize the name of the update.
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py    | 3 +++
- test/test_cli.py | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index e584e51..b631c94 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -55,6 +55,8 @@ bugs=%(bugs)s
- # This is required for security updates.
- # severity=unspecified
- 
-+display_name=
-+
- %(changelog)s
- # Here is where you give an explanation of your update.
- # Content can span multiple lines, as long as they are indented deeper than
-@@ -630,6 +632,7 @@ targets to build the package for a particular stream.
-         bodhi_args = {
-             'nvr': nvr,
-             'bugs': six.u(''),
-+            'display_name': six.u(''),
-             'descr': six.u(
-                 'Here is where you give an explanation of your update.'),
-             'request': self.args.request,
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 58dd0d9..3d6bade 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -180,6 +180,7 @@ class TestUpdate(CliTestCase):
-         expected_data = {
-             'autokarma': 'True',
-             'bugs': '1000,2000',
-+            'display_name': six.u(''),
-             'builds': ' {0} '.format(self.mock_nvr.return_value),
-             'close_bugs': True,
-             'request': 'testing',
--- 
-2.21.0
-

diff --git a/0007-Move-rpm-dependency-for-test-environment-only.patch b/0007-Move-rpm-dependency-for-test-environment-only.patch
deleted file mode 100644
index 62d3c98..0000000
--- a/0007-Move-rpm-dependency-for-test-environment-only.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4cc6eb8627b91af437fc18c9ed3f4d2c98e2ddb5 Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Fri, 6 Mar 2020 15:40:20 +0100
-Subject: [PATCH] Move rpm dependency for test environment only
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- requirements.txt       | 1 -
- tests-requirements.txt | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index f65771a..c8dd6bc 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -2,4 +2,3 @@ openidc-client
- python-bugzilla
- rpkg
- six
--rpm
-diff --git a/tests-requirements.txt b/tests-requirements.txt
-index f6f94a7..766f8d9 100644
---- a/tests-requirements.txt
-+++ b/tests-requirements.txt
-@@ -5,3 +5,4 @@ nose-cov
- cccolutils
- gitpython
- freezegun
-+rpm
--- 
-2.21.1
-

diff --git a/0008-Repair-test-of-retire-command-after-rpkg-update.patch b/0008-Repair-test-of-retire-command-after-rpkg-update.patch
deleted file mode 100644
index fdeade4..0000000
--- a/0008-Repair-test-of-retire-command-after-rpkg-update.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 58533b8fb6e1eb7daa938ef2bc2b8a3d778469de Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Wed, 25 Mar 2020 23:27:39 +0100
-Subject: [PATCH 1/3] Repair test of "retire" command after rpkg update
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- test/test_retire.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_retire.py b/test/test_retire.py
-index 153dbc9..f6b40cc 100644
---- a/test/test_retire.py
-+++ b/test/test_retire.py
-@@ -105,7 +105,7 @@ class RetireTestCase(unittest.TestCase):
-         client.log = mock.Mock()
-         client.retire()
-         args, kwargs = client.log.warn.call_args
--        self.assertIn('dead.package found, package probably already retired',
-+        self.assertIn('dead.package found, package or module is already retired',
-                       args[0])
- 
-     @mock.patch(
--- 
-2.21.1
-

diff --git a/0009-Body-changes-for-requesting-new-test-repo.patch b/0009-Body-changes-for-requesting-new-test-repo.patch
deleted file mode 100644
index 83971b0..0000000
--- a/0009-Body-changes-for-requesting-new-test-repo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 5672d905e430dc599c4e1a9b2a3c447c225f63ab Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Wed, 25 Mar 2020 18:08:03 +0100
-Subject: [PATCH 1/2] Body changes for requesting new test repo
-
-Adds new fields 'bug_id' (optional) and 'monitor' (fixed)
-
-Relates: https://pagure.io/fedscm-admin/issue/22
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- fedpkg/cli.py    | 8 +++++++-
- test/test_cli.py | 4 +++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index e2291ff..c43fcff 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -359,6 +359,9 @@ class fedpkgClient(cliClient):
-         request_tests_repo_parser.add_argument(
-             'description',
-             help='Description of the tests repository')
-+        request_tests_repo_parser.add_argument(
-+            '--bug', type=int,
-+            help='Bugzilla bug ID of the package review request.')
-         request_tests_repo_parser.set_defaults(command=self.request_tests_repo)
- 
-     def register_request_branch(self):
-@@ -801,6 +804,7 @@ class fedpkgClient(cliClient):
-             repo_name=self.args.name,
-             ns='tests',
-             description=self.args.description,
-+            bug=self.args.bug,
-             name=self.name,
-             config=self.config,
-             anongiturl=self.cmd.anongiturl
-@@ -862,7 +866,7 @@ class fedpkgClient(cliClient):
-                 .format(repo_name))
- 
-         summary_from_bug = ''
--        if bug and ns not in ['tests', 'modules', 'flatpaks']:
-+        if bug and ns not in ['modules', 'flatpaks']:
-             bz_url = config.get('{0}.bugzilla'.format(name), 'url')
-             bz_client = BugzillaClient(bz_url)
-             bug_obj = bz_client.get_review_bug(bug, ns, repo_name)
-@@ -875,6 +879,8 @@ class fedpkgClient(cliClient):
-             ticket_body = {
-                 'action': 'new_repo',
-                 'branch': 'master',
-+                'bug_id': bug or '',
-+                'monitor': 'no-monitoring',
-                 'namespace': 'tests',
-                 'repo': repo_name,
-                 'description': description,
-diff --git a/test/test_cli.py b/test/test_cli.py
-index e78edc7..c25f6bb 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -1452,8 +1452,10 @@ class TestRequestTestsRepo(CliTestCase):
-         expected_issue_content = {
-             'action': 'new_repo',
-             'branch': 'master',
--            'repo': 'foo',
-+            'bug_id': '',
-+            'monitor': 'no-monitoring',
-             'namespace': 'tests',
-+            'repo': 'foo',
-             'description': 'Some description'
-         }
- 
--- 
-2.21.1
-

diff --git a/0010-Check-missing-config-options-more-reliably.patch b/0010-Check-missing-config-options-more-reliably.patch
deleted file mode 100644
index ca85f3a..0000000
--- a/0010-Check-missing-config-options-more-reliably.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From dcfdb9f532be3a05971982726d70d357bd2b7760 Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 30 Mar 2020 04:01:52 +0200
-Subject: [PATCH] Check missing config options more reliably
-
-User's config file is not always updated with freshly added config
-options in fedpkg release. The reason could be the user's own changes
-in the config file prior to the upgrade. It needs user's action
-and this fix provides a hint when this problem is detected.
-
-Resolves: rhbz#1813338
-JIRA: COMPOSE-4228
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- conf/etc/rpkg/fedpkg.conf |  1 +
- fedpkg/cli.py             | 42 +++++++++++++----------
- fedpkg/utils.py           | 72 ++++++++++++++++++++++-----------------
- test/test_utils.py        | 15 ++++----
- 4 files changed, 74 insertions(+), 56 deletions(-)
-
-diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
-index 0809aef..e3089bc 100644
---- a/conf/etc/rpkg/fedpkg.conf
-+++ b/conf/etc/rpkg/fedpkg.conf
-@@ -69,6 +69,7 @@ url = https://bugzilla.redhat.com/
- 
- [fedpkg.pagure]
- url = https://pagure.io/
-+token = 
- 
- [fedpkg.pdc]
- url = https://pdc.fedoraproject.org/
-diff --git a/fedpkg/cli.py b/fedpkg/cli.py
-index c43fcff..452026b 100644
---- a/fedpkg/cli.py
-+++ b/fedpkg/cli.py
-@@ -30,11 +30,10 @@ from six.moves.urllib_parse import urlparse
- 
- from fedpkg.bugzilla import BugzillaClient
- from fedpkg.utils import (assert_new_tests_repo, assert_valid_epel_package,
--                          do_fork, expand_release, get_dist_git_url,
--                          get_distgit_token, get_fedora_release_state,
--                          get_pagure_token, get_release_branches,
--                          get_stream_branches, is_epel, new_pagure_issue,
--                          sl_list_to_dict, verify_sls)
-+                          config_get_safely, do_fork, expand_release,
-+                          get_dist_git_url, get_fedora_release_state,
-+                          get_release_branches, get_stream_branches, is_epel,
-+                          new_pagure_issue, sl_list_to_dict, verify_sls)
- from pyrpkg import rpkgError
- from pyrpkg.cli import cliClient
- 
-@@ -256,6 +255,9 @@ class fedpkgClient(cliClient):
- 
-     def register_request_repo(self):
-         help_msg = 'Request a new dist-git repository'
-+        pagure_section = '{0}.pagure'.format(self.name)
-+        pagure_url = config_get_safely(self.config, pagure_section, 'url')
-+        pagure_url_parsed = urlparse(pagure_url).netloc
-         description = textwrap.dedent('''
-             Request a new dist-git repository
- 
-@@ -275,8 +277,7 @@ class fedpkgClient(cliClient):
-             Another example to request a module foo:
- 
-                 fedpkg request-repo --namespace modules foo
--        '''.format(self.name, urlparse(self.config.get(
--            '{0}.pagure'.format(self.name), 'url')).netloc))
-+        '''.format(self.name, pagure_url_parsed))
- 
-         request_repo_parser = self.subparsers.add_parser(
-             'request-repo',
-@@ -322,8 +323,9 @@ class fedpkgClient(cliClient):
- 
-     def register_request_tests_repo(self):
-         help_msg = 'Request a new tests dist-git repository'
--        pagure_url = urlparse(self.config.get(
--            '{0}.pagure'.format(self.name), 'url')).netloc
-+        pagure_section = '{0}.pagure'.format(self.name)
-+        pagure_url = config_get_safely(self.config, pagure_section, 'url')
-+        pagure_url_parsed = urlparse(pagure_url).netloc
-         anongiturl = self.config.get(
-             self.name, 'anongiturl', vars={'repo': 'any', 'module': 'any'}
-         )
-@@ -346,7 +348,7 @@ class fedpkgClient(cliClient):
- 
-             Note that the space name needs to reflect the intent of the tests and will
-             undergo a manual review.
--        '''.format(self.name, pagure_url, get_dist_git_url(anongiturl)))
-+        '''.format(self.name, pagure_url_parsed, get_dist_git_url(anongiturl)))
- 
-         request_tests_repo_parser = self.subparsers.add_parser(
-             'request-tests-repo',
-@@ -441,6 +443,8 @@ class fedpkgClient(cliClient):
- 
-     def register_do_fork(self):
-         help_msg = 'Create a new fork of the current repository'
-+        distgit_section = '{0}.distgit'.format(self.name)
-+        distgit_api_base_url = config_get_safely(self.config, distgit_section, "apibaseurl")
-         description = textwrap.dedent('''
-             Create a new fork of the current repository
- 
-@@ -460,8 +464,7 @@ class fedpkgClient(cliClient):
-             username is taken. It could be overridden by reusing an argument:
- 
-                 {0} --user FAS_ID fork
--        '''.format(self.name, urlparse(self.config.get(
--            '{0}.distgit'.format(self.name), 'apibaseurl')).netloc))
-+        '''.format(self.name, urlparse(distgit_api_base_url).netloc))
- 
-         fork_parser = self.subparsers.add_parser(
-             'fork',
-@@ -905,8 +908,9 @@ class fedpkgClient(cliClient):
-         ticket_body = '```\n{0}\n```'.format(ticket_body)
-         ticket_title = 'New Repo for "{0}/{1}"'.format(ns, repo_name)
- 
--        pagure_url = config.get('{0}.pagure'.format(name), 'url')
--        pagure_token = get_pagure_token(config, name)
-+        pagure_section = '{0}.pagure'.format(name)
-+        pagure_url = config_get_safely(config, pagure_section, 'url')
-+        pagure_token = config_get_safely(config, pagure_section, 'token')
-         print(new_pagure_issue(
-             pagure_url, pagure_token, ticket_title, ticket_body, name))
- 
-@@ -1024,8 +1028,9 @@ class fedpkgClient(cliClient):
-             sl_dict = sl_list_to_dict(service_levels)
-             verify_sls(pdc_url, sl_dict)
- 
--        pagure_url = config.get('{0}.pagure'.format(name), 'url')
--        pagure_token = get_pagure_token(config, name)
-+        pagure_section = '{0}.pagure'.format(name)
-+        pagure_url = config_get_safely(config, pagure_section, 'url')
-+        pagure_token = config_get_safely(config, pagure_section, 'token')
-         if all_releases:
-             release_branches = list(itertools.chain(
-                 *list(get_release_branches(pdc_url).values())))
-@@ -1097,13 +1102,14 @@ class fedpkgClient(cliClient):
- 
-     def do_distgit_fork(self):
-         """create fork of the distgit repository"""
--        distgit_api_base_url = self.config.get('{0}.distgit'.format(self.name), "apibaseurl")
-+        distgit_section = '{0}.distgit'.format(self.name)
-+        distgit_api_base_url = config_get_safely(self.config, distgit_section, "apibaseurl")
-         distgit_remote_base_url = self.config.get(
-             '{0}'.format(self.name),
-             "gitbaseurl",
-             vars={'user': 'any', 'repo': 'any'},
-         )
--        distgit_token = get_distgit_token(self.config, self.name)
-+        distgit_token = config_get_safely(self.config, distgit_section, 'token')
- 
-         fork_url = do_fork(
-             base_url=distgit_api_base_url,
-diff --git a/fedpkg/utils.py b/fedpkg/utils.py
-index 3a1c04d..b639c4f 100644
---- a/fedpkg/utils.py
-+++ b/fedpkg/utils.py
-@@ -292,38 +292,6 @@ def verify_sls(pdc_url, sl_dict):
-             raise rpkgError('The SL "{0}" is not in PDC'.format(sl))
- 
- 
--def get_pagure_token(config, cli_name):
--    """
--    Gets the Pagure token configured in the user's configuration file
--    :param config: ConfigParser object
--    :param cli_name: string of the CLI's name (e.g. fedpkg)
--    :return: string of the Pagure token
--    """
--    conf_section = '{0}.pagure'.format(cli_name)
--    try:
--        return config.get(conf_section, 'token')
--    except (NoSectionError, NoOptionError):
--        raise rpkgError(
--            'Missing a Pagure token. Refer to the help of the current command '
--            '(-h/--help)" to set a token in your user configuration.')
--
--
--def get_distgit_token(config, cli_name):
--    """
--    Gets the distgit token configured in the user's configuration file
--    :param config: ConfigParser object
--    :param cli_name: string of the CLI's name (e.g. fedpkg)
--    :return: string of the distgit token
--    """
--    conf_section = '{0}.distgit'.format(cli_name)
--    try:
--        return config.get(conf_section, 'token')
--    except (NoSectionError, NoOptionError):
--        raise rpkgError(
--            'Missing a distgit token. Refer to the help of the current command '
--            '(-h/--help)" to set a token in your user configuration.')
--
--
- def is_epel(branch):
-     """
-     Determines if this is or will be an epel branch
-@@ -524,3 +492,43 @@ def get_fedora_release_state(config, cli_name, release):
-         raise rpkgError(base_error_msg.format(rv.text))
- 
-     return rv.json().get('state')
-+
-+
-+def config_get_safely(config, section, option):
-+    """
-+    Returns option from the user's configuration file. In case of missing
-+    section or option method throws an exception with a human-readable
-+    warning and a possible hint.
-+    The method should be used especially in situations when there are newly
-+    added sections/options into the config. In this case, there is a risk that
-+    the user's config wasn't properly upgraded.
-+
-+    :param config: ConfigParser object
-+    :param section: section name in the config
-+    :param option: name of the option
-+    :return: option value from the right section
-+    :rtype: str
-+    """
-+
-+    hint = (
-+        "First (if possible), refer to the help of the current command "
-+        "(-h/--help).\n"
-+        "There also might be a new version of the config after upgrade.\n"
-+        "Hint: you can check if you have 'fedpkg.conf.rpmnew' or "
-+        "'fedpkg.conf.rpmsave' in the config directory. If yes, try to merge "
-+        "your changes to the config with the maintainer provided version "
-+        "(or replace fedpkg.conf file with 'fedpkg.conf.rpmnew')."
-+    )
-+
-+    try:
-+        return config.get(section, option)
-+    except NoSectionError:
-+        msg = "Missing section '{0}' in the config file.".format(section)
-+        raise rpkgError("{0}\n{1}".format(msg, hint))
-+    except NoOptionError:
-+        msg = "Missing option '{0}' in the section '{1}' of the config file.".format(
-+            option, section
-+        )
-+        raise rpkgError("{0}\n{1}".format(msg, hint))
-+    except Exception:
-+        raise
-diff --git a/test/test_utils.py b/test/test_utils.py
-index f7db2e4..904b3cb 100644
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -177,13 +177,13 @@ class TestAssertNewTestsRepo(unittest.TestCase):
- 
- 
- class TestGetPagureToken(unittest.TestCase):
--    """Test get_pagure_token"""
-+    """Test obtaining of Pagure token"""
- 
-     def test_return_token(self):
-         config = Mock()
-         config.get.return_value = '123456'
- 
--        token = utils.get_pagure_token(config, 'fedpkg')
-+        token = utils.config_get_safely(config, 'fedpkg.pagure', 'token')
- 
-         self.assertEqual('123456', token)
-         config.get.assert_called_once_with('fedpkg.pagure', 'token')
-@@ -192,12 +192,15 @@ class TestGetPagureToken(unittest.TestCase):
-         config = Mock()
- 
-         config.get.side_effect = NoOptionError('token', 'fedpkg.pagure')
--        six.assertRaisesRegex(self, rpkgError, 'Missing a Pagure token',
--                              utils.get_pagure_token, config, 'fedpkg')
-+        six.assertRaisesRegex(self,
-+                              rpkgError, "Missing option 'token' in the section 'fedpkg.pagure'",
-+                              utils.config_get_safely,
-+                              config,
-+                              'fedpkg.pagure', 'token')
- 
-         config.get.side_effect = NoSectionError('fedpkg.pagure')
--        six.assertRaisesRegex(self, rpkgError, 'Missing a Pagure token',
--                              utils.get_pagure_token, config, 'fedpkg')
-+        six.assertRaisesRegex(self, rpkgError, "Missing section 'fedpkg.pagure'",
-+                              utils.config_get_safely, config, 'fedpkg.pagure', 'token')
- 
- 
- @patch('requests.get')
--- 
-2.21.1
-

diff --git a/0011-Fix-unittest-for-bodhi-based-on-its-version.patch b/0011-Fix-unittest-for-bodhi-based-on-its-version.patch
deleted file mode 100644
index 3c36e82..0000000
--- a/0011-Fix-unittest-for-bodhi-based-on-its-version.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e33087c78c20aa46768328181973bfcf6a5c8d4e Mon Sep 17 00:00:00 2001
-From: Ondrej Nosek <onosek@redhat.com>
-Date: Mon, 18 May 2020 14:17:19 +0200
-Subject: [PATCH] Fix unittest for bodhi based on its version
-
-Signed-off-by: Ondrej Nosek <onosek@redhat.com>
----
- test/test_cli.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/test/test_cli.py b/test/test_cli.py
-index 0376ded..1258810 100644
---- a/test/test_cli.py
-+++ b/test/test_cli.py
-@@ -128,6 +128,16 @@ class TestUpdate(CliTestCase):
-         with io.open(clog_file, 'w', encoding='utf-8') as f:
-             f.write(os.linesep.join(self.fake_clog))
- 
-+        # Get 'bodhi_client' version. Particular versions have differences
-+        # across distributions.
-+        self.bodhi_version = None
-+        try:
-+            version_object = pkg_resources.get_distribution('bodhi_client')
-+            if version_object.has_version():
-+                self.bodhi_version = int(version_object.version.split('.')[0])
-+        except pkg_resources.DistributionNotFound:
-+            pass
-+
-     def tearDown(self):
-         if os.path.exists('bodhi.template'):
-             os.unlink('bodhi.template')
-@@ -195,6 +205,8 @@ class TestUpdate(CliTestCase):
-             expected_data['notes'] = notes
-         else:
-             expected_data['notes'] = self.fake_clog[0]
-+        if self.bodhi_version <= 4:
-+            del expected_data["display_name"]
- 
-         with patch('os.unlink') as unlink:
-             cli.update()
--- 
-2.21.3
-

diff --git a/fedpkg.spec b/fedpkg.spec
index b60c7d8..32b1a3e 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -4,8 +4,8 @@
 %endif
 
 Name:           fedpkg
-Version:        1.38
-Release:        6%{?dist}
+Version:        1.39
+Release:        1%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -13,12 +13,7 @@ URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 
 BuildArch:      noarch
-Patch1:         0006-display_name-added-to-bodhi.template.patch
-Patch2:         0007-Move-rpm-dependency-for-test-environment-only.patch
-Patch3:         0008-Repair-test-of-retire-command-after-rpkg-update.patch
-Patch4:         0009-Body-changes-for-requesting-new-test-repo.patch
-Patch5:         0010-Check-missing-config-options-more-reliably.patch
-Patch6:         0011-Fix-unittest-for-bodhi-based-on-its-version.patch
+Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
 
 # fedpkg command switched to python3 on Fedora 29 and RHEL > 7:
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -41,7 +36,7 @@ Requires:       redhat-rpm-config
 
 BuildRequires:  python2-devel
 # We br these things for man page generation due to imports
-BuildRequires:  python2-rpkg >= 1.60-1
+BuildRequires:  python2-rpkg >= 1.60-3
 BuildRequires:  python2-distro
 # This until fedora-cert gets fixed
 BuildRequires:  python2-fedora
@@ -74,7 +69,7 @@ BuildRequires:  python2-bugzilla
 Requires:       python2-bugzilla
 %endif
 
-Requires:       python2-rpkg >= 1.60-1
+Requires:       python2-rpkg >= 1.60-3
 Requires:       python2-distro
 Requires:       python2-fedora
 Requires:       python2-openidc-client >= 0.6.0
@@ -85,7 +80,7 @@ Requires:       python2-openidc-client >= 0.6.0
 %global __python %{__python3}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-rpkg >= 1.60-1
+BuildRequires:  python3-rpkg >= 1.60-3
 BuildRequires:  python3-distro
 # This until fedora-cert gets fixed
 BuildRequires:  python3-fedora
@@ -99,7 +94,7 @@ BuildRequires:  python3-bodhi-client
 
 
 Requires:       python3-bugzilla
-Requires:       python3-rpkg >= 1.60-1
+Requires:       python3-rpkg >= 1.60-3
 Requires:       python3-distro
 Requires:       python3-fedora
 Requires:       python3-openidc-client >= 0.6.0
@@ -169,6 +164,27 @@ nosetests
 
 
 %changelog
+* Wed Sep 09 2020 Ondřej Nosek <onosek@redhat.com> - 1.38-1
+- Pytest replaces nosetests (onosek)
+- More specific regex to detect bugs in changelog (onosek)
+- Print response data from Pagure for debugging (onosek)
+- fedpkg fork checks if the fork already exists (onosek)
+- Fix unittest for bodhi based on its version (onosek)
+- display_name added to bodhi.template (onosek)
+- Remove unncecessary test (onosek)
+- Correct flake8 complaints to pass unittests (onosek)
+- fedpkg fork adds correct remote URL (onosek)
+- Disable test method's docstring in nosetests list (onosek)
+- Allow retirement on epel branches - tests (onosek)
+- Allow retirement on epel branches (mboddu)
+- Updated supported plaforms in documentation (onosek)
+- Check missing config options more reliably - 1813338 (onosek)
+- Body changes for requesting new test repo (onosek)
+- Repair test of "retire" command after rpkg update (onosek)
+- Move rpm dependency for test environment only (onosek)
+- Run newer version of sphinx-build tool (onosek)
+- Remove deprecated clone_config (onosek)
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.38-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

diff --git a/sources b/sources
index d78c737..2a81bf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedpkg-1.38.tar.bz2) = 07b6cd28dc4a44cca5b16b1b2016175f61a617cbba5677a41ba2c50fa8d7c86199d60a3092b3566a9bf4dda3313cf367fcda58fe0db7ff1a2867210df8ab35d3
+SHA512 (fedpkg-1.39.tar.bz2) = 5c02e9d3bdad055dd54e6058e160b97f29239b6a5ce0d9afb6f4675c460a474c04e0d3ae8b72507c0ec2d6578ecb6598dcadfaed092842e9cfa2ca069db1c35a