Hello community,
here is the log from the commit of package python-monascaclient for
openSUSE:Factory checked in at 2020-06-05 20:12:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-monascaclient (Old)
and /work/SRC/openSUSE:Factory/.python-monascaclient.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-monascaclient"
Fri Jun 5 20:12:04 2020 rev:12 rq:803573 version:2.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-monascaclient/python-monascaclient.changes
2020-03-24 22:33:14.277115525 +0100
+++
/work/SRC/openSUSE:Factory/.python-monascaclient.new.3606/python-monascaclient.changes
2020-06-05 20:14:39.954638598 +0200
@@ -1,0 +2,14 @@
+Tue May 12 09:56:53 UTC 2020 - cloud-de...@suse.de
+
+- update to version 2.1.0
+ - Cleanup py27 support
+ - Update master for stable/train
+ - Update hacking for Python3
+ - [ussuri][goal] Drop python 2.7 support and testing
+ - Update the constraints url
+ - Sync Sphinx requirement
+ - Don't hard code notification types into Monasca client
+ - Allow users to set periodic notifications on all notification types
+ - Switch to Ussuri jobs
+
+-------------------------------------------------------------------
Old:
----
python-monascaclient-1.16.0.tar.gz
New:
----
python-monascaclient-2.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-monascaclient.spec ++++++
--- /var/tmp/diff_new_pack.EIxasB/_old 2020-06-05 20:14:41.894645736 +0200
+++ /var/tmp/diff_new_pack.EIxasB/_new 2020-06-05 20:14:41.898645751 +0200
@@ -17,13 +17,13 @@
Name: python-monascaclient
-Version: 1.16.0
+Version: 2.1.0
Release: 0
Summary: Python API and CLI for OpenStack Monasca
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/python-monascaclient
-Source0:
https://files.pythonhosted.org/packages/source/p/python-monascaclient/python-monascaclient-1.16.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/p/python-monascaclient/python-monascaclient-2.1.0.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-PrettyTable >= 0.7.2
BuildRequires: python3-PyYAML >= 3.12
@@ -73,7 +73,7 @@
The Monasca Client was written using the OpenStack Heat Python client as a
framework.
%prep
-%autosetup -p1 -n python-monascaclient-1.16.0
+%autosetup -p1 -n python-monascaclient-2.1.0
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.EIxasB/_old 2020-06-05 20:14:41.926645854 +0200
+++ /var/tmp/diff_new_pack.EIxasB/_new 2020-06-05 20:14:41.926645854 +0200
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/python-monascaclient/python-monascaclient.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/python-monascaclient/python-monascaclient.spec.j2</param>
<param name="output-name">python-monascaclient.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/python-monascaclient/stable/train/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/python-monascaclient/raw/branch/stable/ussuri/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,python-monascaclient</param>
</service>
++++++ python-monascaclient-1.16.0.tar.gz -> python-monascaclient-2.1.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/.zuul.yaml
new/python-monascaclient-2.1.0/.zuul.yaml
--- old/python-monascaclient-1.16.0/.zuul.yaml 2019-09-13 18:07:46.000000000
+0200
+++ new/python-monascaclient-2.1.0/.zuul.yaml 2020-04-18 17:10:55.000000000
+0200
@@ -2,8 +2,7 @@
templates:
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- - openstack-python3-train-jobs
+ - openstack-python3-ussuri-jobs
- publish-openstack-docs-pti
- check-requirements
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/AUTHORS
new/python-monascaclient-2.1.0/AUTHORS
--- old/python-monascaclient-1.16.0/AUTHORS 2019-09-13 18:08:49.000000000
+0200
+++ new/python-monascaclient-2.1.0/AUTHORS 2020-04-18 17:11:33.000000000
+0200
@@ -77,10 +77,12 @@
henriquetruta <henri...@lsd.ufcg.edu.br>
howardlee <lihongwe...@inspur.com>
jacky06 <zhang....@99cloud.net>
+kangyufei <kan...@inspur.com>
kornicameister <kornicameis...@gmail.com>
lingyongxu <l...@fiberhome.com>
melissaml <ma....@99cloud.net>
oneilcin <oneil...@users.noreply.github.com>
+pengyuesheng <pengyuesh...@gohighsec.com>
qingszhao <zhao.daq...@99cloud.net>
rajat29 <rajat.sha...@nectechnologies.in>
ricolin <rico....@easystack.cn>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/ChangeLog
new/python-monascaclient-2.1.0/ChangeLog
--- old/python-monascaclient-1.16.0/ChangeLog 2019-09-13 18:08:49.000000000
+0200
+++ new/python-monascaclient-2.1.0/ChangeLog 2020-04-18 17:11:33.000000000
+0200
@@ -1,6 +1,23 @@
CHANGES
=======
+2.1.0
+-----
+
+* Cleanup py27 support
+* Update hacking for Python3
+* Don't hard code notification types into Monasca client
+* Allow users to set periodic notifications on all notification types
+
+2.0.0
+-----
+
+* [ussuri][goal] Drop python 2.7 support and testing
+* Switch to Ussuri jobs
+* Sync Sphinx requirement
+* Update the constraints url
+* Update master for stable/train
+
1.16.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/PKG-INFO
new/python-monascaclient-2.1.0/PKG-INFO
--- old/python-monascaclient-1.16.0/PKG-INFO 2019-09-13 18:08:49.000000000
+0200
+++ new/python-monascaclient-2.1.0/PKG-INFO 2020-04-18 17:11:34.000000000
+0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: python-monascaclient
-Version: 1.16.0
+Version: 2.1.0
Summary: Monasca API Client Library
Home-page: https://docs.openstack.org/python-monascaclient/latest/
Author: OpenStack
@@ -45,8 +45,9 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/doc/source/conf.py
new/python-monascaclient-2.1.0/doc/source/conf.py
--- old/python-monascaclient-1.16.0/doc/source/conf.py 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/doc/source/conf.py 2020-04-18
17:10:55.000000000 +0200
@@ -1,4 +1,14 @@
-# -*- coding: utf-8 -*-
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
import os
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/lower-constraints.txt
new/python-monascaclient-2.1.0/lower-constraints.txt
--- old/python-monascaclient-1.16.0/lower-constraints.txt 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/lower-constraints.txt 2020-04-18
17:10:55.000000000 +0200
@@ -15,11 +15,9 @@
dulwich==0.15.0
extras==1.0.0
fixtures==3.0.0
-flake8==2.5.5
future==0.16.0
gitdb==0.6.4
GitPython==1.0.1
-hacking==1.1.0
imagesize==0.7.1
iso8601==0.1.11
Jinja2==2.10
@@ -48,7 +46,6 @@
oslo.utils==3.33.0
oslotest==3.2.0
pbr==2.0.0
-pep8==1.5.7
prettytable==0.7.2
pyflakes==0.8.1
Pygments==2.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/monascaclient/shell.py
new/python-monascaclient-2.1.0/monascaclient/shell.py
--- old/python-monascaclient-1.16.0/monascaclient/shell.py 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/monascaclient/shell.py 2020-04-18
17:10:55.000000000 +0200
@@ -114,5 +114,6 @@
print(e)
sys.exit(1)
+
if __name__ == "__main__":
sys.exit(main(sys.argv[1:]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/monascaclient/tests/v2_0/shell/test_notifications.py
new/python-monascaclient-2.1.0/monascaclient/tests/v2_0/shell/test_notifications.py
---
old/python-monascaclient-1.16.0/monascaclient/tests/v2_0/shell/test_notifications.py
2019-09-13 18:07:46.000000000 +0200
+++
new/python-monascaclient-2.1.0/monascaclient/tests/v2_0/shell/test_notifications.py
2020-04-18 17:10:55.000000000 +0200
@@ -98,21 +98,12 @@
self._patch_test(mc, args, data)
@mock.patch('monascaclient.osc.migration.make_client')
- def test_bad_notifications_patch(self, mc):
- mc.return_value = c = FakeV2Client()
-
- id_str = '0495340b-58fd-4e1c-932b-5e6f9cc96490'
- raw_args = ('{0} --type EMAIL --address john....@hpe.com '
- '--period 60').format(id_str).split(' ')
- name, cmd_clazz = migr.create_command_class('do_notification_patch',
- shell)
- cmd = cmd_clazz(mock.Mock(), mock.Mock())
-
- parser = cmd.get_parser(name)
- parsed_args = parser.parse_args(raw_args)
- cmd.run(parsed_args)
-
- c.notifications.patch.assert_not_called()
+ def test_good_notifications_patch_recurring_email(self, mc):
+ args = '--type EMAIL --address john....@hpe.com --period 60'
+ data = {'type': 'EMAIL',
+ 'address': 'john....@hpe.com',
+ 'period': 60}
+ self._patch_test(mc, args, data)
@mock.patch('monascaclient.osc.migration.make_client')
def test_good_notifications_update(self, mc):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/monascaclient/v2_0/shell.py
new/python-monascaclient-2.1.0/monascaclient/v2_0/shell.py
--- old/python-monascaclient-1.16.0/monascaclient/v2_0/shell.py 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/monascaclient/v2_0/shell.py 2020-04-18
17:10:55.000000000 +0200
@@ -40,9 +40,6 @@
'created_timestamp'}
allowed_definition_sort_by = {'id', 'name', 'severity', 'updated_at',
'created_at'}
-# Notification valid types
-notification_types = ['EMAIL', 'WEBHOOK', 'PAGERDUTY']
-
@utils.arg('name', metavar='<METRIC_NAME>',
help='Name of the metric to create.')
@@ -554,21 +551,14 @@
formatters=formatters)
-def _validate_notification_period(period, notification_type):
- if notification_type != 'WEBHOOK' and period != 0:
- print("Invalid period, can only be non zero for webhooks")
- return False
- return True
-
-
@utils.arg('name', metavar='<NOTIFICATION_NAME>',
help='Name of the notification to create.')
@utils.arg('type', metavar='<TYPE>',
- help='The notification type. Type must be EMAIL, WEBHOOK, or
PAGERDUTY.')
+ help='The notification type. See monasca notification-type-list for
supported types.')
@utils.arg('address', metavar='<ADDRESS>',
help='A valid EMAIL Address, URL, or SERVICE KEY.')
@utils.arg('--period', metavar='<PERIOD>', type=int, default=0,
- help='A period for the notification method. Can only be non zero
with webhooks')
+ help='A period for the notification method.')
def do_notification_create(mc, args):
'''Create notification.'''
@@ -577,8 +567,6 @@
fields['type'] = args.type
fields['address'] = args.address
if args.period:
- if not _validate_notification_period(args.period, args.type.upper()):
- return
fields['period'] = args.period
try:
notification = mc.notifications.create(**fields)
@@ -692,11 +680,11 @@
@utils.arg('name', metavar='<NOTIFICATION_NAME>',
help='Name of the notification.')
@utils.arg('type', metavar='<TYPE>',
- help='The notification type. Type must be either EMAIL, WEBHOOK, or
PAGERDUTY.')
+ help='The notification type. See monasca notification-type-list for
supported types.')
@utils.arg('address', metavar='<ADDRESS>',
help='A valid EMAIL Address, URL, or SERVICE KEY.')
@utils.arg('period', metavar='<PERIOD>', type=int,
- help='A period for the notification method. Can only be non zero
with webhooks')
+ help='A period for the notification method.')
def do_notification_update(mc, args):
'''Update notification.'''
fields = {}
@@ -705,8 +693,6 @@
fields['type'] = args.type
fields['address'] = args.address
- if not _validate_notification_period(args.period, args.type.upper()):
- return
fields['period'] = args.period
try:
notification = mc.notifications.update(**fields)
@@ -721,11 +707,11 @@
@utils.arg('--name', metavar='<NOTIFICATION_NAME>',
help='Name of the notification.')
@utils.arg('--type', metavar='<TYPE>',
- help='The notification type. Type must be either EMAIL, WEBHOOK, or
PAGERDUTY.')
+ help='The notification type. See monasca notification-type-list for
supported types.')
@utils.arg('--address', metavar='<ADDRESS>',
help='A valid EMAIL Address, URL, or SERVICE KEY.')
@utils.arg('--period', metavar='<PERIOD>', type=int,
- help='A period for the notification method. Can only be non zero
with webhooks')
+ help='A period for the notification method.')
def do_notification_patch(mc, args):
'''Patch notification.'''
fields = {}
@@ -738,9 +724,6 @@
if args.address:
fields['address'] = args.address
if args.period or args.period == 0:
- if args.type and not _validate_notification_period(
- args.period, args.type.upper()):
- return
fields['period'] = args.period
try:
notification = mc.notifications.patch(**fields)
@@ -1195,10 +1178,10 @@
fields = {}
fields['alarm_id'] = args.id
if args.state.upper() not in state_types:
- errmsg = ('Invalid state, not one of [' +
- ', '.join(state_types) + ']')
- print(errmsg)
- return
+ errmsg = ('Invalid state, not one of [' +
+ ', '.join(state_types) + ']')
+ print(errmsg)
+ return
fields['state'] = args.state
fields['lifecycle_state'] = args.lifecycle_state
fields['link'] = args.link
@@ -1257,8 +1240,8 @@
def output_alarm_history(args, alarm_history):
if args.json:
- print(utils.json_formatter(alarm_history))
- return
+ print(utils.json_formatter(alarm_history))
+ return
# format output
cols = ['alarm_id', 'new_state', 'old_state', 'reason',
'reason_data', 'metric_name', 'metric_dimensions', 'timestamp']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/python_monascaclient.egg-info/PKG-INFO
new/python-monascaclient-2.1.0/python_monascaclient.egg-info/PKG-INFO
--- old/python-monascaclient-1.16.0/python_monascaclient.egg-info/PKG-INFO
2019-09-13 18:08:49.000000000 +0200
+++ new/python-monascaclient-2.1.0/python_monascaclient.egg-info/PKG-INFO
2020-04-18 17:11:33.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: python-monascaclient
-Version: 1.16.0
+Version: 2.1.0
Summary: Monasca API Client Library
Home-page: https://docs.openstack.org/python-monascaclient/latest/
Author: OpenStack
@@ -45,8 +45,9 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/python_monascaclient.egg-info/SOURCES.txt
new/python-monascaclient-2.1.0/python_monascaclient.egg-info/SOURCES.txt
--- old/python-monascaclient-1.16.0/python_monascaclient.egg-info/SOURCES.txt
2019-09-13 18:08:49.000000000 +0200
+++ new/python-monascaclient-2.1.0/python_monascaclient.egg-info/SOURCES.txt
2020-04-18 17:11:33.000000000 +0200
@@ -62,10 +62,13 @@
python_monascaclient.egg-info/requires.txt
python_monascaclient.egg-info/top_level.txt
releasenotes/locale/.gitkeep
+releasenotes/notes/drop-py-2-7-1c41855c5edc5ba3.yaml
releasenotes/notes/openstack_docs-5cfec48411370070.yaml
+releasenotes/notes/relax-constraints-for-setting-periodic-notifications-502e6570b5481ea4.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/queens.rst
releasenotes/source/rocky.rst
releasenotes/source/stein.rst
+releasenotes/source/train.rst
releasenotes/source/unreleased.rst
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/python_monascaclient.egg-info/pbr.json
new/python-monascaclient-2.1.0/python_monascaclient.egg-info/pbr.json
--- old/python-monascaclient-1.16.0/python_monascaclient.egg-info/pbr.json
2019-09-13 18:08:49.000000000 +0200
+++ new/python-monascaclient-2.1.0/python_monascaclient.egg-info/pbr.json
2020-04-18 17:11:33.000000000 +0200
@@ -1 +1 @@
-{"git_version": "3b9ec11", "is_release": true}
\ No newline at end of file
+{"git_version": "b07e4b5", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/releasenotes/notes/drop-py-2-7-1c41855c5edc5ba3.yaml
new/python-monascaclient-2.1.0/releasenotes/notes/drop-py-2-7-1c41855c5edc5ba3.yaml
---
old/python-monascaclient-1.16.0/releasenotes/notes/drop-py-2-7-1c41855c5edc5ba3.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/python-monascaclient-2.1.0/releasenotes/notes/drop-py-2-7-1c41855c5edc5ba3.yaml
2020-04-18 17:10:55.000000000 +0200
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Python 2.7 support has been dropped. Last release of python-monascaclient
+ to support python 2.7 is OpenStack Train. The minimum version of Python now
+ supported is Python 3.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/releasenotes/notes/relax-constraints-for-setting-periodic-notifications-502e6570b5481ea4.yaml
new/python-monascaclient-2.1.0/releasenotes/notes/relax-constraints-for-setting-periodic-notifications-502e6570b5481ea4.yaml
---
old/python-monascaclient-1.16.0/releasenotes/notes/relax-constraints-for-setting-periodic-notifications-502e6570b5481ea4.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/python-monascaclient-2.1.0/releasenotes/notes/relax-constraints-for-setting-periodic-notifications-502e6570b5481ea4.yaml
2020-04-18 17:10:55.000000000 +0200
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ Adds support for setting notification period for all types.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/releasenotes/source/conf.py
new/python-monascaclient-2.1.0/releasenotes/source/conf.py
--- old/python-monascaclient-1.16.0/releasenotes/source/conf.py 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/releasenotes/source/conf.py 2020-04-18
17:10:55.000000000 +0200
@@ -1,4 +1,14 @@
-# -*- coding: utf-8 -*-
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
# -- General configuration ------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/releasenotes/source/index.rst
new/python-monascaclient-2.1.0/releasenotes/source/index.rst
--- old/python-monascaclient-1.16.0/releasenotes/source/index.rst
2019-09-13 18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/releasenotes/source/index.rst
2020-04-18 17:10:55.000000000 +0200
@@ -8,6 +8,7 @@
:maxdepth: 1
unreleased
+ train
stein
rocky
queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-monascaclient-1.16.0/releasenotes/source/train.rst
new/python-monascaclient-2.1.0/releasenotes/source/train.rst
--- old/python-monascaclient-1.16.0/releasenotes/source/train.rst
1970-01-01 01:00:00.000000000 +0100
+++ new/python-monascaclient-2.1.0/releasenotes/source/train.rst
2020-04-18 17:10:55.000000000 +0200
@@ -0,0 +1,6 @@
+==========================
+Train Series Release Notes
+==========================
+
+.. release-notes::
+ :branch: stable/train
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/setup.cfg
new/python-monascaclient-2.1.0/setup.cfg
--- old/python-monascaclient-1.16.0/setup.cfg 2019-09-13 18:08:49.000000000
+0200
+++ new/python-monascaclient-2.1.0/setup.cfg 2020-04-18 17:11:34.000000000
+0200
@@ -5,6 +5,7 @@
author = OpenStack
author-email = openstack-disc...@lists.openstack.org
home-page = https://docs.openstack.org/python-monascaclient/latest/
+python-requires = >=3.6
classifier =
Environment :: Console
Intended Audience :: Information Technology
@@ -12,8 +13,8 @@
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
+ Programming Language :: Python :: Implementation :: CPython
+ Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
@@ -25,22 +26,7 @@
console_scripts =
monasca = monascaclient.shell:main
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[build_releasenotes]
-all_files = 1
-build-dir = releasenotes/build
-source-dir = releasenotes/source
-
-[wheel]
-universal = 1
-
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/setup.py
new/python-monascaclient-2.1.0/setup.py
--- old/python-monascaclient-1.16.0/setup.py 2019-09-13 18:07:46.000000000
+0200
+++ new/python-monascaclient-2.1.0/setup.py 2020-04-18 17:10:55.000000000
+0200
@@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
- import multiprocessing # noqa
-except ImportError:
- pass
-
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/test-requirements.txt
new/python-monascaclient-2.1.0/test-requirements.txt
--- old/python-monascaclient-1.16.0/test-requirements.txt 2019-09-13
18:07:46.000000000 +0200
+++ new/python-monascaclient-2.1.0/test-requirements.txt 2020-04-18
17:10:55.000000000 +0200
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
bandit>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
@@ -13,6 +13,6 @@
# documentation
doc8>=0.6.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD
reno>=2.5.0 # Apache-2.0
openstackdocstheme>=1.18.1 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-monascaclient-1.16.0/tox.ini
new/python-monascaclient-2.1.0/tox.ini
--- old/python-monascaclient-1.16.0/tox.ini 2019-09-13 18:07:46.000000000
+0200
+++ new/python-monascaclient-2.1.0/tox.ini 2020-04-18 17:10:55.000000000
+0200
@@ -1,9 +1,11 @@
[tox]
-envlist = py27,py37,pypy,cover,pep8
-minversion = 2.5
+envlist = py37,pypy,cover,pep8
+minversion = 3.1.1
skipsdist = True
+ignore_basepython_conflict = True
[testenv]
+basepython = python3
setenv =
VIRTUAL_ENV={envdir}
OS_TEST_PATH=monascaclient/tests
@@ -13,7 +15,7 @@
usedevelop = True
install_command = pip install {opts} {packages}
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
whitelist_externals = bash
@@ -24,7 +26,6 @@
stestr run {posargs}
[testenv:cover]
-basepython = python3
setenv =
PYTHON=coverage run --source monascaclient --parallel-mode
commands =
@@ -36,11 +37,9 @@
coverage report
[testenv:debug]
-basepython = python3
commands = oslo_debug_helper -t {env:OS_TEST_PATH} {posargs}
[testenv:pep8]
-basepython = python3
skip_install = True
usedevelop = False
commands =
@@ -49,48 +48,41 @@
{[testenv:checkniceness]commands}
[testenv:flake8]
-basepython = python3
skip_install = True
usedevelop = False
commands = flake8 monascaclient
[testenv:bandit]
-basepython = python3
skip_install = True
usedevelop = False
commands = bandit -r monascaclient -n5 -x {env:OS_TEST_PATH}
[testenv:docs]
-basepython = python3
description = Builds full monascaclient documentation
commands =
{[testenv:devdocs]commands}
{[testenv:releasenotes]commands}
[testenv:devdocs]
-basepython = python3
description = Builds developer documentation
commands =
rm -rf {toxinidir}/doc/build {toxinidir}/doc/source/contributor/api
- python setup.py build_sphinx
+ sphinx-build -a -W -b html doc/source doc/build/html
[testenv:releasenotes]
-basepython = python3
description = Called from CI script to test and publish the Release Notes
commands =
rm -rf releasenotes/build
- sphinx-build -a -E -d {toxinidir}/releasenotes/build/doctrees -b html \
+ sphinx-build -a -W -E -d {toxinidir}/releasenotes/build/doctrees -b html \
{toxinidir}/releasenotes/source {toxinidir}/releasenotes/build/html
[testenv:checkniceness]
-basepython = python3
description = Validates (pep-like) documenation
commands =
doc8 --file-encoding utf-8 {toxinidir}/doc
doc8 --file-encoding utf-8 {toxinidir}/releasenotes
[testenv:venv]
-basepython = python3
commands = {posargs}
[hacking]
@@ -104,7 +96,6 @@
exclude=.venv,.git,.tox,dist,client_api_example.py,*lib/python*,*egg,build
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
