Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-magnumclient for
openSUSE:Factory checked in at 2022-06-19 21:11:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-magnumclient (Old)
and /work/SRC/openSUSE:Factory/.python-magnumclient.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-magnumclient"
Sun Jun 19 21:11:36 2022 rev:13 rq:983720 version:3.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-magnumclient/python-magnumclient.changes
2021-05-10 15:39:38.661499342 +0200
+++
/work/SRC/openSUSE:Factory/.python-magnumclient.new.1548/python-magnumclient.changes
2022-06-19 21:11:54.414219202 +0200
@@ -1,0 +2,21 @@
+Sun Jun 19 17:28:25 UTC 2022 - [email protected]
+
+- added 0001-Fix-test_help_on_subcommand-on-Python-3.10.patch
+
+-------------------------------------------------------------------
+Sun Jun 19 12:25:16 UTC 2022 - [email protected]
+
+- update to version 3.6.0
+ - Update master for stable/victoria
+ - Update master for stable/wallaby
+ - Add Python3 wallaby unit tests
+ - Update master for stable/xena
+
+-------------------------------------------------------------------
+Tue Oct 26 21:46:17 UTC 2021 - [email protected]
+
+- update to version 3.5.0
+ - Fix failing to parse json error msg
+ - Fix master_lb_enabled for cluster creation
+
+-------------------------------------------------------------------
Old:
----
python-magnumclient-3.4.0.tar.gz
New:
----
0001-Fix-test_help_on_subcommand-on-Python-3.10.patch
python-magnumclient-3.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-magnumclient.spec ++++++
--- /var/tmp/diff_new_pack.1xthlj/_old 2022-06-19 21:11:54.842219839 +0200
+++ /var/tmp/diff_new_pack.1xthlj/_new 2022-06-19 21:11:54.850219851 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-magnumclient
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,21 @@
Name: python-magnumclient
-Version: 3.4.0
+Version: 3.6.0
Release: 0
Summary: Python API and CLI for OpenStack Magnum
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/python-magnumclient
-Source0:
https://files.pythonhosted.org/packages/source/p/python-magnumclient/python-magnumclient-3.4.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/python-magnumclient/python-magnumclient-3.6.0.tar.gz
+# Upstream Ibee09bf76399849f7da987c4661fa1945d27afb7
+Patch1: 0001-Fix-test_help_on_subcommand-on-Python-3.10.patch
BuildRequires: openstack-macros
BuildRequires: python3-PrettyTable >= 0.7.2
BuildRequires: python3-cryptography >= 3.0
BuildRequires: python3-decorator >= 3.4.0
BuildRequires: python3-fixtures
BuildRequires: python3-keystoneauth1 >= 3.4.0
-BuildRequires: python3-mock
BuildRequires: python3-openstackclient
BuildRequires: python3-os-client-config >= 1.28.0
BuildRequires: python3-osc-lib >= 1.8.0
@@ -52,7 +53,6 @@
%package -n python3-magnumclient
Summary: Python API and CLI for OpenStack Magnum
-Requires: python3-Babel >= 2.3.4
Requires: python3-PrettyTable >= 0.7.2
Requires: python3-cryptography >= 3.0
Requires: python3-decorator >= 3.4.0
@@ -65,7 +65,6 @@
Requires: python3-oslo.utils >= 3.33.0
Requires: python3-pbr >= 2.0.0
Requires: python3-requests >= 2.14.2
-Requires: python3-six
Requires: python3-stevedore >= 1.20.0
%if 0%{?suse_version}
Obsoletes: python2-magnumclient < 2.17.0
@@ -89,15 +88,15 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n python-magnumclient-3.4.0
+%autosetup -p1 -n python-magnumclient-3.6.0
%py_req_cleanup
%build
%{py3_build}
# Build HTML docs and man page
-PBR_VERSION=3.4.0 %sphinx_build -b html doc/source doc/build/html
-PBR_VERSION=3.4.0 %sphinx_build -b man doc/source doc/build/man
+PBR_VERSION=3.6.0 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=3.6.0 %sphinx_build -b man doc/source doc/build/man
rm -r doc/build/html/.{doctrees,buildinfo}
%install
++++++ 0001-Fix-test_help_on_subcommand-on-Python-3.10.patch ++++++
>From 972aff0f329caf3343038349ebe86b5d039ca6ab Mon Sep 17 00:00:00 2001
From: Felipe Reyes <[email protected]>
Date: Fri, 25 Mar 2022 09:46:20 -0300
Subject: [PATCH] Fix test_help_on_subcommand on Python 3.10
Python 3.10 changed the way the optional arguments defined in argparse
are listed in the help output, the title was changed from "Optional
arguments" to "Options".
This checks the python version where the unit test is being executed and
uses the string that corresponds.
Story: 2009946
Task: 44858
Change-Id: Ibee09bf76399849f7da987c4661fa1945d27afb7
---
magnumclient/tests/test_shell.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/magnumclient/tests/test_shell.py b/magnumclient/tests/test_shell.py
index c4b8b8d..fb1d209 100644
--- a/magnumclient/tests/test_shell.py
+++ b/magnumclient/tests/test_shell.py
@@ -119,9 +119,13 @@ class ShellTest(utils.TestCase):
def test_help_on_subcommand(self):
required = [
'.*?^usage: magnum bay-create',
- '.*?^Create a bay.',
- '.*?^Optional arguments:',
+ '.*?^Create a bay.'
]
+ # https://bugs.python.org/issue9694
+ if sys.version_info[:2] >= (3, 10):
+ required.append('.*?^Options:')
+ else:
+ required.append('.*?^Optional arguments:')
stdout, stderr = self.shell('help bay-create')
for r in required:
self.assertThat((stdout + stderr),
--
2.36.1
++++++ _service ++++++
--- /var/tmp/diff_new_pack.1xthlj/_old 2022-06-19 21:11:54.886219905 +0200
+++ /var/tmp/diff_new_pack.1xthlj/_new 2022-06-19 21:11:54.890219910 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/wallaby/openstack/python-magnumclient/python-magnumclient.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/master/openstack/python-magnumclient/python-magnumclient.spec.j2</param>
<param name="output-name">python-magnumclient.spec</param>
- <param
name="requirements">https://opendev.org/openstack/python-magnumclient/raw/branch/stable/wallaby/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/python-magnumclient/raw/branch/stable/xena/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-magnumclient</param>
</service>
++++++ python-magnumclient-3.4.0.tar.gz -> python-magnumclient-3.6.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-3.4.0/.zuul.yaml
new/python-magnumclient-3.6.0/.zuul.yaml
--- old/python-magnumclient-3.4.0/.zuul.yaml 2021-03-08 12:41:47.000000000
+0100
+++ new/python-magnumclient-3.6.0/.zuul.yaml 2022-02-25 17:02:17.000000000
+0100
@@ -2,7 +2,7 @@
templates:
- check-requirements
- openstack-cover-jobs
- - openstack-python3-victoria-jobs
+ - openstack-python3-wallaby-jobs
- publish-openstack-docs-pti
- build-release-notes-jobs-python3
check:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-3.4.0/ChangeLog
new/python-magnumclient-3.6.0/ChangeLog
--- old/python-magnumclient-3.4.0/ChangeLog 2021-03-08 12:42:21.000000000
+0100
+++ new/python-magnumclient-3.6.0/ChangeLog 2022-02-25 17:03:04.000000000
+0100
@@ -1,6 +1,20 @@
CHANGES
=======
+3.6.0
+-----
+
+* Add Python3 wallaby unit tests
+* Update master for stable/victoria
+* Update master for stable/xena
+
+3.5.0
+-----
+
+* Fix master\_lb\_enabled for cluster creation
+* Fix failing to parse json error msg
+* Update master for stable/wallaby
+
3.4.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-magnumclient-3.4.0/PKG-INFO
new/python-magnumclient-3.6.0/PKG-INFO
--- old/python-magnumclient-3.4.0/PKG-INFO 2021-03-08 12:42:21.906053500
+0100
+++ new/python-magnumclient-3.6.0/PKG-INFO 2022-02-25 17:03:04.813018800
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: python-magnumclient
-Version: 3.4.0
+Version: 3.6.0
Summary: Client library for Magnum API
Home-page: https://docs.openstack.org/python-magnumclient/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/magnumclient/common/httpclient.py
new/python-magnumclient-3.6.0/magnumclient/common/httpclient.py
--- old/python-magnumclient-3.4.0/magnumclient/common/httpclient.py
2021-03-08 12:41:47.000000000 +0100
+++ new/python-magnumclient-3.6.0/magnumclient/common/httpclient.py
2022-02-25 17:02:17.000000000 +0100
@@ -69,6 +69,9 @@
try:
body_json = resp.json()
return _extract_error_json_text(body_json)
+ except AttributeError:
+ body_json = jsonutils.loads(body)
+ return _extract_error_json_text(body_json)
except ValueError:
return {}
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/magnumclient/osc/v1/clusters.py
new/python-magnumclient-3.6.0/magnumclient/osc/v1/clusters.py
--- old/python-magnumclient-3.4.0/magnumclient/osc/v1/clusters.py
2021-03-08 12:41:47.000000000 +0100
+++ new/python-magnumclient-3.6.0/magnumclient/osc/v1/clusters.py
2022-02-25 17:02:17.000000000 +0100
@@ -159,10 +159,16 @@
parser.add_argument(
'--master-lb-enabled',
dest='master_lb_enabled',
- action='store_true',
- default=False,
- help=_('Indicates whether created clusters should have '
- 'a loadbalancer for API.'))
+ action='append_const',
+ default=[],
+ const=False,
+ help=_('Enable master LB creation on the new cluster'))
+ parser.add_argument(
+ '--master-lb-disabled',
+ dest='master_lb_enabled',
+ action='append_const',
+ const=False,
+ help=_('Disable master LB creation on the new cluster'))
return parser
@@ -215,6 +221,20 @@
if parsed_args.master_lb_enabled:
args["master_lb_enabled"] = parsed_args.master_lb_enabled
+ if len(parsed_args.master_lb_enabled) > 1:
+ raise exceptions.InvalidAttribute(
+ '--master-lb-enabled and '
+ '--master-lb-disabled are '
+ 'mutually exclusive and '
+ 'should be specified only once.')
+ elif len(parsed_args.master_lb_enabled) == 1:
+ args['master_lb_enabled'] = parsed_args.master_lb_enabled[0]
+ if (not args['master_lb_enabled'] and
+ parsed_args.master_count > 1):
+ raise exceptions.InvalidAttribute(
+ 'Master node count can only be one if master '
+ 'loadbalancer is disabled.')
+
cluster = mag_client.clusters.create(**args)
print("Request to create cluster %s accepted"
% cluster.uuid)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/magnumclient/tests/osc/unit/v1/test_clusters.py
new/python-magnumclient-3.6.0/magnumclient/tests/osc/unit/v1/test_clusters.py
---
old/python-magnumclient-3.4.0/magnumclient/tests/osc/unit/v1/test_clusters.py
2021-03-08 12:41:47.000000000 +0100
+++
new/python-magnumclient-3.6.0/magnumclient/tests/osc/unit/v1/test_clusters.py
2022-02-25 17:02:17.000000000 +0100
@@ -125,6 +125,25 @@
self.cmd.take_action(parsed_args)
self.clusters_mock.create.assert_called_with(**expected_args)
+ def test_cluster_create_with_lb_disabled(self):
+ """Verifies master lb disabled properly parsed."""
+
+ expected_args = self._default_args
+ expected_args['master_lb_enabled'] = False
+ arglist = [
+ '--cluster-template', self._cluster.cluster_template_id,
+ '--master-lb-disabled',
+ self._cluster.name
+ ]
+ verifylist = [
+ ('cluster_template', self._cluster.cluster_template_id),
+ ('master_lb_enabled', [False]),
+ ('name', self._cluster.name)
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+ self.cmd.take_action(parsed_args)
+ self.clusters_mock.create.assert_called_with(**expected_args)
+
class TestClusterDelete(TestCluster):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/python_magnumclient.egg-info/PKG-INFO
new/python-magnumclient-3.6.0/python_magnumclient.egg-info/PKG-INFO
--- old/python-magnumclient-3.4.0/python_magnumclient.egg-info/PKG-INFO
2021-03-08 12:42:21.000000000 +0100
+++ new/python-magnumclient-3.6.0/python_magnumclient.egg-info/PKG-INFO
2022-02-25 17:03:04.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: python-magnumclient
-Version: 3.4.0
+Version: 3.6.0
Summary: Client library for Magnum API
Home-page: https://docs.openstack.org/python-magnumclient/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/python_magnumclient.egg-info/SOURCES.txt
new/python-magnumclient-3.6.0/python_magnumclient.egg-info/SOURCES.txt
--- old/python-magnumclient-3.4.0/python_magnumclient.egg-info/SOURCES.txt
2021-03-08 12:42:21.000000000 +0100
+++ new/python-magnumclient-3.6.0/python_magnumclient.egg-info/SOURCES.txt
2022-02-25 17:03:04.000000000 +0100
@@ -128,4 +128,7 @@
releasenotes/source/train.rst
releasenotes/source/unreleased.rst
releasenotes/source/ussuri.rst
+releasenotes/source/victoria.rst
+releasenotes/source/wallaby.rst
+releasenotes/source/xena.rst
tools/magnum.bash_completion
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/python_magnumclient.egg-info/pbr.json
new/python-magnumclient-3.6.0/python_magnumclient.egg-info/pbr.json
--- old/python-magnumclient-3.4.0/python_magnumclient.egg-info/pbr.json
2021-03-08 12:42:21.000000000 +0100
+++ new/python-magnumclient-3.6.0/python_magnumclient.egg-info/pbr.json
2022-02-25 17:03:04.000000000 +0100
@@ -1 +1 @@
-{"git_version": "e2bcf6e", "is_release": true}
\ No newline at end of file
+{"git_version": "1f5edf4", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/releasenotes/source/index.rst
new/python-magnumclient-3.6.0/releasenotes/source/index.rst
--- old/python-magnumclient-3.4.0/releasenotes/source/index.rst 2021-03-08
12:41:47.000000000 +0100
+++ new/python-magnumclient-3.6.0/releasenotes/source/index.rst 2022-02-25
17:02:17.000000000 +0100
@@ -6,6 +6,9 @@
:maxdepth: 1
unreleased
+ xena
+ wallaby
+ victoria
ussuri
train
stein
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/releasenotes/source/victoria.rst
new/python-magnumclient-3.6.0/releasenotes/source/victoria.rst
--- old/python-magnumclient-3.4.0/releasenotes/source/victoria.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-magnumclient-3.6.0/releasenotes/source/victoria.rst
2022-02-25 17:02:17.000000000 +0100
@@ -0,0 +1,6 @@
+=============================
+Victoria Series Release Notes
+=============================
+
+.. release-notes::
+ :branch: stable/victoria
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/releasenotes/source/wallaby.rst
new/python-magnumclient-3.6.0/releasenotes/source/wallaby.rst
--- old/python-magnumclient-3.4.0/releasenotes/source/wallaby.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-magnumclient-3.6.0/releasenotes/source/wallaby.rst
2022-02-25 17:02:17.000000000 +0100
@@ -0,0 +1,6 @@
+============================
+Wallaby Series Release Notes
+============================
+
+.. release-notes::
+ :branch: stable/wallaby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-magnumclient-3.4.0/releasenotes/source/xena.rst
new/python-magnumclient-3.6.0/releasenotes/source/xena.rst
--- old/python-magnumclient-3.4.0/releasenotes/source/xena.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/python-magnumclient-3.6.0/releasenotes/source/xena.rst 2022-02-25
17:02:17.000000000 +0100
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+ :branch: stable/xena
