Hello community,
here is the log from the commit of package python-muranoclient for
openSUSE:Factory checked in at 2018-09-07 15:38:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-muranoclient (Old)
and /work/SRC/openSUSE:Factory/.python-muranoclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-muranoclient"
Fri Sep 7 15:38:00 2018 rev:6 rq:633082 version:1.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-muranoclient/python-muranoclient.changes
2018-03-19 23:34:58.984701978 +0100
+++
/work/SRC/openSUSE:Factory/.python-muranoclient.new/python-muranoclient.changes
2018-09-07 15:38:00.990625522 +0200
@@ -1,0 +2,18 @@
+Mon Sep 3 17:30:06 UTC 2018 - [email protected]
+
+- update to version 1.1.1
+ - Switch to stestr
+ - fix tox python3 overrides
+ - Add os-testr to test-requirements.txt
+ - Update reno for stable/queens
+ - Add release note link in README
+ - Fix incompatible requirement
+ - Trivial: Update pypi url to new url
+ - Ignore default values for deprecated security parameters
+ - Imported Translations from Zanata
+ - Follow the new PTI for document build
+ - Trivial: update url to new url
+ - Updated from global requirements
+ - add lower-constraints job
+
+-------------------------------------------------------------------
Old:
----
python-muranoclient-1.0.1.tar.gz
New:
----
python-muranoclient-1.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-muranoclient.spec ++++++
--- /var/tmp/diff_new_pack.KBhxx5/_old 2018-09-07 15:38:01.554624916 +0200
+++ /var/tmp/diff_new_pack.KBhxx5/_new 2018-09-07 15:38:01.562624907 +0200
@@ -17,36 +17,36 @@
Name: python-muranoclient
-Version: 1.0.1
+Version: 1.1.1
Release: 0
Summary: Python API and CLI for OpenStack Murano
License: Apache-2.0
Group: Development/Languages/Python
-Url: http://launchpad.net/%{name}
+URL: https://launchpad.net/%{name}
Source0:
https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
BuildRequires: openstack-macros
-BuildRequires: python-PrettyTable >= 0.7.1
+BuildRequires: python-PrettyTable >= 0.7.2
BuildRequires: python-devel
-BuildRequires: python-fixtures >= 3.0.0
+BuildRequires: python-fixtures
BuildRequires: python-glanceclient >= 2.8.0
BuildRequires: python-keystoneclient >= 3.8.0
-BuildRequires: python-mock >= 2.0.0
+BuildRequires: python-mock
BuildRequires: python-murano-pkg-check >= 0.3.0
BuildRequires: python-osc-lib >= 1.8.0
BuildRequires: python-oslo.log >= 3.36.0
BuildRequires: python-oslo.serialization >= 2.18.0
BuildRequires: python-oslo.utils >= 3.33.0
BuildRequires: python-pbr >= 2.0.0
-BuildRequires: python-pyOpenSSL >= 16.2.0
-BuildRequires: python-requests-mock >= 1.1.0
-BuildRequires: python-setuptools >= 16.0
-BuildRequires: python-testrepository >= 0.0.18
-BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 2.2.0
+BuildRequires: python-pyOpenSSL >= 17.1.0
+BuildRequires: python-requests-mock
+BuildRequires: python-setuptools
+BuildRequires: python-stestr
+BuildRequires: python-testscenarios
+BuildRequires: python-testtools
BuildRequires: python-yaql >= 1.1.3
Requires: python-Babel >= 2.3.4
-Requires: python-PrettyTable >= 0.7.1
-Requires: python-PyYAML >= 3.10
+Requires: python-PrettyTable >= 0.7.2
+Requires: python-PyYAML >= 3.12
Requires: python-glanceclient >= 2.8.0
Requires: python-iso8601 >= 0.1.11
Requires: python-keystoneclient >= 3.8.0
@@ -57,7 +57,7 @@
Requires: python-oslo.serialization >= 2.18.0
Requires: python-oslo.utils >= 3.33.0
Requires: python-pbr >= 2.0.0
-Requires: python-pyOpenSSL >= 16.2.0
+Requires: python-pyOpenSSL >= 17.1.0
Requires: python-requests >= 2.14.2
Requires: python-six >= 1.10.0
Requires: python-yaql >= 1.1.3
@@ -71,8 +71,8 @@
Summary: Documentation for OpenStack Magnum API client libary
Group: Documentation/HTML
BuildRequires: python-Sphinx
-BuildRequires: python-openstackdocstheme >= 1.18.1
-BuildRequires: python-reno >= 2.5.0
+BuildRequires: python-openstackdocstheme
+BuildRequires: python-reno
%description doc
Client library for Murano built on the Murano API. It provides a Python API
@@ -88,14 +88,13 @@
%py2_build
# Build HTML docs and man page
-%{__python2} setup.py build_sphinx
-rm -rf html/.{doctrees,buildinfo}
+PBR_VERSION=%version sphinx-build -b html doc/source doc/build/html
%install
%py2_install
%check
-%{__python2} setup.py testr
+stestr run
%files
%doc README.rst
++++++ _service ++++++
--- /var/tmp/diff_new_pack.KBhxx5/_old 2018-09-07 15:38:01.594624873 +0200
+++ /var/tmp/diff_new_pack.KBhxx5/_new 2018-09-07 15:38:01.594624873 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/openstack/python-muranoclient/python-muranoclient.spec.j2</param>
+ <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/python-muranoclient/python-muranoclient.spec.j2</param>
<param name="output-name">python-muranoclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/queens/requirements.txt</param>
+ <param
name="requirements">https://raw.githubusercontent.com/openstack/python-muranoclient/stable/rocky/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,python-muranoclient</param>
</service>
++++++ python-muranoclient-1.0.1.tar.gz -> python-muranoclient-1.1.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/.stestr.conf
new/python-muranoclient-1.1.1/.stestr.conf
--- old/python-muranoclient-1.0.1/.stestr.conf 1970-01-01 01:00:00.000000000
+0100
+++ new/python-muranoclient-1.1.1/.stestr.conf 2018-07-25 18:02:07.000000000
+0200
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./muranoclient/tests/unit}
+top_dir=./
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/.testr.conf
new/python-muranoclient-1.1.1/.testr.conf
--- old/python-muranoclient-1.0.1/.testr.conf 2018-01-22 18:20:08.000000000
+0100
+++ new/python-muranoclient-1.1.1/.testr.conf 1970-01-01 01:00:00.000000000
+0100
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
- ${PYTHON:-python} -m subunit.run discover -t ./
${OS_TEST_PATH:-./muranoclient/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/.zuul.yaml
new/python-muranoclient-1.1.1/.zuul.yaml
--- old/python-muranoclient-1.0.1/.zuul.yaml 1970-01-01 01:00:00.000000000
+0100
+++ new/python-muranoclient-1.1.1/.zuul.yaml 2018-07-25 18:02:07.000000000
+0200
@@ -0,0 +1,7 @@
+- project:
+ check:
+ jobs:
+ - openstack-tox-lower-constraints
+ gate:
+ jobs:
+ - openstack-tox-lower-constraints
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/AUTHORS
new/python-muranoclient-1.1.1/AUTHORS
--- old/python-muranoclient-1.0.1/AUTHORS 2018-01-22 18:23:30.000000000
+0100
+++ new/python-muranoclient-1.1.1/AUTHORS 2018-07-25 18:06:23.000000000
+0200
@@ -19,6 +19,7 @@
Doug Hellmann <[email protected]>
Ekaterina Chernova <[email protected]>
Ekaterina Fedorova <[email protected]>
+Ellen Batbouta <[email protected]>
Felipe Monteiro <[email protected]>
Feng Shengqin <[email protected]>
Filip Blaha <[email protected]>
@@ -49,6 +50,7 @@
MStolyarenko <[email protected]>
Maria Zlatkova <[email protected]>
Nam Nguyen Hoai <[email protected]>
+Nguyen Hai <[email protected]>
Nikolay Mahotkin <[email protected]>
Nikolay Starodubtsev <[email protected]>
OlehBaran <[email protected]>
@@ -81,8 +83,11 @@
Timur Nurlygayanov <[email protected]>
Timur Sufiev <[email protected]>
TimurNurlygayanov <[email protected]>
+Tovin Seven <[email protected]>
Valerii Kovalchuk <[email protected]>
Victor Ryzhenkin <[email protected]>
+Vu Cong Tuan <[email protected]>
+XiaojueGuan <[email protected]>
Yosef Hoffman <[email protected]>
Zuul <[email protected]>
bhagyashris <[email protected]>
@@ -99,6 +104,7 @@
liyingjun <[email protected]>
liyingjun <[email protected]>
luqitao <[email protected]>
+malei <[email protected]>
melissaml <[email protected]>
pawnesh.kumar <[email protected]>
ricolin <[email protected]>
@@ -107,6 +113,7 @@
sslypushenko <[email protected]>
venkatamahesh <[email protected]>
visitor <[email protected]>
+wu.chunyang <[email protected]>
xiangxinyong <[email protected]>
yuyafei <[email protected]>
zhangyanxian <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/ChangeLog
new/python-muranoclient-1.1.1/ChangeLog
--- old/python-muranoclient-1.0.1/ChangeLog 2018-01-22 18:23:30.000000000
+0100
+++ new/python-muranoclient-1.1.1/ChangeLog 2018-07-25 18:06:23.000000000
+0200
@@ -1,6 +1,32 @@
CHANGES
=======
+1.1.1
+-----
+
+* Switch to stestr
+* Add release note link in README
+
+1.1.0
+-----
+
+* fix tox python3 overrides
+* Trivial: update url to new url
+* Ignore default values for deprecated security parameters
+* Trivial: Update pypi url to new url
+* Follow the new PTI for document build
+* Fix incompatible requirement
+* Updated from global requirements
+* add lower-constraints job
+* Updated from global requirements
+* Updated from global requirements
+* Imported Translations from Zanata
+* Add os-testr to test-requirements.txt
+* Updated from global requirements
+* Imported Translations from Zanata
+* Updated from global requirements
+* Update reno for stable/queens
+
1.0.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/PKG-INFO
new/python-muranoclient-1.1.1/PKG-INFO
--- old/python-muranoclient-1.0.1/PKG-INFO 2018-01-22 18:23:32.000000000
+0100
+++ new/python-muranoclient-1.1.1/PKG-INFO 2018-07-25 18:06:24.000000000
+0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.1
Name: python-muranoclient
-Version: 1.0.1
+Version: 1.1.1
Summary: python-muranoclient
-Home-page: https://docs.openstack.org/murano/latest/
+Home-page: https://docs.openstack.org/python-muranoclient/latest/
Author: OpenStack
Author-email: [email protected]
License: Apache License, Version 2.0
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
@@ -20,11 +19,11 @@
======
.. image:: https://img.shields.io/pypi/v/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Downloads
Murano Project introduces an application catalog, which allows
application
@@ -42,13 +41,14 @@
* `Specs`_
* `How to Contribute`_
- .. _PyPi: https://pypi.python.org/pypi/python-muranoclient
+ .. _PyPi: https://pypi.org/project/python-muranoclient
.. _Launchpad project: https://launchpad.net/python-muranoclient
.. _Blueprints: https://blueprints.launchpad.net/python-muranoclient
.. _Bugs: https://bugs.launchpad.net/python-muranoclient
.. _Source:
https://git.openstack.org/cgit/openstack/python-muranoclient
.. _How to Contribute:
https://docs.openstack.org/infra/manual/developers.html
.. _Specs: https://specs.openstack.org/openstack/murano-specs/
+ .. _Release Notes:
https://docs.openstack.org/releasenotes/python-muranoclient
Python Muranoclient
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/README.rst
new/python-muranoclient-1.1.1/README.rst
--- old/python-muranoclient-1.0.1/README.rst 2018-01-22 18:20:08.000000000
+0100
+++ new/python-muranoclient-1.1.1/README.rst 2018-07-25 18:02:07.000000000
+0200
@@ -11,11 +11,11 @@
======
.. image:: https://img.shields.io/pypi/v/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Downloads
Murano Project introduces an application catalog, which allows application
@@ -33,13 +33,14 @@
* `Specs`_
* `How to Contribute`_
-.. _PyPi: https://pypi.python.org/pypi/python-muranoclient
+.. _PyPi: https://pypi.org/project/python-muranoclient
.. _Launchpad project: https://launchpad.net/python-muranoclient
.. _Blueprints: https://blueprints.launchpad.net/python-muranoclient
.. _Bugs: https://bugs.launchpad.net/python-muranoclient
.. _Source: https://git.openstack.org/cgit/openstack/python-muranoclient
.. _How to Contribute: https://docs.openstack.org/infra/manual/developers.html
.. _Specs: https://specs.openstack.org/openstack/murano-specs/
+.. _Release Notes: https://docs.openstack.org/releasenotes/python-muranoclient
Python Muranoclient
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/doc/requirements.txt
new/python-muranoclient-1.1.1/doc/requirements.txt
--- old/python-muranoclient-1.0.1/doc/requirements.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/python-muranoclient-1.1.1/doc/requirements.txt 2018-07-25
18:02:07.000000000 +0200
@@ -0,0 +1,6 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/lower-constraints.txt
new/python-muranoclient-1.1.1/lower-constraints.txt
--- old/python-muranoclient-1.0.1/lower-constraints.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/python-muranoclient-1.1.1/lower-constraints.txt 2018-07-25
18:02:07.000000000 +0200
@@ -0,0 +1,98 @@
+alabaster==0.7.10
+appdirs==1.3.0
+asn1crypto==0.23.0
+Babel==2.3.4
+cffi==1.7.0
+cliff==2.8.0
+cmd2==0.8.0
+coverage==4.0
+cryptography==2.1
+debtcollector==1.2.0
+decorator==3.4.0
+deprecation==1.0
+docutils==0.11
+dogpile.cache==0.6.2
+dulwich==0.15.0
+extras==1.0.0
+fasteners==0.7.0
+fixtures==3.0.0
+flake8==2.5.5
+future==0.16.0
+hacking==0.12.0
+idna==2.6
+imagesize==0.7.1
+iso8601==0.1.11
+Jinja2==2.10
+jmespath==0.9.0
+jsonpatch==1.16
+jsonpointer==1.13
+jsonschema==2.6.0
+keystoneauth1==3.4.0
+linecache2==1.0.0
+MarkupSafe==1.0
+mccabe==0.2.1
+mock==2.0.0
+monotonic==0.6
+mox3==0.20.0
+msgpack-python==0.4.0
+munch==2.1.0
+murano-pkg-check==0.3.0
+netaddr==0.7.18
+netifaces==0.10.4
+openstackdocstheme==1.18.1
+openstacksdk==0.11.2
+os-client-config==1.28.0
+os-service-types==1.2.0
+os-testr==1.0.0
+osc-lib==1.8.0
+oslo.concurrency==3.25.0
+oslo.config==5.2.0
+oslo.context==2.19.2
+oslo.i18n==3.15.3
+oslo.log==3.36.0
+oslo.serialization==2.18.0
+oslo.utils==3.33.0
+oslotest==3.2.0
+paramiko==2.0.0
+pbr==2.0.0
+pep8==1.5.7
+ply==3.10
+positional==1.2.1
+prettytable==0.7.2
+pyasn1==0.1.8
+pycparser==2.18
+pyflakes==0.8.1
+Pygments==2.2.0
+pyinotify==0.9.6
+pyOpenSSL==17.1.0
+pyparsing==2.1.0
+pyperclip==1.5.27
+python-dateutil==2.5.3
+python-glanceclient==2.8.0
+python-keystoneclient==3.8.0
+python-mimeparse==1.6.0
+python-subunit==1.0.0
+pytz==2013.6
+PyYAML==3.12
+reno==2.5.0
+requests==2.14.2
+requests-mock==1.1.0
+requestsexceptions==1.2.0
+rfc3986==0.3.1
+semantic-version==2.3.1
+simplejson==3.5.1
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.6.5
+sphinxcontrib-websupport==1.0.1
+stevedore==1.20.0
+tempest==17.1.0
+stestr==2.0.0
+testscenarios==0.4
+testtools==2.2.0
+traceback2==1.4.0
+unittest2==1.1.0
+urllib3==1.21.1
+warlock==1.2.0
+wrapt==1.7.0
+yaql==1.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/muranoclient/locale/en_GB/LC_MESSAGES/muranoclient.po
new/python-muranoclient-1.1.1/muranoclient/locale/en_GB/LC_MESSAGES/muranoclient.po
---
old/python-muranoclient-1.0.1/muranoclient/locale/en_GB/LC_MESSAGES/muranoclient.po
2018-01-22 18:20:08.000000000 +0100
+++
new/python-muranoclient-1.1.1/muranoclient/locale/en_GB/LC_MESSAGES/muranoclient.po
2018-07-25 18:02:07.000000000 +0200
@@ -1,17 +1,17 @@
# Andi Chandler <[email protected]>, 2017. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: python-muranoclient 0.14.1.dev18\n"
+"Project-Id-Version: python-muranoclient VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n";
-"POT-Creation-Date: 2017-10-05 02:06+0000\n"
+"POT-Creation-Date: 2018-01-30 01:30+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2017-10-21 09:07+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
-"Language: en-GB\n"
-"X-Generator: Zanata 3.9.6\n"
+"Language: en_GB\n"
+"X-Generator: Zanata 4.3.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#, python-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/muranoclient/shell.py
new/python-muranoclient-1.1.1/muranoclient/shell.py
--- old/python-muranoclient-1.0.1/muranoclient/shell.py 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/muranoclient/shell.py 2018-07-25
18:02:07.000000000 +0200
@@ -29,7 +29,6 @@
from keystoneclient import session as ksession
from oslo_log import handlers
from oslo_log import log as logging
-from oslo_log import versionutils
from oslo_utils import encodeutils
from oslo_utils import importutils
import six
@@ -68,7 +67,7 @@
identity.Password.register_argparse_arguments(parser)
- def get_base_parser(self):
+ def get_base_parser(self, argv):
parser = argparse.ArgumentParser(
prog='murano',
@@ -98,20 +97,6 @@
default=False, action="store_true",
help="Print more verbose output.")
- # os-cert, os-key, insecure, ca-file are all added
- # by keystone session register_cli_opts later
- parser.add_argument('--cert-file',
- dest='os_cert',
- help='DEPRECATED! Use --os-cert.')
-
- parser.add_argument('--key-file',
- dest='os_key',
- help='DEPRECATED! Use --os-key.')
-
- parser.add_argument('--ca-file',
- dest='os_cacert',
- help='DEPRECATED! Use --os-cacert.')
-
parser.add_argument('--api-timeout',
help='Number of seconds to wait for an '
'API response, '
@@ -186,12 +171,31 @@
'Defaults to env[MURANO_PACKAGES_SERVICE] or '
'to "murano"')
+ # The following 3 arguments are deprecated and are all added
+ # by keystone session register_cli_opts later. Only add these
+ # arguments if they are present on the command line.
+
+ if '--cert-file' in argv:
+ parser.add_argument('--cert-file',
+ dest='os_cert',
+ help='DEPRECATED! Use --os-cert.')
+
+ if '--key-file' in argv:
+ parser.add_argument('--key-file',
+ dest='os_key',
+ help='DEPRECATED! Use --os-key.')
+
+ if '--ca-file' in argv:
+ parser.add_argument('--ca-file',
+ dest='os_cacert',
+ help='DEPRECATED! Use --os-cacert.')
+
self._append_global_identity_args(parser)
return parser
- def get_subcommand_parser(self, version):
- parser = self.get_base_parser()
+ def get_subcommand_parser(self, version, argv):
+ parser = self.get_base_parser(argv)
self.subcommands = {}
subparsers = parser.add_subparsers(metavar='<subcommand>')
@@ -267,13 +271,13 @@
def main(self, argv):
# Parse args once to find version
- parser = self.get_base_parser()
+ parser = self.get_base_parser(argv)
(options, args) = parser.parse_known_args(argv)
self._setup_logging(options.debug)
# build available subcommands based on version
api_version = options.murano_api_version
- subcommand_parser = self.get_subcommand_parser(api_version)
+ subcommand_parser = self.get_subcommand_parser(api_version, argv)
self.parser = subcommand_parser
keystone_session = None
@@ -304,11 +308,6 @@
if args.murano_packages_service == 'glance':
args.murano_packages_service = 'glare'
- # TODO(kzaitsev): remove in P cycle
- versionutils.report_deprecated_feature(
- logger, "'glance' is no longer a valid option for "
- "--murano-packages-service, please use 'glare' "
- "instead.")
if args.os_no_client_auth:
if not args.murano_url:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/python_muranoclient.egg-info/PKG-INFO
new/python-muranoclient-1.1.1/python_muranoclient.egg-info/PKG-INFO
--- old/python-muranoclient-1.0.1/python_muranoclient.egg-info/PKG-INFO
2018-01-22 18:23:30.000000000 +0100
+++ new/python-muranoclient-1.1.1/python_muranoclient.egg-info/PKG-INFO
2018-07-25 18:06:23.000000000 +0200
@@ -1,12 +1,11 @@
Metadata-Version: 1.1
Name: python-muranoclient
-Version: 1.0.1
+Version: 1.1.1
Summary: python-muranoclient
-Home-page: https://docs.openstack.org/murano/latest/
+Home-page: https://docs.openstack.org/python-muranoclient/latest/
Author: OpenStack
Author-email: [email protected]
License: Apache License, Version 2.0
-Description-Content-Type: UNKNOWN
Description: ========================
Team and repository tags
========================
@@ -20,11 +19,11 @@
======
.. image:: https://img.shields.io/pypi/v/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Latest Version
.. image:: https://img.shields.io/pypi/dm/python-muranoclient.svg
- :target: https://pypi.python.org/pypi/python-muranoclient/
+ :target: https://pypi.org/project/python-muranoclient/
:alt: Downloads
Murano Project introduces an application catalog, which allows
application
@@ -42,13 +41,14 @@
* `Specs`_
* `How to Contribute`_
- .. _PyPi: https://pypi.python.org/pypi/python-muranoclient
+ .. _PyPi: https://pypi.org/project/python-muranoclient
.. _Launchpad project: https://launchpad.net/python-muranoclient
.. _Blueprints: https://blueprints.launchpad.net/python-muranoclient
.. _Bugs: https://bugs.launchpad.net/python-muranoclient
.. _Source:
https://git.openstack.org/cgit/openstack/python-muranoclient
.. _How to Contribute:
https://docs.openstack.org/infra/manual/developers.html
.. _Specs: https://specs.openstack.org/openstack/murano-specs/
+ .. _Release Notes:
https://docs.openstack.org/releasenotes/python-muranoclient
Python Muranoclient
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/python_muranoclient.egg-info/SOURCES.txt
new/python-muranoclient-1.1.1/python_muranoclient.egg-info/SOURCES.txt
--- old/python-muranoclient-1.0.1/python_muranoclient.egg-info/SOURCES.txt
2018-01-22 18:23:32.000000000 +0100
+++ new/python-muranoclient-1.1.1/python_muranoclient.egg-info/SOURCES.txt
2018-07-25 18:06:24.000000000 +0200
@@ -1,5 +1,6 @@
.coveragerc
-.testr.conf
+.stestr.conf
+.zuul.yaml
AUTHORS
CONTRIBUTING.rst
ChangeLog
@@ -7,6 +8,7 @@
LICENSE
README.rst
babel.cfg
+lower-constraints.txt
requirements.txt
run_tests.sh
setup-centos.sh
@@ -15,6 +17,7 @@
setup.sh
test-requirements.txt
tox.ini
+doc/requirements.txt
doc/source/conf.py
doc/source/index.rst
doc/source/cli/index.rst
@@ -163,6 +166,7 @@
releasenotes/source/newton.rst
releasenotes/source/ocata.rst
releasenotes/source/pike.rst
+releasenotes/source/queens.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
@@ -172,5 +176,4 @@
tools/install_venv.py
tools/install_venv_common.py
tools/murano.bash_completion
-tools/pretty_tox.sh
tools/with_venv.sh
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/python_muranoclient.egg-info/pbr.json
new/python-muranoclient-1.1.1/python_muranoclient.egg-info/pbr.json
--- old/python-muranoclient-1.0.1/python_muranoclient.egg-info/pbr.json
2018-01-22 18:23:30.000000000 +0100
+++ new/python-muranoclient-1.1.1/python_muranoclient.egg-info/pbr.json
2018-07-25 18:06:23.000000000 +0200
@@ -1 +1 @@
-{"git_version": "2944800", "is_release": true}
\ No newline at end of file
+{"git_version": "70b4392", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/python_muranoclient.egg-info/requires.txt
new/python-muranoclient-1.1.1/python_muranoclient.egg-info/requires.txt
--- old/python-muranoclient-1.0.1/python_muranoclient.egg-info/requires.txt
2018-01-22 18:23:30.000000000 +0100
+++ new/python-muranoclient-1.1.1/python_muranoclient.egg-info/requires.txt
2018-07-25 18:06:23.000000000 +0200
@@ -1,13 +1,13 @@
pbr!=2.1.0,>=2.0.0
-PrettyTable<0.8,>=0.7.1
+PrettyTable<0.8,>=0.7.2
python-glanceclient>=2.8.0
python-keystoneclient>=3.8.0
iso8601>=0.1.11
six>=1.10.0
Babel!=2.4.0,>=2.3.4
-pyOpenSSL>=16.2.0
+pyOpenSSL>=17.1.0
requests>=2.14.2
-PyYAML>=3.10
+PyYAML>=3.12
yaql>=1.1.3
osc-lib>=1.8.0
murano-pkg-check>=0.3.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/releasenotes/source/index.rst
new/python-muranoclient-1.1.1/releasenotes/source/index.rst
--- old/python-muranoclient-1.0.1/releasenotes/source/index.rst 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/releasenotes/source/index.rst 2018-07-25
18:02:07.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 2
unreleased
+ queens
pike
ocata
newton
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
new/python-muranoclient-1.1.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
---
old/python-muranoclient-1.0.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2018-01-22 18:20:08.000000000 +0100
+++
new/python-muranoclient-1.1.1/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2018-07-25 18:02:07.000000000 +0200
@@ -1,17 +1,18 @@
# Andi Chandler <[email protected]>, 2017. #zanata
+# Andi Chandler <[email protected]>, 2018. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: Murano Client Release Notes 0.14.1\n"
+"Project-Id-Version: Murano Client Release Notes\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-05 02:06+0000\n"
+"POT-Creation-Date: 2018-01-30 01:30+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-10-21 09:05+0000\n"
+"PO-Revision-Date: 2018-01-27 01:13+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
-"Language: en-GB\n"
-"X-Generator: Zanata 3.9.6\n"
+"Language: en_GB\n"
+"X-Generator: Zanata 4.3.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgid "0.10.0"
@@ -61,17 +62,6 @@
"Resources folder."
msgid ""
-"Added '--dep-exists-action' option to murano ``package-import`` and ``bundle-"
-"import`` commands. It allows to specify a different default action for "
-"existing main package and existing dependencies. In case of specifying just "
-"'--exists-action', action for dependencies also defaults to it."
-msgstr ""
-"Added '--dep-exists-action' option to Murano ``package-import`` and ``bundle-"
-"import`` commands. It allows to specify a different default action for "
-"existing main package and existing dependencies. In case of specifying just "
-"'--exists-action', action for dependencies also defaults to it."
-
-msgid ""
"Added '--dep-exists-action' option to murano command-line interface. It "
"allows to apply different default actions for existing main package and "
"existing dependencies. In case of specifying just '--exists-action', action "
@@ -83,15 +73,6 @@
"for dependencies equals to that like it was previously."
msgid ""
-"Added ability to use arguments ``--resources-dir`` and ``--template`` for "
-"``package-create`` command simultaneously. It allows to create HOT-packages "
-"with Resources folder."
-msgstr ""
-"Added ability to use arguments ``--resources-dir`` and ``--template`` for "
-"``package-create`` command simultaneously. It allows to create HOT-packages "
-"with Resources folder."
-
-msgid ""
"Added fallback from token to username/password if both are provided and "
"token expires or is invalid."
msgstr ""
@@ -207,15 +188,6 @@
"New Murano CLI command ``murano environment-model-show <ID> [--path <PATH>] "
"[--session-id <SESSION_ID>]``"
-msgid ""
-"New Murano CLI command ``murano static-action-call [--arguments [<KEY=VALUE> "
-"[<KEY=VALUE> ...]]] [--package-name <PACKAGE>] [--class-version "
-"CLASS_VERSION] <CLASS> <METHOD>``"
-msgstr ""
-"New Murano CLI command ``murano static-action-call [--arguments [<KEY=VALUE> "
-"[<KEY=VALUE> ...]]] [--package-name <PACKAGE>] [--class-version "
-"CLASS_VERSION] <CLASS> <METHOD>``"
-
msgid "New OSC command ``category create <name>``"
msgstr "New OSC command ``category create <name>``"
@@ -279,15 +251,6 @@
"New OSC command ``openstack environment model show <ID> [--path <PATH>] [--"
"session-id <SESSION_ID>]``"
-msgid ""
-"New OSC command ``openstack static-action call [--arguments [<KEY=VALUE> "
-"[<KEY=VALUE> ...]]] [--package-name <PACKAGE>] [--class-version "
-"CLASS_VERSION] <CLASS> <METHOD>``"
-msgstr ""
-"New OSC command ``openstack static-action call [--arguments [<KEY=VALUE> "
-"[<KEY=VALUE> ...]]] [--package-name <PACKAGE>] [--class-version "
-"CLASS_VERSION] <CLASS> <METHOD>``"
-
msgid "New OSC command ``package list``."
msgstr "New OSC command ``package list``."
@@ -314,6 +277,9 @@
msgid "Pike Series Release Notes"
msgstr "Pike Series Release Notes"
+msgid "Queens Series Release Notes"
+msgstr "Queens Series Release Notes"
+
msgid "Security Issues"
msgstr "Security Issues"
@@ -341,9 +307,6 @@
msgid "Support for environment model edit API was added"
msgstr "Support for environment model edit API was added"
-msgid "Support for static actions API was added"
-msgstr "Support for static actions API was added"
-
msgid ""
"Support for static actions API was added - New Murano CLI command ``murano "
"static-action-call [--arguments [<KEY=VALUE> [<KEY=VALUE> ...]]] [--package-"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-muranoclient-1.0.1/releasenotes/source/queens.rst
new/python-muranoclient-1.1.1/releasenotes/source/queens.rst
--- old/python-muranoclient-1.0.1/releasenotes/source/queens.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-muranoclient-1.1.1/releasenotes/source/queens.rst
2018-07-25 18:02:07.000000000 +0200
@@ -0,0 +1,6 @@
+===================================
+ Queens Series Release Notes
+===================================
+
+.. release-notes::
+ :branch: stable/queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/requirements.txt
new/python-muranoclient-1.1.1/requirements.txt
--- old/python-muranoclient-1.0.1/requirements.txt 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/requirements.txt 2018-07-25
18:02:07.000000000 +0200
@@ -2,15 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-PrettyTable<0.8,>=0.7.1 # BSD
+PrettyTable<0.8,>=0.7.2 # BSD
python-glanceclient>=2.8.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0
iso8601>=0.1.11 # MIT
six>=1.10.0 # MIT
Babel!=2.4.0,>=2.3.4 # BSD
-pyOpenSSL>=16.2.0 # Apache-2.0
+pyOpenSSL>=17.1.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
yaql>=1.1.3 # Apache 2.0 License
osc-lib>=1.8.0 # Apache-2.0
murano-pkg-check>=0.3.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/setup.cfg
new/python-muranoclient-1.1.1/setup.cfg
--- old/python-muranoclient-1.0.1/setup.cfg 2018-01-22 18:23:32.000000000
+0100
+++ new/python-muranoclient-1.1.1/setup.cfg 2018-07-25 18:06:24.000000000
+0200
@@ -6,7 +6,7 @@
license = Apache License, Version 2.0
author = OpenStack
author-email = [email protected]
-home-page = https://docs.openstack.org/murano/latest/
+home-page = https://docs.openstack.org/python-muranoclient/latest/
classifier =
Development Status :: 4 - Beta
Environment :: Console
@@ -42,11 +42,14 @@
environment_apps_edit =
muranoclient.osc.v1.environment:EnvironmentAppsEdit
environment_model_show =
muranoclient.osc.v1.environment:EnvironmentModelShow
environment_model_edit =
muranoclient.osc.v1.environment:EnvironmentModelEdit
+
category_list = muranoclient.osc.v1.category:ListCategories
category_show = muranoclient.osc.v1.category:ShowCategory
category_create = muranoclient.osc.v1.category:CreateCategory
category_delete = muranoclient.osc.v1.category:DeleteCategory
+
deployment_list = muranoclient.osc.v1.deployment:ListDeployment
+
package_create = muranoclient.osc.v1.package:CreatePackage
package_list = muranoclient.osc.v1.package:ListPackages
package_delete = muranoclient.osc.v1.package:DeletePackage
@@ -54,7 +57,9 @@
package_show = muranoclient.osc.v1.package:ShowPackage
package_update = muranoclient.osc.v1.package:UpdatePackage
package_download = muranoclient.osc.v1.package:DownloadPackage
+
bundle_import = muranoclient.osc.v1.package:ImportBundle
+
static-action_call = muranoclient.osc.v1.action:StaticActionCall
class-schema = muranoclient.osc.v1.schema:ShowSchema
@@ -67,15 +72,6 @@
tag_date = 0
tag_svn_revision = 0
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
[wheel]
universal = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/test-requirements.txt
new/python-muranoclient-1.1.1/test-requirements.txt
--- old/python-muranoclient-1.0.1/test-requirements.txt 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/test-requirements.txt 2018-07-25
18:02:07.000000000 +0200
@@ -8,12 +8,8 @@
mock>=2.0.0 # BSD
requests-mock>=1.1.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
oslotest>=3.2.0 # Apache-2.0
-
-# doc build requirements
-openstackdocstheme>=1.17.0 # Apache-2.0
-sphinx!=1.6.6,>=1.6.2 # BSD
-reno>=2.5.0 # Apache-2.0
+os-testr>=1.0.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/tools/cover.sh
new/python-muranoclient-1.1.1/tools/cover.sh
--- old/python-muranoclient-1.0.1/tools/cover.sh 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/tools/cover.sh 2018-07-25
18:02:07.000000000 +0200
@@ -28,7 +28,11 @@
git checkout HEAD^
baseline_report=$(mktemp -t muranoclient_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete && python setup.py testr --coverage
--testr-args="$*"
+find . -type f -name "*.pyc" -delete
+stestr run '{posargs}'
+coverage combine
+coverage html -d cover
+coverage xml -o cover/coverage.xml
coverage report > $baseline_report
baseline_missing=$(awk 'END { print $3 }' $baseline_report)
@@ -38,7 +42,11 @@
# Generate and save coverage report
current_report=$(mktemp -t muranoclient_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete && python setup.py testr --coverage
--testr-args="$*"
+find . -type f -name "*.pyc" -delete
+stestr run '{posargs}'
+coverage combine
+coverage html -d cover
+coverage xml -o cover/coverage.xml
coverage report > $current_report
current_missing=$(awk 'END { print $3 }' $current_report)
@@ -76,4 +84,4 @@
fi
rm $baseline_report $current_report
-exit $exit_code
\ No newline at end of file
+exit $exit_code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/tools/pretty_tox.sh
new/python-muranoclient-1.1.1/tools/pretty_tox.sh
--- old/python-muranoclient-1.0.1/tools/pretty_tox.sh 2018-01-22
18:20:08.000000000 +0100
+++ new/python-muranoclient-1.1.1/tools/pretty_tox.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-
-TESTRARGS=$1
-python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" |
subunit-trace -f
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-muranoclient-1.0.1/tox.ini
new/python-muranoclient-1.1.1/tox.ini
--- old/python-muranoclient-1.0.1/tox.ini 2018-01-22 18:20:08.000000000
+0100
+++ new/python-muranoclient-1.1.1/tox.ini 2018-07-25 18:02:07.000000000
+0200
@@ -1,5 +1,5 @@
[tox]
-envlist = py35,py27,pep8
+envlist = py35,py27,pep8,docs
minversion = 1.6
skipsdist = True
@@ -14,9 +14,10 @@
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = bash tools/pretty_tox.sh '{posargs}'
+commands = stestr run {posargs}
[testenv:pep8]
+basepython = python3
commands = flake8 {posargs}
[testenv:py27-mitaka]
@@ -24,6 +25,7 @@
{toxinidir}/tools/tox_install.sh
https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka
{opts} {packages}
[testenv:venv]
+basepython = python3
commands = {posargs}
[testenv:functional]
@@ -32,26 +34,51 @@
passenv = OS_* MURANO_PACKAGES_SERVICE
[testenv:uitests]
-commands = python setup.py testr --slowest --testr-args="--concurrency 1
{posargs}"
+basepython = python3
+commands = stestr run --slowest --concurrency 1 {posargs}
[testenv:cover]
+basepython = python3
commands = {toxinidir}/tools/cover.sh {posargs}
[testenv:debug]
+basepython = python3
commands =
find . -type f -name "*.pyc" -delete
oslo_debug_helper -t muranoclient/tests {posargs}
[testenv:pyflakes]
+basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
flake8
commands = flake8
+[testenv:docs]
+basepython = python3
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/doc/requirements.txt
+commands =
+ sphinx-build -W -b html doc/source doc/build/html
+
[testenv:releasenotes]
+basepython = python3
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
[flake8]
show-source = true
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build
+
+[testenv:lower-constraints]
+basepython = python3
+deps =
+ -c{toxinidir}/lower-constraints.txt
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
