diff --git a/.gitignore b/.gitignore index aaf7493..0b20e92 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /keystoneauth1-3.4.0.tar.gz /keystoneauth1-3.13.1.tar.gz /keystoneauth1-3.17.1.tar.gz +/keystoneauth1-3.17.2.tar.gz diff --git a/0001-Replace-assertItemsEqual-with-assertCountEqual.patch b/0001-Replace-assertItemsEqual-with-assertCountEqual.patch new file mode 100644 index 0000000..874a2e0 --- /dev/null +++ b/0001-Replace-assertItemsEqual-with-assertCountEqual.patch @@ -0,0 +1,46 @@ +From 58a2caea5dcbbba0173bec07e7dedc419e04a011 Mon Sep 17 00:00:00 2001 +From: Javier Pena +Date: Mon, 4 May 2020 15:21:16 +0200 +Subject: [PATCH] Replace assertItemsEqual with assertCountEqual + +assertItemsEqual was removed from Python's unittest.TestCase in +Python 3.3 [1][2]. We have been able to use them since then, because +testtools required unittest2, which still included it. With testtools +removing Python 2.7 support [3][4], we will lose support for +assertItemsEqual, so we should switch to use assertCountEqual. + +[1] - https://bugs.python.org/issue17866 +[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd +[3] - https://github.com/testing-cabal/testtools/issues/286 +[4] - https://github.com/testing-cabal/testtools/pull/277 +--- + .../tests/unit/extras/kerberos/test_fedkerb_loading.py | 2 +- + .../tests/unit/extras/kerberos/test_kerberos_loading.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py b/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py +index 85e4c19..1705658 100644 +--- a/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py ++++ b/keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py +@@ -35,7 +35,7 @@ class FedKerbLoadingTests(test_utils.TestCase): + 'mutual-auth', + ] + +- self.assertItemsEqual(allowed_opts, opts) ++ self.assertCountEqual(allowed_opts, opts) + + def create(self, **kwargs): + loader = loading.get_plugin_loader('v3fedkerb') +diff --git a/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py b/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py +index ec87468..f228834 100644 +--- a/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py ++++ b/keystoneauth1/tests/unit/extras/kerberos/test_kerberos_loading.py +@@ -32,4 +32,4 @@ class KerberosLoadingTests(test_utils.TestCase): + 'mutual-auth', + ] + +- self.assertItemsEqual(allowed_opts, opts) ++ self.assertCountEqual(allowed_opts, opts) +-- +2.25.2 + diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec index 513a337..5034428 100644 --- a/python-keystoneauth1.spec +++ b/python-keystoneauth1.spec @@ -22,13 +22,13 @@ new clients. %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: python-%{pypi_name} -Version: 3.17.1 -Release: 3%{?dist} +Version: 3.17.2 +Release: 1%{?dist} Summary: Authentication Library for OpenStack Clients License: ASL 2.0 URL: https://pypi.io/pypi/%{pypi_name} Source0: https://tarballs.openstack.org/keystoneauth/keystoneauth1-%{upstream_version}.tar.gz - +Patch0001: 0001-Replace-assertItemsEqual-with-assertCountEqual.patch BuildArch: noarch %description @@ -96,7 +96,7 @@ Documentation for OpenStack Identity Authentication Library %prep -%autosetup -n %{pypi_name}-%{upstream_version} -S git +%autosetup -p1 -n %{pypi_name}-%{upstream_version} -S git sed -i '/sphinx.ext.intersphinx.*$/d' doc/source/conf.py @@ -139,6 +139,9 @@ PYTHON=python%{pyver} stestr-%{pyver} run %endif %changelog +* Mon May 04 2020 Javier Peña - 3.17.2-1 +- Update to upstream version 3.17.2 (bz#1830974) + * Thu Jan 30 2020 Fedora Release Engineering - 3.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d0e43b9..7961e67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keystoneauth1-3.17.1.tar.gz) = ca2f5a46450ed9a772bfbf882ab23ac4f251b2209ad038190fca41af0626616ae4f607ae03fb837b1e7bd87c2c239dfae64bc122ffc8db551451d95353743016 +SHA512 (keystoneauth1-3.17.2.tar.gz) = 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a