Hello community,
here is the log from the commit of package python-osprofiler for
openSUSE:Factory checked in at 2020-10-26 16:17:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-osprofiler (Old)
and /work/SRC/openSUSE:Factory/.python-osprofiler.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-osprofiler"
Mon Oct 26 16:17:33 2020 rev:13 rq:841223 version:3.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-osprofiler/python-osprofiler.changes
2020-06-05 20:19:50.171789360 +0200
+++
/work/SRC/openSUSE:Factory/.python-osprofiler.new.3463/python-osprofiler.changes
2020-10-26 16:18:20.755033218 +0100
@@ -1,0 +2,18 @@
+Fri Oct 9 19:18:37 UTC 2020 - [email protected]
+
+- update to version 3.4.0
+ - Fix empty 'args' and 'kwargs' when using 'hide_args' with Jaeger
+ - drop mock from lower-constraints
+ - Bump default tox env from py37 to py38
+ - Add Python3 victoria unit tests
+ - Add py38 package metadata
+ - switch to importlib.metadata to find package version
+ - Fix StopIteration error on Ubuntu Focal
+ - Use unittest.mock instead of third party mock
+ - Fix pep8 failures
+ - Bump bandit version
+ - Switch to newer openstackdocstheme and reno versions
+ - Update master for stable/ussuri
+ - Enforce order of import statements
+
+-------------------------------------------------------------------
Old:
----
osprofiler-3.1.0.tar.gz
New:
----
osprofiler-3.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-osprofiler.spec ++++++
--- /var/tmp/diff_new_pack.Yd3CRk/_old 2020-10-26 16:18:21.267033630 +0100
+++ /var/tmp/diff_new_pack.Yd3CRk/_new 2020-10-26 16:18:21.267033630 +0100
@@ -17,19 +17,20 @@
Name: python-osprofiler
-Version: 3.1.0
+Version: 3.4.0
Release: 0
Summary: OpenStack Profiler Library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/osprofiler
-Source0:
https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-3.1.0.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-3.4.0.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-PrettyTable >= 0.7.2
BuildRequires: python3-WebOb >= 1.7.1
BuildRequires: python3-ddt
BuildRequires: python3-docutils
BuildRequires: python3-elasticsearch
+BuildRequires: python3-importlib-metadata
BuildRequires: python3-mock
BuildRequires: python3-oslo.concurrency >= 3.26.0
BuildRequires: python3-oslo.config
@@ -56,6 +57,7 @@
Group: Development/Languages/Python
Requires: python3-PrettyTable >= 0.7.2
Requires: python3-WebOb >= 1.7.1
+Requires: python3-importlib-metadata
Requires: python3-oslo.concurrency >= 3.26.0
Requires: python3-oslo.config
Requires: python3-oslo.log
@@ -85,7 +87,7 @@
Documentation for OSProfiler.
%prep
-%autosetup -p1 -n osprofiler-3.1.0
+%autosetup -p1 -n osprofiler-3.4.0
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Yd3CRk/_old 2020-10-26 16:18:21.299033656 +0100
+++ /var/tmp/diff_new_pack.Yd3CRk/_new 2020-10-26 16:18:21.303033660 +0100
@@ -1,8 +1,8 @@
<services>
<service mode="disabled" name="renderspec">
- <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/ussuri/openstack/osprofiler/osprofiler.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/osprofiler/osprofiler.spec.j2</param>
<param name="output-name">python-osprofiler.spec</param>
- <param
name="requirements">https://opendev.org/openstack/osprofiler/raw/branch/stable/ussuri/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/osprofiler/raw/branch/stable/victoria/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,osprofiler</param>
</service>
++++++ osprofiler-3.1.0.tar.gz -> osprofiler-3.4.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/.zuul.yaml
new/osprofiler-3.4.0/.zuul.yaml
--- old/osprofiler-3.1.0/.zuul.yaml 2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/.zuul.yaml 2020-09-11 21:19:46.000000000 +0200
@@ -4,7 +4,7 @@
- lib-forward-testing-python3
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- - openstack-python3-ussuri-jobs
+ - openstack-python3-victoria-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/AUTHORS new/osprofiler-3.4.0/AUTHORS
--- old/osprofiler-3.1.0/AUTHORS 2020-04-07 12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/AUTHORS 2020-09-11 21:21:18.000000000 +0200
@@ -13,6 +13,7 @@
Carlos Goncalves <[email protected]>
ChangBo Guo(gcb) <[email protected]>
Corey Bryant <[email protected]>
+Daria Kobtseva <[email protected]>
Davanum Srinivas <[email protected]>
Dina Belova <[email protected]>
Doug Hellmann <[email protected]>
@@ -20,6 +21,7 @@
Flavio Percoco <[email protected]>
Ghanshyam Mann <[email protected]>
Harshada Mangesh Kakad <[email protected]>
+Hervé Beraud <[email protected]>
Hongbin Lu <[email protected]>
Ilya Shakhat <[email protected]>
James E. Blair <[email protected]>
@@ -28,7 +30,9 @@
Jeremy Stanley <[email protected]>
Joshua Harlow <[email protected]>
Joshua Harlow <[email protected]>
+Manish Kumar <[email protected]>
Mikhail Dubov <[email protected]>
+Moisés Guimarães de Medeiros <[email protected]>
Monty Taylor <[email protected]>
Moshe Levi <[email protected]>
Munoz, Obed N <[email protected]>
@@ -40,6 +44,7 @@
OpenStack Release Bot <[email protected]>
Radoslaw Smigielski <[email protected]>
Roman Podoliaka <[email protected]>
+Sean McGinnis <[email protected]>
Shoham Peller <[email protected]>
Simon Pasquier <[email protected]>
Slawek Kaplonski <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/ChangeLog
new/osprofiler-3.4.0/ChangeLog
--- old/osprofiler-3.1.0/ChangeLog 2020-04-07 12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/ChangeLog 2020-09-11 21:21:18.000000000 +0200
@@ -1,6 +1,39 @@
CHANGES
=======
+3.4.0
+-----
+
+* Fix StopIteration error on Ubuntu Focal
+* Bump bandit version
+
+3.3.0
+-----
+
+* switch to importlib.metadata to find package version
+
+3.2.2
+-----
+
+* Fix empty 'args' and 'kwargs' when using 'hide\_args' with Jaeger
+
+3.2.1
+-----
+
+* drop mock from lower-constraints
+
+3.2.0
+-----
+
+* Fix pep8 failures
+* Switch to newer openstackdocstheme and reno versions
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Enforce order of import statements
+* Use unittest.mock instead of third party mock
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+
3.1.0
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/PKG-INFO
new/osprofiler-3.4.0/PKG-INFO
--- old/osprofiler-3.1.0/PKG-INFO 2020-04-07 12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/PKG-INFO 2020-09-11 21:21:18.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: osprofiler
-Version: 3.1.0
+Version: 3.4.0
Summary: OpenStack Profiler Library
Home-page: https://docs.openstack.org/osprofiler/latest/
Author: OpenStack
@@ -47,6 +47,7 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
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/osprofiler-3.1.0/doc/source/conf.py
new/osprofiler-3.4.0/doc/source/conf.py
--- old/osprofiler-3.1.0/doc/source/conf.py 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/doc/source/conf.py 2020-09-11 21:19:46.000000000
+0200
@@ -40,9 +40,10 @@
]
# openstackdocstheme options
-repository_name = 'openstack/osprofiler'
-bug_project = 'osprofiler'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/osprofiler'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'osprofiler'
+openstackdocs_bug_tag = ''
todo_include_todos = True
@@ -91,7 +92,7 @@
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
@@ -132,10 +133,6 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = []
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/lower-constraints.txt
new/osprofiler-3.4.0/lower-constraints.txt
--- old/osprofiler-3.1.0/lower-constraints.txt 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/lower-constraints.txt 2020-09-11 21:19:46.000000000
+0200
@@ -2,10 +2,10 @@
ddt===1.0.1
dulwich===0.15.0
elasticsearch===2.0.0
+importlib_metadata==1.7.0
jaeger-client==3.8.0
-mock===2.0.0
netaddr===0.7.18
-openstackdocstheme===1.18.1
+openstackdocstheme==2.2.1
oslo.concurrency===3.26.0
oslo.config===5.2.0
oslo.serialization===2.18.0
@@ -13,10 +13,10 @@
PrettyTable===0.7.2
pymongo===3.0.2
redis===2.10.0
-reno===2.5.0
+reno==3.1.0
requests===2.14.2
six===1.10.0
-sphinx===1.6.2
+Sphinx===2.0.0
stestr==2.0.0
testtools===2.2.0
WebOb===1.7.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/__init__.py
new/osprofiler-3.4.0/osprofiler/__init__.py
--- old/osprofiler-3.1.0/osprofiler/__init__.py 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/osprofiler/__init__.py 2020-09-11 21:19:46.000000000
+0200
@@ -13,6 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
-import pkg_resources
+try:
+ # For Python 3.8 and later
+ import importlib.metadata as importlib_metadata
+except ImportError:
+ # For everyone else
+ import importlib_metadata
-__version__ = pkg_resources.get_distribution("osprofiler").version
+__version__ = importlib_metadata.version("osprofiler")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/cmd/commands.py
new/osprofiler-3.4.0/osprofiler/cmd/commands.py
--- old/osprofiler-3.1.0/osprofiler/cmd/commands.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/cmd/commands.py 2020-09-11
21:19:46.000000000 +0200
@@ -15,11 +15,11 @@
import json
import os
-import prettytable
-import six
from oslo_utils import encodeutils
from oslo_utils import uuidutils
+import prettytable
+import six
from osprofiler.cmd import cliutils
from osprofiler.drivers import base
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/cmd/shell.py
new/osprofiler-3.4.0/osprofiler/cmd/shell.py
--- old/osprofiler-3.1.0/osprofiler/cmd/shell.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/cmd/shell.py 2020-09-11
21:19:46.000000000 +0200
@@ -73,9 +73,9 @@
command_parser.set_defaults(func=callback)
def _no_project_and_domain_set(self, args):
- if not (args.os_project_id or (args.os_project_name and
- (args.os_user_domain_name or args.os_user_domain_id)) or
- (args.os_tenant_id or args.os_tenant_name)):
+ if not (args.os_project_id or (args.os_project_name
+ and (args.os_user_domain_name or args.os_user_domain_id))
+ or (args.os_tenant_id or args.os_tenant_name)):
return True
else:
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/drivers/base.py
new/osprofiler-3.4.0/osprofiler/drivers/base.py
--- old/osprofiler-3.1.0/osprofiler/drivers/base.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/drivers/base.py 2020-09-11
21:19:46.000000000 +0200
@@ -228,8 +228,8 @@
def msec(dt):
# NOTE(boris-42): Unfortunately this is the simplest way that works
# in py26 and py27
- microsec = (dt.microseconds + (dt.seconds + dt.days * 24 * 3600) *
- 1e6)
+ microsec = (dt.microseconds + (dt.seconds + dt.days * 24 * 3600)
+ * 1e6)
return int(microsec / 1000.0)
stats = {}
@@ -245,8 +245,8 @@
op_type = r["info"]["name"]
op_started = msec(r["info"]["started"] - self.started_at)
- op_finished = msec(r["info"]["finished"] -
- self.started_at)
+ op_finished = msec(r["info"]["finished"]
+ - self.started_at)
duration = op_finished - op_started
r["info"]["started"] = op_started
@@ -256,7 +256,7 @@
stats[op_type] = {
"count": 1,
"duration": duration
- }
+ }
else:
stats[op_type]["count"] += 1
stats[op_type]["duration"] += duration
@@ -265,8 +265,9 @@
"info": {
"name": "total",
"started": 0,
- "finished": msec(self.finished_at -
- self.started_at) if self.started_at else None,
+ "finished": msec(
+ self.finished_at - self.started_at
+ ) if self.started_at else None,
"last_trace_started": msec(
self.last_started_at - self.started_at
) if self.started_at else None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/drivers/elasticsearch_driver.py
new/osprofiler-3.4.0/osprofiler/drivers/elasticsearch_driver.py
--- old/osprofiler-3.1.0/osprofiler/drivers/elasticsearch_driver.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/drivers/elasticsearch_driver.py
2020-09-11 21:19:46.000000000 +0200
@@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_config import cfg
import six.moves.urllib.parse as parser
-from oslo_config import cfg
from osprofiler.drivers import base
from osprofiler import exc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/drivers/jaeger.py
new/osprofiler-3.4.0/osprofiler/drivers/jaeger.py
--- old/osprofiler-3.1.0/osprofiler/drivers/jaeger.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/drivers/jaeger.py 2020-09-11
21:19:46.000000000 +0200
@@ -140,8 +140,10 @@
tags["http.scheme"] = info["request"]["scheme"]
elif info.get("function"):
# RPC, function calls
- tags["args"] = info["function"]["args"]
- tags["kwargs"] = info["function"]["kwargs"]
+ if "args" in info["function"]:
+ tags["args"] = info["function"]["args"]
+ if "kwargs" in info["function"]:
+ tags["kwargs"] = info["function"]["kwargs"]
tags["name"] = info["function"]["name"]
return tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/drivers/redis_driver.py
new/osprofiler-3.4.0/osprofiler/drivers/redis_driver.py
--- old/osprofiler-3.1.0/osprofiler/drivers/redis_driver.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/drivers/redis_driver.py 2020-09-11
21:19:46.000000000 +0200
@@ -15,7 +15,6 @@
# under the License.
from debtcollector import removals
-
from oslo_config import cfg
from oslo_serialization import jsonutils
import six.moves.urllib.parse as parser
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/hacking/checks.py
new/osprofiler-3.4.0/osprofiler/hacking/checks.py
--- old/osprofiler-3.1.0/osprofiler/hacking/checks.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/hacking/checks.py 2020-09-11
21:19:46.000000000 +0200
@@ -73,7 +73,10 @@
line = logical_line.strip()
if not line or line.startswith("#") or line.endswith("# noqa"):
return
- yield next(func(logical_line, filename))
+ try:
+ yield next(func(logical_line, filename))
+ except StopIteration:
+ return
return wrapper
@@ -166,8 +169,8 @@
N322
"""
- res = (re_assert_equal_start_with_none.search(logical_line) or
- re_assert_equal_end_with_none.search(logical_line))
+ res = (re_assert_equal_start_with_none.search(logical_line)
+ or re_assert_equal_end_with_none.search(logical_line))
if res:
yield (0, "N322 assertEqual(A, None) or assertEqual(None, A) "
"sentences not allowed, you should use assertIsNone(A) "
@@ -185,8 +188,9 @@
N323
"""
- res = (re_assert_true_false_with_in_or_not_in.search(logical_line) or
- re_assert_true_false_with_in_or_not_in_spaces.search(logical_line))
+ res = (re_assert_true_false_with_in_or_not_in.search(logical_line)
+ or re_assert_true_false_with_in_or_not_in_spaces.search(
+ logical_line))
if res:
yield (0, "N323 assertTrue/assertFalse(A in/not in B)sentences not "
"allowed, you should use assertIn(A, B) or assertNotIn(A, B)"
@@ -204,8 +208,8 @@
N324
"""
- res = (re_assert_equal_in_end_with_true_or_false.search(logical_line) or
- re_assert_equal_in_start_with_true_or_false.search(logical_line))
+ res = (re_assert_equal_in_end_with_true_or_false.search(logical_line)
+ or re_assert_equal_in_start_with_true_or_false.search(logical_line))
if res:
yield (0, "N324: Use assertIn/NotIn(A, B) rather than "
"assertEqual(A in/not in B, True/False) when checking "
@@ -226,8 +230,8 @@
check_tripple = (
lambda line, i, char: (
- i + 2 < len(line) and
- (char == line[i] == line[i + 1] == line[i + 2])
+ i + 2 < len(line)
+ and (char == line[i] == line[i + 1] == line[i + 2])
)
)
@@ -291,9 +295,9 @@
# NOTE(stpierre): Can't use @skip_ignored_lines here because it's
# a stupid decorator that only works on functions that take
# (logical_line, filename) as arguments.
- if (not logical_line or
- logical_line.startswith("#") or
- logical_line.endswith("# noqa")):
+ if (not logical_line
+ or logical_line.startswith("#")
+ or logical_line.endswith("# noqa")):
return
current_string = ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/profiler.py
new/osprofiler-3.4.0/osprofiler/profiler.py
--- old/osprofiler-3.1.0/osprofiler/profiler.py 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/osprofiler/profiler.py 2020-09-11 21:19:46.000000000
+0200
@@ -17,12 +17,12 @@
import datetime
import functools
import inspect
-import six
import socket
import threading
from oslo_utils import reflection
from oslo_utils import uuidutils
+import six
from osprofiler import _utils as utils
from osprofiler import notifier
@@ -306,8 +306,8 @@
traceable_attrs = []
for attr_name, attr_value in attrs.items():
- if not (inspect.ismethod(attr_value) or
- inspect.isfunction(attr_value)):
+ if not (inspect.ismethod(attr_value)
+ or inspect.isfunction(attr_value)):
continue
if attr_name.startswith("__"):
continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/cmd/test_shell.py
new/osprofiler-3.4.0/osprofiler/tests/unit/cmd/test_shell.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/cmd/test_shell.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/cmd/test_shell.py
2020-09-11 21:19:46.000000000 +0200
@@ -16,9 +16,9 @@
import json
import os
import sys
+from unittest import mock
import ddt
-import mock
import six
from osprofiler.cmd import shell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_elasticsearch.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_elasticsearch.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_elasticsearch.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_elasticsearch.py
2020-09-11 21:19:46.000000000 +0200
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
from osprofiler.drivers.elasticsearch_driver import ElasticsearchDriver
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_jaeger.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_jaeger.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_jaeger.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_jaeger.py
2020-09-11 21:19:46.000000000 +0200
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
from osprofiler.drivers import jaeger
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_loginsight.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_loginsight.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_loginsight.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_loginsight.py
2020-09-11 21:19:46.000000000 +0200
@@ -14,9 +14,9 @@
# under the License.
import json
+from unittest import mock
import ddt
-import mock
from osprofiler.drivers import loginsight
from osprofiler import exc
@@ -293,4 +293,4 @@
exp_send_request_call = mock.call(
"get", "https", "api/v1/events/foo/CONTAINS+bar/timestamp/GT+0",
headers=exp_header, params=exp_params)
- send_request.assert_has_calls([exp_send_request_call]*2)
+ send_request.assert_has_calls([exp_send_request_call] * 2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_messaging.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_messaging.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_messaging.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_messaging.py
2020-09-11 21:19:46.000000000 +0200
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
from osprofiler.drivers import base
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_mongodb.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_mongodb.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_mongodb.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_mongodb.py
2020-09-11 21:19:46.000000000 +0200
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
from osprofiler.drivers.mongodb import MongoDB
from osprofiler.tests import test
@@ -143,7 +143,7 @@
"db": {
"params": {
- },
+ },
"statement": "SELECT 1"
},
"service": None
@@ -305,8 +305,7 @@
"finished": 88,
"name": "total",
"started": 0,
- "last_trace_started": 88
- },
+ "last_trace_started": 88},
"stats": {"db": {"count": 1, "duration": 20},
"wsgi": {"count": 3, "duration": 0}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_redis_driver.py
new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_redis_driver.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/drivers/test_redis_driver.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/drivers/test_redis_driver.py
2020-09-11 21:19:46.000000000 +0200
@@ -14,7 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
+
from oslo_serialization import jsonutils
from osprofiler.drivers.redis_driver import Redis
@@ -145,7 +146,7 @@
"db": {
"params": {
- },
+ },
"statement": "SELECT 1"
},
"service": None
@@ -194,8 +195,8 @@
"parent_id": "7253ca8c-33b3-4f84-b4f1-f5a4311ddfa4",
"base_id": "7253ca8c-33b3-4f84-b4f1-f5a4311ddfa4"
}]
- results = {result["base_id"] + "_" + result["trace_id"] +
- "_" + result["timestamp"]: result
+ results = {result["base_id"] + "_" + result["trace_id"]
+ + "_" + result["timestamp"]: result
for result in result_elements}
expected = {"children": [{"children": [{
@@ -310,8 +311,7 @@
"finished": 88,
"name": "total",
"started": 0,
- "last_trace_started": 88
- },
+ "last_trace_started": 88},
"stats": {"db": {"count": 1, "duration": 20},
"wsgi": {"count": 3, "duration": 0}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/test_initializer.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_initializer.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_initializer.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_initializer.py
2020-09-11 21:19:46.000000000 +0200
@@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
+
import testtools
from osprofiler import initializer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/test_notifier.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_notifier.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_notifier.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_notifier.py 2020-09-11
21:19:46.000000000 +0200
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
from osprofiler import notifier
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/tests/unit/test_opts.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_opts.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_opts.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_opts.py 2020-09-11
21:19:46.000000000 +0200
@@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
+
from oslo_config import fixture
from osprofiler import opts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/test_profiler.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_profiler.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_profiler.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_profiler.py 2020-09-11
21:19:46.000000000 +0200
@@ -17,8 +17,8 @@
import copy
import datetime
import re
+from unittest import mock
-import mock
import six
from osprofiler import profiler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/osprofiler-3.1.0/osprofiler/tests/unit/test_sqlalchemy.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_sqlalchemy.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_sqlalchemy.py
2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_sqlalchemy.py
2020-09-11 21:19:46.000000000 +0200
@@ -14,8 +14,8 @@
# under the License.
import contextlib
+from unittest import mock
-import mock
from osprofiler import sqlalchemy
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/tests/unit/test_utils.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_utils.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_utils.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_utils.py 2020-09-11
21:19:46.000000000 +0200
@@ -16,9 +16,9 @@
import base64
import hashlib
import hmac
+from unittest import mock
import uuid
-import mock
from osprofiler import _utils as utils
from osprofiler.tests import test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/tests/unit/test_web.py
new/osprofiler-3.4.0/osprofiler/tests/unit/test_web.py
--- old/osprofiler-3.1.0/osprofiler/tests/unit/test_web.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler/tests/unit/test_web.py 2020-09-11
21:19:46.000000000 +0200
@@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
+from unittest import mock
+
from webob import response as webob_response
from osprofiler import _utils as utils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler/web.py
new/osprofiler-3.4.0/osprofiler/web.py
--- old/osprofiler-3.1.0/osprofiler/web.py 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/osprofiler/web.py 2020-09-11 21:19:46.000000000
+0200
@@ -107,8 +107,8 @@
@webob.dec.wsgify
def __call__(self, request):
- if (_ENABLED is not None and not _ENABLED or
- _ENABLED is None and not self.enabled):
+ if (_ENABLED is not None and not _ENABLED
+ or _ENABLED is None and not self.enabled):
return request.get_response(self.application)
trace_info = utils.signed_unpack(request.headers.get(X_TRACE_INFO),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler.egg-info/PKG-INFO
new/osprofiler-3.4.0/osprofiler.egg-info/PKG-INFO
--- old/osprofiler-3.1.0/osprofiler.egg-info/PKG-INFO 2020-04-07
12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler.egg-info/PKG-INFO 2020-09-11
21:21:18.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: osprofiler
-Version: 3.1.0
+Version: 3.4.0
Summary: OpenStack Profiler Library
Home-page: https://docs.openstack.org/osprofiler/latest/
Author: OpenStack
@@ -47,6 +47,7 @@
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
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/osprofiler-3.1.0/osprofiler.egg-info/SOURCES.txt
new/osprofiler-3.4.0/osprofiler.egg-info/SOURCES.txt
--- old/osprofiler-3.1.0/osprofiler.egg-info/SOURCES.txt 2020-04-07
12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler.egg-info/SOURCES.txt 2020-09-11
21:21:18.000000000 +0200
@@ -105,6 +105,7 @@
releasenotes/source/stein.rst
releasenotes/source/train.rst
releasenotes/source/unreleased.rst
+releasenotes/source/ussuri.rst
releasenotes/source/_static/.placeholder
releasenotes/source/_templates/.placeholder
tools/lint.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler.egg-info/pbr.json
new/osprofiler-3.4.0/osprofiler.egg-info/pbr.json
--- old/osprofiler-3.1.0/osprofiler.egg-info/pbr.json 2020-04-07
12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler.egg-info/pbr.json 2020-09-11
21:21:18.000000000 +0200
@@ -1 +1 @@
-{"git_version": "6e6d76a", "is_release": true}
\ No newline at end of file
+{"git_version": "5d82a02", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/osprofiler.egg-info/requires.txt
new/osprofiler-3.4.0/osprofiler.egg-info/requires.txt
--- old/osprofiler-3.1.0/osprofiler.egg-info/requires.txt 2020-04-07
12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/osprofiler.egg-info/requires.txt 2020-09-11
21:21:18.000000000 +0200
@@ -1,27 +1,30 @@
+PrettyTable<0.8,>=0.7.2
+WebOb>=1.7.1
netaddr>=0.7.18
oslo.concurrency>=3.26.0
oslo.serialization>=2.18.0
oslo.utils>=3.33.0
-PrettyTable<0.8,>=0.7.2
requests>=2.14.2
six>=1.10.0
-WebOb>=1.7.1
+
+[:(python_version<'3.8')]
+importlib_metadata>=1.7.0
[oslo_config]
oslo.config>=5.2.0
[test]
-hacking<3.1.0,>=3.0
+bandit<1.7.0,>=1.6.0
coverage>=4.0
ddt>=1.0.1
-mock>=2.0.0
-stestr>=2.0.0
-testtools>=2.2.0
-openstackdocstheme>=1.18.1
-sphinx>=1.6.2
-bandit>=1.1.0
-pymongo!=3.1,>=3.0.2
elasticsearch<3.0.0,>=2.0.0
-redis>=2.10.0
-reno>=2.5.0
+flake8-import-order==0.18.1
+hacking<3.2.0,>=3.1.0
jaeger-client>=3.8.0
+openstackdocstheme>=2.2.1
+pymongo!=3.1,>=3.0.2
+redis>=2.10.0
+reno>=3.1.0
+sphinx!=2.1.0,>=2.0.0
+stestr>=2.0.0
+testtools>=2.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/releasenotes/source/conf.py
new/osprofiler-3.4.0/releasenotes/source/conf.py
--- old/osprofiler-3.1.0/releasenotes/source/conf.py 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/releasenotes/source/conf.py 2020-09-11
21:19:46.000000000 +0200
@@ -40,9 +40,10 @@
]
# openstackdocstheme options
-repository_name = 'openstack/osprofiler'
-bug_project = 'osprofiler'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/osprofiler'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'osprofiler'
+openstackdocs_bug_tag = ''
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -97,7 +98,7 @@
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
@@ -148,7 +149,6 @@
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/releasenotes/source/index.rst
new/osprofiler-3.4.0/releasenotes/source/index.rst
--- old/osprofiler-3.1.0/releasenotes/source/index.rst 2020-04-07
12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/releasenotes/source/index.rst 2020-09-11
21:19:46.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ ussuri
train
stein
rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/releasenotes/source/ussuri.rst
new/osprofiler-3.4.0/releasenotes/source/ussuri.rst
--- old/osprofiler-3.1.0/releasenotes/source/ussuri.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/osprofiler-3.4.0/releasenotes/source/ussuri.rst 2020-09-11
21:19:46.000000000 +0200
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+ :branch: stable/ussuri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/requirements.txt
new/osprofiler-3.4.0/requirements.txt
--- old/osprofiler-3.1.0/requirements.txt 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/requirements.txt 2020-09-11 21:19:46.000000000
+0200
@@ -6,3 +6,4 @@
requests>=2.14.2 # Apache-2.0
six>=1.10.0 # MIT
WebOb>=1.7.1 # MIT
+importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/setup.cfg
new/osprofiler-3.4.0/setup.cfg
--- old/osprofiler-3.1.0/setup.cfg 2020-04-07 12:10:14.000000000 +0200
+++ new/osprofiler-3.4.0/setup.cfg 2020-09-11 21:21:18.000000000 +0200
@@ -17,6 +17,7 @@
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+ Programming Language :: Python :: 3.8
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/test-requirements.txt
new/osprofiler-3.4.0/test-requirements.txt
--- old/osprofiler-3.1.0/test-requirements.txt 2020-04-07 12:08:37.000000000
+0200
+++ new/osprofiler-3.4.0/test-requirements.txt 2020-09-11 21:19:46.000000000
+0200
@@ -1,16 +1,16 @@
-hacking>=3.0,<3.1.0 # Apache-2.0
+hacking>=3.1.0,<3.2.0 # Apache-2.0
+flake8-import-order==0.18.1 # LGPLv3
coverage>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
-mock>=2.0.0 # BSD
stestr>=2.0.0 # Apache-2.0
testtools>=2.2.0 # MIT
-openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx>=1.6.2 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
# Bandit security code scanner
-bandit>=1.1.0 # Apache-2.0
+bandit>=1.6.0,<1.7.0 # Apache-2.0
pymongo!=3.1,>=3.0.2 # Apache-2.0
@@ -21,7 +21,7 @@
redis>=2.10.0 # MIT
# Build release notes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
# For Jaeger Tracing
jaeger-client>=3.8.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osprofiler-3.1.0/tox.ini new/osprofiler-3.4.0/tox.ini
--- old/osprofiler-3.1.0/tox.ini 2020-04-07 12:08:37.000000000 +0200
+++ new/osprofiler-3.4.0/tox.ini 2020-09-11 21:19:46.000000000 +0200
@@ -2,7 +2,7 @@
minversion = 3.1.0
# Needed to create ChangeLog for docs building
skipsdist = False
-envlist = py37,pep8
+envlist = py38,pep8
ignore_basepython_conflict = True
[testenv]
@@ -61,7 +61,12 @@
[flake8]
show-source = true
builtins = _
+# E741 ambiguous variable name 'l'
+# W503 line break before binary operator
+ignore = E741,W503
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,setup.py,build,releasenotes
+import-order-style = pep8
+application-import-names = osprofiler
[flake8:local-plugins]
extension =
