Hello community,
here is the log from the commit of package python-oslo.reports for
openSUSE:Factory checked in at 2020-06-05 20:14:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.reports (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.reports.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.reports"
Fri Jun 5 20:14:57 2020 rev:11 rq:803597 version:2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.reports/python-oslo.reports.changes
2020-03-29 14:25:44.170098757 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.reports.new.3606/python-oslo.reports.changes
2020-06-05 20:18:56.299606195 +0200
@@ -1,0 +2,18 @@
+Tue May 12 09:44:20 UTC 2020 - cloud-de...@suse.de
+
+- update to version 2.0.1
+ - Exclude tests from apidoc
+ - trivial: Remove cruft from sphinx config file
+ - Update master for stable/train
+ - tox: Keeping going with docs
+ - Use unittest.mock instead of third party mock
+ - [ussuri][goal] Drop python 2.7 support and testing
+ - remove outdated header
+ - Switch to Ussuri jobs
+ - Switch from 'collections' -> 'collections.abc'
+ - tox: Add missing deps for 'releasenotes' job
+ - Update the constraints url
+ - Update hacking for Python3
+ - tox: Trivial cleanup
+
+-------------------------------------------------------------------
Old:
----
oslo.reports-1.30.0.tar.gz
New:
----
oslo.reports-2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.reports.spec ++++++
--- /var/tmp/diff_new_pack.13m9wu/_old 2020-06-05 20:18:59.667617646 +0200
+++ /var/tmp/diff_new_pack.13m9wu/_new 2020-06-05 20:18:59.667617646 +0200
@@ -17,13 +17,13 @@
Name: python-oslo.reports
-Version: 1.30.0
+Version: 2.0.1
Release: 0
Summary: OpenStack oslo.reports library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.reports
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.reports/oslo.reports-1.30.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.reports/oslo.reports-2.0.1.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-Jinja2 >= 2.10
BuildRequires: python3-eventlet
@@ -70,7 +70,7 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n oslo.reports-1.30.0
+%autosetup -p1 -n oslo.reports-2.0.1
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.13m9wu/_old 2020-06-05 20:18:59.695617742 +0200
+++ /var/tmp/diff_new_pack.13m9wu/_new 2020-06-05 20:18:59.699617755 +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/oslo.reports/oslo.reports.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/oslo.reports/oslo.reports.spec.j2</param>
<param name="output-name">python-oslo.reports.spec</param>
- <param
name="requirements">https://raw.githubusercontent.com/openstack/oslo.reports/stable/train/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.reports/raw/branch/stable/ussuri/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,oslo.reports</param>
</service>
++++++ oslo.reports-1.30.0.tar.gz -> oslo.reports-2.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/.zuul.yaml
new/oslo.reports-2.0.1/.zuul.yaml
--- old/oslo.reports-1.30.0/.zuul.yaml 2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/.zuul.yaml 2020-04-07 12:10:58.000000000 +0200
@@ -1,11 +1,9 @@
- project:
templates:
- check-requirements
- - lib-forward-testing
- lib-forward-testing-python3
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- - openstack-python3-train-jobs
+ - openstack-python3-ussuri-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/AUTHORS
new/oslo.reports-2.0.1/AUTHORS
--- old/oslo.reports-1.30.0/AUTHORS 2019-09-04 16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/AUTHORS 2020-04-07 12:12:08.000000000 +0200
@@ -7,6 +7,7 @@
Brant Knudson <bknud...@us.ibm.com>
Chang Bo Guo <guoc...@cn.ibm.com>
ChangBo Guo(gcb) <eric....@easystack.cn>
+Chris Lamb <la...@debian.org>
Christian Berendt <bere...@b1-systems.de>
Corey Bryant <corey.bry...@canonical.com>
D G Lee <yqli2...@fiberhome.com>
@@ -18,6 +19,7 @@
Eric Brown <bro...@vmware.com>
Flavio Percoco <flape...@gmail.com>
Frederic Lepied <frederic.lep...@enovance.com>
+Hervé Beraud <hber...@redhat.com>
Ildiko <ildiko.van...@ericsson.com>
Ivan Kolodyazhny <e...@e0ne.info>
Jason Kölker <ja...@koelker.net>
@@ -31,7 +33,9 @@
OpenStack Release Bot <infra-r...@openstack.org>
Romain Soufflet <rom...@soufflet.io>
Ronald Bradford <ronald.bradf...@gmail.com>
+Sean McGinnis <sean.mcgin...@gmail.com>
Solly Ross <sr...@redhat.com>
+Stephen Finucane <stephen...@redhat.com>
Trevor Vardeman <trevor.varde...@rackspace.com>
Victor Sergeyev <vserge...@mirantis.com>
Vu Cong Tuan <tua...@vn.fujitsu.com>
@@ -46,6 +50,7 @@
jacky06 <zhang....@99cloud.net>
loooosy <syluo5...@fiberhome.com>
melissaml <ma....@99cloud.net>
+pengyuesheng <pengyuesh...@gohighsec.com>
tanlin <lin....@intel.com>
wangqi <wang...@99cloud.net>
zhangchunlo...@huawei.com <zhangchunlo...@huawei.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/ChangeLog
new/oslo.reports-2.0.1/ChangeLog
--- old/oslo.reports-1.30.0/ChangeLog 2019-09-04 16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/ChangeLog 2020-04-07 12:12:08.000000000 +0200
@@ -1,6 +1,35 @@
CHANGES
=======
+2.0.1
+-----
+
+* Update hacking for Python3
+* Use unittest.mock instead of third party mock
+
+2.0.0
+-----
+
+* remove outdated header
+* [ussuri][goal] Drop python 2.7 support and testing
+* tox: Trivial cleanup
+* trivial: Remove cruft from sphinx config file
+* tox: Add missing deps for 'releasenotes' job
+
+1.31.1
+------
+
+* Switch from 'collections' -> 'collections.abc'
+* Exclude tests from apidoc
+* tox: Keeping going with docs
+* Switch to Ussuri jobs
+* Update the constraints url
+
+1.31.0
+------
+
+* Update master for stable/train
+
1.30.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/PKG-INFO
new/oslo.reports-2.0.1/PKG-INFO
--- old/oslo.reports-1.30.0/PKG-INFO 2019-09-04 16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/PKG-INFO 2020-04-07 12:12:08.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: oslo.reports
-Version: 1.30.0
+Version: 2.0.1
Summary: oslo.reports library
Home-page: https://docs.openstack.org/oslo.reports/latest
Author: OpenStack
@@ -76,8 +76,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 :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/doc/requirements.txt
new/oslo.reports-2.0.1/doc/requirements.txt
--- old/oslo.reports-1.30.0/doc/requirements.txt 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/doc/requirements.txt 2020-04-07 12:10:58.000000000
+0200
@@ -3,7 +3,6 @@
# 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.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
reno>=2.5.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/doc/source/conf.py
new/oslo.reports-2.0.1/doc/source/conf.py
--- old/oslo.reports-1.30.0/doc/source/conf.py 2019-09-04 16:31:27.000000000
+0200
+++ new/oslo.reports-2.0.1/doc/source/conf.py 2020-04-07 12:10:58.000000000
+0200
@@ -12,10 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath('../..'))
# -- General configuration ----------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be
@@ -23,7 +19,6 @@
extensions = [
'sphinx.ext.autodoc',
'sphinxcontrib.apidoc',
- #'sphinx.ext.intersphinx',
'openstackdocstheme',
'oslo_config.sphinxext',
]
@@ -33,16 +28,6 @@
bug_project = 'oslo.reports'
bug_tag = ''
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-# autodoc generation is a bit aggressive and a nuisance when doing heavy
-# text edit cycles.
-# execute "export SPHINX_DEBUG=1" in your terminal to disable
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
# The master toctree document.
master_doc = 'index'
@@ -63,32 +48,16 @@
# A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['oslo_reports.']
-# -- Options for HTML output --------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-# html_theme_path = ["."]
-# html_theme = '_theme'
-# html_static_path = ['static']
-html_theme = 'openstackdocs'
+# -- Options for HTML output -------------------------------------------------
-# Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass
-# [howto/manual]).
-latex_documents = [
- ('index',
- '%s.tex' % project,
- u'%s Documentation' % project,
- u'OpenStack Foundation', 'manual'),
-]
+html_theme = 'openstackdocs'
-# Example configuration for intersphinx: refer to the Python standard library.
-#intersphinx_mapping = {'http://docs.python.org/': None}
# -- sphinxcontrib.apidoc configuration --------------------------------------
+
apidoc_module_dir = '../../oslo_reports'
apidoc_output_dir = 'reference/api'
+apidoc_excluded_paths = [
+ 'tests',
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/lower-constraints.txt
new/oslo.reports-2.0.1/lower-constraints.txt
--- old/oslo.reports-1.30.0/lower-constraints.txt 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/lower-constraints.txt 2020-04-07
12:10:58.000000000 +0200
@@ -9,11 +9,9 @@
eventlet==0.18.2
extras==1.0.0
fixtures==3.0.0
-flake8==2.5.5
gitdb==0.6.4
GitPython==1.0.1
greenlet==0.4.10
-hacking==0.12.0
imagesize==0.7.1
iso8601==0.1.11
Jinja2==2.10
@@ -21,8 +19,6 @@
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
netaddr==0.7.18
@@ -35,9 +31,7 @@
oslo.utils==3.33.0
oslotest==3.2.0
pbr==2.0.0
-pep8==1.5.7
psutil==3.2.2
-pyflakes==0.8.1
Pygments==2.2.0
pyparsing==2.1.0
python-mimeparse==1.6.0
@@ -51,7 +45,7 @@
six==1.10.0
smmap==0.9.0
snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==1.8.0
sphinxcontrib-websupport==1.0.1
stestr==2.0.0
stevedore==1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/oslo.reports.egg-info/PKG-INFO
new/oslo.reports-2.0.1/oslo.reports.egg-info/PKG-INFO
--- old/oslo.reports-1.30.0/oslo.reports.egg-info/PKG-INFO 2019-09-04
16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo.reports.egg-info/PKG-INFO 2020-04-07
12:12:08.000000000 +0200
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: oslo.reports
-Version: 1.30.0
+Version: 2.0.1
Summary: oslo.reports library
Home-page: https://docs.openstack.org/oslo.reports/latest
Author: OpenStack
@@ -76,8 +76,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 :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Requires-Python: >=3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo.reports.egg-info/SOURCES.txt
new/oslo.reports-2.0.1/oslo.reports.egg-info/SOURCES.txt
--- old/oslo.reports-1.30.0/oslo.reports.egg-info/SOURCES.txt 2019-09-04
16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo.reports.egg-info/SOURCES.txt 2020-04-07
12:12:08.000000000 +0200
@@ -70,6 +70,7 @@
oslo_reports/views/xml/__init__.py
oslo_reports/views/xml/generic.py
releasenotes/notes/add-reno-996dd44974d53238.yaml
+releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/ocata.rst
@@ -77,6 +78,7 @@
releasenotes/source/queens.rst
releasenotes/source/rocky.rst
releasenotes/source/stein.rst
+releasenotes/source/train.rst
releasenotes/source/unreleased.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/oslo.reports.egg-info/pbr.json
new/oslo.reports-2.0.1/oslo.reports.egg-info/pbr.json
--- old/oslo.reports-1.30.0/oslo.reports.egg-info/pbr.json 2019-09-04
16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo.reports.egg-info/pbr.json 2020-04-07
12:12:08.000000000 +0200
@@ -1 +1 @@
-{"git_version": "cf35fec", "is_release": true}
\ No newline at end of file
+{"git_version": "314c4e7", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/oslo_reports/models/base.py
new/oslo.reports-2.0.1/oslo_reports/models/base.py
--- old/oslo.reports-1.30.0/oslo_reports/models/base.py 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/models/base.py 2020-04-07
12:10:58.000000000 +0200
@@ -21,13 +21,17 @@
the report serialization process.
"""
-import collections as col
import copy
+try: # python 3
+ from collections import abc
+except ImportError: # python 2
+ import collections as abc
+
import six
-class ReportModel(col.MutableMapping):
+class ReportModel(abc.MutableMapping):
"""A Report Data Model
A report data model contains data generated by some
@@ -52,9 +56,9 @@
self.attached_view = attached_view
if data is not None:
- if isinstance(data, col.Mapping):
+ if isinstance(data, abc.Mapping):
self.data = dict(data)
- elif isinstance(data, col.Sequence):
+ elif isinstance(data, abc.Sequence):
# convert a list [a, b, c] to a dict {0: a, 1: b, 2: c}
self.data = dict(enumerate(data))
else:
@@ -151,11 +155,11 @@
if hasattr(obj, 'set_current_view_type'):
obj.set_current_view_type(tp, visited=visited)
- if isinstance(obj, col.Sequence):
+ if isinstance(obj, abc.Sequence):
for item in obj:
traverse_obj(item)
- elif isinstance(obj, col.Mapping):
+ elif isinstance(obj, abc.Mapping):
for val in six.itervalues(obj):
traverse_obj(val)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo_reports/tests/test_base_report.py
new/oslo.reports-2.0.1/oslo_reports/tests/test_base_report.py
--- old/oslo.reports-1.30.0/oslo_reports/tests/test_base_report.py
2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/tests/test_base_report.py
2020-04-07 12:10:58.000000000 +0200
@@ -12,9 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
-import collections as col
import re
+try: # python 3
+ from collections import abc
+except ImportError: # python 2
+ import collections as abc
+
from oslotest import base
import six
@@ -119,7 +123,7 @@
self.assertEqual('0: a;1: b;', six.text_type(model))
def test_immutable_mappings_produce_mutable_models(self):
- class SomeImmutableMapping(col.Mapping):
+ class SomeImmutableMapping(abc.Mapping):
def __init__(self):
self.data = {'a': 2, 'b': 4, 'c': 8}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo_reports/tests/test_guru_meditation_report.py
new/oslo.reports-2.0.1/oslo_reports/tests/test_guru_meditation_report.py
--- old/oslo.reports-1.30.0/oslo_reports/tests/test_guru_meditation_report.py
2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/tests/test_guru_meditation_report.py
2020-04-07 12:10:58.000000000 +0200
@@ -20,11 +20,11 @@
import signal
import sys
import threading
+from unittest import mock
# needed to get greenthreads
import fixtures
import greenlet
-import mock
from oslotest import base
import six
@@ -147,7 +147,7 @@
curr_line += len(target_str_p_head)
# followed by at least one process
- self.assertTrue(re.match("Process \d+ \(under \d+\)",
+ self.assertTrue(re.match(r"Process \d+ \(under \d+\)",
report_lines[curr_line]))
# followed by some more process stuff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo_reports/tests/test_openstack_generators.py
new/oslo.reports-2.0.1/oslo_reports/tests/test_openstack_generators.py
--- old/oslo.reports-1.30.0/oslo_reports/tests/test_openstack_generators.py
2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/tests/test_openstack_generators.py
2020-04-07 12:10:58.000000000 +0200
@@ -14,9 +14,9 @@
# under the License.
import threading
+from unittest import mock
import greenlet
-import mock
from oslo_config import cfg
from oslotest import base
import six
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/oslo_reports/tests/test_views.py
new/oslo.reports-2.0.1/oslo_reports/tests/test_views.py
--- old/oslo.reports-1.30.0/oslo_reports/tests/test_views.py 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/tests/test_views.py 2020-04-07
12:10:58.000000000 +0200
@@ -13,8 +13,8 @@
# under the License.
import copy
+from unittest import mock
-import mock
from oslotest import base
import six
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo_reports/views/text/generic.py
new/oslo.reports-2.0.1/oslo_reports/views/text/generic.py
--- old/oslo.reports-1.30.0/oslo_reports/views/text/generic.py 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/views/text/generic.py 2020-04-07
12:10:58.000000000 +0200
@@ -18,7 +18,10 @@
serializing models into human-readable text.
"""
-import collections as col
+try: # python 3
+ from collections import abc
+except ImportError: # python 2
+ import collections as abc
import six
@@ -112,7 +115,7 @@
if rootkey is not None:
res.append((self.indent_str * indent) + rootkey)
- if isinstance(root, col.Mapping):
+ if isinstance(root, abc.Mapping):
if rootkey is None and indent > 0:
res.append((self.indent_str * indent) + self.anon_dict)
elif rootkey is not None:
@@ -122,7 +125,7 @@
for key in sorted(root):
res.extend(serialize(root[key], key, indent + 1))
- elif (isinstance(root, col.Sequence) and
+ elif (isinstance(root, abc.Sequence) and
not isinstance(root, six.string_types)):
if rootkey is not None:
res[0] += self.list_sep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/oslo_reports/views/xml/generic.py
new/oslo.reports-2.0.1/oslo_reports/views/xml/generic.py
--- old/oslo.reports-1.30.0/oslo_reports/views/xml/generic.py 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/oslo_reports/views/xml/generic.py 2020-04-07
12:10:58.000000000 +0200
@@ -23,10 +23,14 @@
such strings specially)
"""
-import collections as col
import copy
import xml.etree.ElementTree as ET
+try: # python 3
+ from collections import abc
+except ImportError: # python 2
+ import collections as abc
+
import six
from oslo_reports import _utils as utils
@@ -65,10 +69,10 @@
def serialize(rootmodel, rootkeyname):
res = ET.Element(rootkeyname)
- if isinstance(rootmodel, col.Mapping):
+ if isinstance(rootmodel, abc.Mapping):
for key in sorted(rootmodel):
res.append(serialize(rootmodel[key], key))
- elif (isinstance(rootmodel, col.Sequence) and
+ elif (isinstance(rootmodel, abc.Sequence) and
not isinstance(rootmodel, six.string_types)):
for val in sorted(rootmodel, key=str):
res.append(serialize(val, 'item'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.reports-1.30.0/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml
new/oslo.reports-2.0.1/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml
---
old/oslo.reports-1.30.0/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.reports-2.0.1/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml
2020-04-07 12:10:58.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Support for Python 2.7 has been dropped. The minimum version of Python now
+ supported is Python 3.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/releasenotes/source/index.rst
new/oslo.reports-2.0.1/releasenotes/source/index.rst
--- old/oslo.reports-1.30.0/releasenotes/source/index.rst 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/releasenotes/source/index.rst 2020-04-07
12:10:58.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ train
stein
rocky
queens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/releasenotes/source/train.rst
new/oslo.reports-2.0.1/releasenotes/source/train.rst
--- old/oslo.reports-1.30.0/releasenotes/source/train.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.reports-2.0.1/releasenotes/source/train.rst 2020-04-07
12:10:58.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/oslo.reports-1.30.0/setup.cfg
new/oslo.reports-2.0.1/setup.cfg
--- old/oslo.reports-1.30.0/setup.cfg 2019-09-04 16:32:12.000000000 +0200
+++ new/oslo.reports-2.0.1/setup.cfg 2020-04-07 12:12:08.000000000 +0200
@@ -6,6 +6,7 @@
author = OpenStack
author-email = openstack-disc...@lists.openstack.org
home-page = https://docs.openstack.org/oslo.reports/latest
+python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -13,37 +14,20 @@
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 :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3 :: Only
+ Programming Language :: Python :: Implementation :: CPython
[files]
packages =
oslo_reports
-[pbr]
-autodoc_index_modules = true
-api_doc_dir = reference/api
-autodoc_exclude_modules =
- oslo_reports._i18n
- oslo_reports._utils
- oslo_reports.tests.*
-
[entry_points]
oslo.config.opts =
oslo.reports = oslo_reports.opts:list_opts
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
[compile_catalog]
directory = oslo_reports/locale
domain = oslo_reports
@@ -58,9 +42,6 @@
mapping_file = babel.cfg
output_file = oslo_reports/locale/oslo_reports.pot
-[wheel]
-universal = true
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/setup.py
new/oslo.reports-2.0.1/setup.py
--- old/oslo.reports-1.30.0/setup.py 2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/setup.py 2020-04-07 12:10:58.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/oslo.reports-1.30.0/test-requirements.txt
new/oslo.reports-2.0.1/test-requirements.txt
--- old/oslo.reports-1.30.0/test-requirements.txt 2019-09-04
16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/test-requirements.txt 2020-04-07
12:10:58.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
oslotest>=3.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.reports-1.30.0/tox.ini
new/oslo.reports-2.0.1/tox.ini
--- old/oslo.reports-1.30.0/tox.ini 2019-09-04 16:31:27.000000000 +0200
+++ new/oslo.reports-2.0.1/tox.ini 2020-04-07 12:10:58.000000000 +0200
@@ -1,21 +1,19 @@
[tox]
-minversion = 2.0
-envlist = py27,py37,pep8
+minversion = 3.1.1
+envlist = py37,pep8
+ignore_basepython_conflict = true
[testenv]
+basepython = python3
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
-install_command = pip install {opts} {packages}
commands = stestr run --slowest {posargs}
-[testenv:py27]
-basepython = python2.7
-
[testenv:pep8]
-basepython = python3
deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
commands =
flake8
@@ -23,11 +21,9 @@
bandit -r oslo_reports tests -n5 --skip B314,B405
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:docs]
-basepython = python3
whitelist_externals =
rm
deps =
@@ -35,16 +31,16 @@
-r{toxinidir}/doc/requirements.txt
commands =
rm -rf doc/build doc/source/reference/api
- sphinx-build -W -b html doc/source doc/build/html
+ sphinx-build -W --keep-going -b html doc/source doc/build/html
[testenv:cover]
-basepython = python3
commands = python setup.py test --coverage
--coverage-package-name=oslo_reports --testr-args='{posargs}'
[flake8]
# E123, E125 skipped as they are invalid PEP-8.
+# W504 line break after binary operator
show-source = True
-ignore = E123,E125
+ignore = E123,E125,W504
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
@@ -52,11 +48,16 @@
import_exceptions =
[testenv:releasenotes]
-basepython = python3
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
+whitelist_externals =
+ rm
+deps =
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
+commands =
+ rm -rf releasenotes/build
+ sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html
releasenotes/source releasenotes/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
