Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-osprofiler for openSUSE:Factory checked in at 2022-06-09 14:11:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-osprofiler (Old) and /work/SRC/openSUSE:Factory/.python-osprofiler.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-osprofiler" Thu Jun 9 14:11:51 2022 rev:16 rq:981386 version:3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-osprofiler/python-osprofiler.changes 2022-05-25 20:35:14.180284083 +0200 +++ /work/SRC/openSUSE:Factory/.python-osprofiler.new.1548/python-osprofiler.changes 2022-06-09 14:11:58.628542865 +0200 @@ -1,0 +2,8 @@ +Wed Jun 8 20:10:52 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 3.4.3: + * Make some revisions in the document + * Update CI to use unversioned jobs template + * Fix api index and module index + +------------------------------------------------------------------- Old: ---- osprofiler-3.4.2.tar.gz New: ---- osprofiler-3.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-osprofiler.spec ++++++ --- /var/tmp/diff_new_pack.hFhzQN/_old 2022-06-09 14:11:59.100543497 +0200 +++ /var/tmp/diff_new_pack.hFhzQN/_new 2022-06-09 14:11:59.104543502 +0200 @@ -17,13 +17,13 @@ Name: python-osprofiler -Version: 3.4.2 +Version: 3.4.3 Release: 0 Summary: OpenStack Profiler Library License: Apache-2.0 Group: Development/Languages/Python URL: https://docs.openstack.org/osprofiler -Source0: https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-3.4.2.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-3.4.3.tar.gz BuildRequires: openstack-macros BuildRequires: python3-PrettyTable >= 0.7.2 BuildRequires: python3-WebOb >= 1.7.1 @@ -77,12 +77,13 @@ Summary: Documentation for OSProfiler BuildRequires: python3-Sphinx BuildRequires: python3-openstackdocstheme +BuildRequires: python3-sphinxcontrib-apidoc %description -n python-osprofiler-doc Documentation for OSProfiler. %prep -%autosetup -p1 -n osprofiler-3.4.2 +%autosetup -p1 -n osprofiler-3.4.3 %py_req_cleanup %build ++++++ osprofiler-3.4.2.tar.gz -> osprofiler-3.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/.zuul.yaml new/osprofiler-3.4.3/.zuul.yaml --- old/osprofiler-3.4.2/.zuul.yaml 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/.zuul.yaml 2022-05-05 11:53:10.000000000 +0200 @@ -3,7 +3,7 @@ - check-requirements - lib-forward-testing-python3 - openstack-cover-jobs - - openstack-python3-wallaby-jobs + - openstack-python3-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.4.2/AUTHORS new/osprofiler-3.4.3/AUTHORS --- old/osprofiler-3.4.2/AUTHORS 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/AUTHORS 2022-05-05 11:53:50.000000000 +0200 @@ -33,6 +33,7 @@ Joshua Harlow <harlo...@gmail.com> Joshua Harlow <harlo...@yahoo-inc.com> Manish Kumar <manishjp...@gmail.com> +Michael Johnson <johnso...@gmail.com> Mikhail Dubov <mdu...@mirantis.com> Mois??s Guimar??es de Medeiros <mogui...@redhat.com> Monty Taylor <mord...@inaugust.com> @@ -80,6 +81,8 @@ sunyandi <su...@inspur.com> uppi <helend...@gmail.com> wangxiyuan <wangxiy...@huawei.com> +wangzihao <wangzi...@yovole.com> yangkun.lc <yangkun...@inspur.com> zhangboye <zhangb...@inspur.com> +zhaolei.lc <15247232...@163.com> zhouxinyong <zhouxiny...@inspur.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/ChangeLog new/osprofiler-3.4.3/ChangeLog --- old/osprofiler-3.4.2/ChangeLog 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/ChangeLog 2022-05-05 11:53:50.000000000 +0200 @@ -1,6 +1,13 @@ CHANGES ======= +3.4.3 +----- + +* Make some revisions in the document +* Update CI to use unversioned jobs template +* Fix api index and module index + 3.4.2 ----- @@ -11,7 +18,9 @@ * Uncap PrettyTable * Move flake8 as a pre-commit local target +* Use TOX\_CONSTRAINTS\_FILE * Dropping lower constraints testing +* Remove six * Use py3 as the default runtime for tox * Adding pre-commit * ignore reno generated artifacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/PKG-INFO new/osprofiler-3.4.3/PKG-INFO --- old/osprofiler-3.4.2/PKG-INFO 2021-09-06 10:40:35.768696800 +0200 +++ new/osprofiler-3.4.3/PKG-INFO 2022-05-05 11:53:51.021370400 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: osprofiler -Version: 3.4.2 +Version: 3.4.3 Summary: OpenStack Profiler Library Home-page: https://docs.openstack.org/osprofiler/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/doc/requirements.txt new/osprofiler-3.4.3/doc/requirements.txt --- old/osprofiler-3.4.2/doc/requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/osprofiler-3.4.3/doc/requirements.txt 2022-05-05 11:53:10.000000000 +0200 @@ -0,0 +1,7 @@ +docutils>=0.14 # OSI-Approved Open Source, Public Domain +openstackdocstheme>=2.2.1 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +sphinxcontrib-apidoc>=0.2.1 # BSD + +# Build release notes +reno>=3.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/doc/source/conf.py new/osprofiler-3.4.3/doc/source/conf.py --- old/osprofiler-3.4.2/doc/source/conf.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/doc/source/conf.py 2022-05-05 11:53:10.000000000 +0200 @@ -49,6 +49,7 @@ 'sphinx.ext.ifconfig', 'sphinx.ext.viewcode', 'openstackdocstheme', + 'sphinxcontrib.apidoc', ] # openstackdocstheme options @@ -130,3 +131,10 @@ 'Miscellaneous' ), ] + +apidoc_output_dir = 'contributor/modules' +apidoc_module_dir = '../../osprofiler' +apidoc_excluded_paths = [ + 'hacking', + 'tests', +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/doc/source/index.rst new/osprofiler-3.4.3/doc/source/index.rst --- old/osprofiler-3.4.2/doc/source/index.rst 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/doc/source/index.rst 2022-05-05 11:53:10.000000000 +0200 @@ -14,6 +14,12 @@ user/index +.. toctree:: + :hidden: + + contributor/modules/modules + + .. rubric:: Indices and tables * :ref:`genindex` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/doc/source/user/api.rst new/osprofiler-3.4.3/doc/source/user/api.rst --- old/osprofiler-3.4.2/doc/source/user/api.rst 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/doc/source/user/api.rst 2022-05-05 11:53:10.000000000 +0200 @@ -39,8 +39,7 @@ def _traced_only_if_trace_private_true(self): pass - @six.add_metaclass(profiler.TracedMeta) - class RpcManagerClass(object): + class RpcManagerClass(object, metaclass=profiler.TracedMeta): __trace_args__ = {'name': 'rpc', 'info': None, 'hide_args': False, @@ -77,14 +76,14 @@ .. code-block:: python profiler.start("parent_point") # trace_stack.push(<new_uuid>) - # send to collector -> trace_stack[-2:] + # send to collector -> trace_stack[1] - profiler.start("parent_point") # trace_stack.push(<new_uuid>) - # send to collector -> trace_stack[-2:] - profiler.stop() # send to collector -> trace_stack[-2:] + profiler.start("child_point") # trace_stack.push(<new_uuid>) + # send to collector -> trace_stack[2] + profiler.stop() # send to collector -> trace_stack[2] # trace_stack.pop() - profiler.stop() # send to collector -> trace_stack[-2:] + profiler.stop() # send to collector -> trace_stack[1] # trace_stack.pop() It's simple to build a tree of nested trace points, having diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/lower-constraints.txt new/osprofiler-3.4.3/lower-constraints.txt --- old/osprofiler-3.4.2/lower-constraints.txt 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/lower-constraints.txt 2022-05-05 11:53:10.000000000 +0200 @@ -1,5 +1,6 @@ coverage===4.0 ddt===1.0.1 +docutils==0.14 dulwich===0.15.0 elasticsearch===2.0.0 importlib_metadata==1.7.0 @@ -15,7 +16,6 @@ redis===2.10.0 reno==3.1.0 requests===2.14.2 -six===1.10.0 Sphinx===2.0.0 stestr==2.0.0 testtools===2.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/_utils.py new/osprofiler-3.4.3/osprofiler/_utils.py --- old/osprofiler-3.4.2/osprofiler/_utils.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/_utils.py 2022-05-05 11:53:10.000000000 +0200 @@ -22,7 +22,6 @@ from oslo_utils import secretutils from oslo_utils import uuidutils -import six def split(text, strip=True): @@ -32,7 +31,7 @@ """ if isinstance(text, (tuple, list)): return text - if not isinstance(text, six.string_types): + if not isinstance(text, str): raise TypeError("Unknown how to split '%s': %s" % (text, type(text))) if strip: return [t.strip() for t in text.split(",") if t.strip()] @@ -45,9 +44,9 @@ Does nothing if text not unicode string. """ - if isinstance(text, six.binary_type): + if isinstance(text, bytes): return text - elif isinstance(text, six.text_type): + elif isinstance(text, str): return text.encode(encoding) else: raise TypeError("Expected binary or string type") @@ -58,9 +57,9 @@ Does nothing if data is already unicode string. """ - if isinstance(data, six.binary_type): + if isinstance(data, bytes): return data.decode(encoding) - elif isinstance(data, six.text_type): + elif isinstance(data, str): return data else: raise TypeError("Expected binary or string type") @@ -154,7 +153,7 @@ def shorten_id(span_id): """Convert from uuid4 to 64 bit id for OpenTracing""" int64_max = (1 << 64) - 1 - if isinstance(span_id, six.integer_types): + if isinstance(span_id, int): return span_id & int64_max try: short_id = uuid.UUID(span_id).int & int64_max diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/cmd/commands.py new/osprofiler-3.4.3/osprofiler/cmd/commands.py --- old/osprofiler-3.4.2/osprofiler/cmd/commands.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/cmd/commands.py 2022-05-05 11:53:10.000000000 +0200 @@ -19,7 +19,6 @@ from oslo_utils import encodeutils from oslo_utils import uuidutils import prettytable -import six from osprofiler.cmd import cliutils from osprofiler.drivers import base @@ -188,7 +187,4 @@ for trace in traces: row = [trace[field] for field in fields] pretty_table.add_row(row) - if six.PY3: - print(encodeutils.safe_encode(pretty_table.get_string()).decode()) - else: - print(encodeutils.safe_encode(pretty_table.get_string())) + print(encodeutils.safe_encode(pretty_table.get_string()).decode()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/base.py new/osprofiler-3.4.3/osprofiler/drivers/base.py --- old/osprofiler-3.4.2/osprofiler/drivers/base.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/base.py 2022-05-05 11:53:10.000000000 +0200 @@ -15,8 +15,7 @@ import datetime import logging - -import six.moves.urllib.parse as urlparse +from urllib import parse as urlparse from osprofiler import _utils @@ -88,15 +87,12 @@ :param info: Contains information about trace element. In payload dict there are always 3 ids: "base_id" - uuid that is common for all notifications - related to one trace. Used to simplify - retrieving of all trace elements from - the backend. + related to one trace. Used to simplify retrieving of all + trace elements from the backend. "parent_id" - uuid of parent element in trace "trace_id" - uuid of current element in trace - With parent_id and trace_id it's quite simple to build tree of trace elements, which simplify analyze of trace. - """ raise NotImplementedError("{0}: This method is either not supported " "or has to be overridden".format( @@ -120,9 +116,9 @@ """Query all traces from the storage. :param fields: Set of trace fields to return. Defaults to 'base_id' - and 'timestamp' - :return List of traces, where each trace is a dictionary containing - at least `base_id` and `timestamp`. + and 'timestamp' + :returns: List of traces, where each trace is a dictionary containing + at least `base_id` and `timestamp`. """ raise NotImplementedError("{0}: This method is either not supported " "or has to be overridden".format( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/elasticsearch_driver.py new/osprofiler-3.4.3/osprofiler/drivers/elasticsearch_driver.py --- old/osprofiler-3.4.2/osprofiler/drivers/elasticsearch_driver.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/elasticsearch_driver.py 2022-05-05 11:53:10.000000000 +0200 @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as parser + from oslo_config import cfg -import six.moves.urllib.parse as parser from osprofiler.drivers import base from osprofiler import exc @@ -57,15 +58,12 @@ :param info: Contains information about trace element. In payload dict there are always 3 ids: "base_id" - uuid that is common for all notifications - related to one trace. Used to simplify - retrieving of all trace elements from - Elasticsearch. + related to one trace. Used to simplify retrieving of all + trace elements from Elasticsearch. "parent_id" - uuid of parent element in trace "trace_id" - uuid of current element in trace - With parent_id and trace_id it's quite simple to build tree of trace elements, which simplify analyze of trace. - """ info = info.copy() @@ -110,9 +108,9 @@ """Query all traces from the storage. :param fields: Set of trace fields to return. Defaults to 'base_id' - and 'timestamp' - :return List of traces, where each trace is a dictionary containing - at least `base_id` and `timestamp`. + and 'timestamp' + :returns: List of traces, where each trace is a dictionary containing + at least `base_id` and `timestamp`. """ query = {"match_all": {}} fields = set(fields or self.default_trace_fields) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/jaeger.py new/osprofiler-3.4.3/osprofiler/drivers/jaeger.py --- old/osprofiler-3.4.2/osprofiler/drivers/jaeger.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/jaeger.py 2022-05-05 11:53:10.000000000 +0200 @@ -16,10 +16,10 @@ import collections import datetime import time +from urllib import parse as parser from oslo_config import cfg from oslo_serialization import jsonutils -import six.moves.urllib.parse as parser from osprofiler import _utils as utils from osprofiler.drivers import base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/loginsight.py new/osprofiler-3.4.3/osprofiler/drivers/loginsight.py --- old/osprofiler-3.4.2/osprofiler/drivers/loginsight.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/loginsight.py 2022-05-05 11:53:10.000000000 +0200 @@ -19,11 +19,11 @@ import json import logging as log +from urllib import parse as urlparse import netaddr from oslo_concurrency.lockutils import synchronized import requests -import six.moves.urllib.parse as urlparse from osprofiler.drivers import base from osprofiler import exc @@ -39,13 +39,12 @@ is 3.3. The connection string to initialize the driver should be of the format: - loginsight://<username>:<password>@<loginsight-host> + loginsight://<username>:<password>@<loginsight-host> If the username or password contains the character ':' or '@', it must be escaped using URL encoding. For example, the connection string to connect to Log Insight server at 10.1.2.3 using username "osprofiler" and password - "p@ssword" is: - loginsight://osprofiler:p%40ssword@10.1.2.3 + "p@ssword" is: loginsight://osprofiler:p%40ssword@10.1.2.3 """ def __init__( self, connection_str, project=None, service=None, host=None, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/messaging.py new/osprofiler-3.4.3/osprofiler/drivers/messaging.py --- old/osprofiler-3.4.2/osprofiler/drivers/messaging.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/messaging.py 2022-05-05 11:53:10.000000000 +0200 @@ -83,10 +83,9 @@ :param info: Contains information about trace element. In payload dict there are always 3 ids: "base_id" - uuid that is common for all notifications - related to one trace. + related to one trace. "parent_id" - uuid of parent element in trace "trace_id" - uuid of current element in trace - With parent_id and trace_id it's quite simple to build tree of trace elements, which simplify analyze of trace. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/mongodb.py new/osprofiler-3.4.3/osprofiler/drivers/mongodb.py --- old/osprofiler-3.4.2/osprofiler/drivers/mongodb.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/mongodb.py 2022-05-05 11:53:10.000000000 +0200 @@ -45,15 +45,12 @@ :param info: Contains information about trace element. In payload dict there are always 3 ids: "base_id" - uuid that is common for all notifications - related to one trace. Used to simplify - retrieving of all trace elements from - MongoDB. + related to one trace. Used to simplify retrieving of all + trace elements from MongoDB. "parent_id" - uuid of parent element in trace "trace_id" - uuid of current element in trace - With parent_id and trace_id it's quite simple to build tree of trace elements, which simplify analyze of trace. - """ data = info.copy() data["project"] = self.project @@ -76,9 +73,9 @@ """Query all traces from the storage. :param fields: Set of trace fields to return. Defaults to 'base_id' - and 'timestamp' - :return List of traces, where each trace is a dictionary containing - at least `base_id` and `timestamp`. + and 'timestamp' + :returns: List of traces, where each trace is a dictionary containing + at least `base_id` and `timestamp`. """ fields = set(fields or self.default_trace_fields) ids = self.db.profiler.find({}).distinct("base_id") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/drivers/redis_driver.py new/osprofiler-3.4.3/osprofiler/drivers/redis_driver.py --- old/osprofiler-3.4.2/osprofiler/drivers/redis_driver.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/drivers/redis_driver.py 2022-05-05 11:53:10.000000000 +0200 @@ -14,10 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as parser + from debtcollector import removals from oslo_config import cfg from oslo_serialization import jsonutils -import six.moves.urllib.parse as parser from osprofiler.drivers import base from osprofiler import exc @@ -60,15 +61,12 @@ :param info: Contains information about trace element. In payload dict there are always 3 ids: "base_id" - uuid that is common for all notifications - related to one trace. Used to simplify - retrieving of all trace elements from - Redis. + related to one trace. Used to simplify retrieving of all + trace elements from Redis. "parent_id" - uuid of parent element in trace "trace_id" - uuid of current element in trace - With parent_id and trace_id it's quite simple to build tree of trace elements, which simplify analyze of trace. - """ data = info.copy() data["project"] = self.project @@ -93,9 +91,9 @@ """Query all traces from the storage. :param fields: Set of trace fields to return. Defaults to 'base_id' - and 'timestamp' - :return List of traces, where each trace is a dictionary containing - at least `base_id` and `timestamp`. + and 'timestamp' + :returns: List of traces, where each trace is a dictionary containing + at least `base_id` and `timestamp`. """ fields = set(fields or self.default_trace_fields) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/hacking/checks.py new/osprofiler-3.4.3/osprofiler/hacking/checks.py --- old/osprofiler-3.4.2/osprofiler/hacking/checks.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/hacking/checks.py 2022-05-05 11:53:10.000000000 +0200 @@ -364,7 +364,7 @@ if re.search(r"\bunicode\(", logical_line): yield (0, "N353 'unicode' function is absent in python3. Please " - "use 'six.text_type' instead.") + "use 'str' instead.") @core.flake8ext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/profiler.py new/osprofiler-3.4.3/osprofiler/profiler.py --- old/osprofiler-3.4.2/osprofiler/profiler.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/profiler.py 2022-05-05 11:53:10.000000000 +0200 @@ -22,7 +22,6 @@ from oslo_utils import reflection from oslo_utils import uuidutils -import six from osprofiler import _utils as utils from osprofiler import notifier @@ -161,7 +160,7 @@ except Exception as ex: stop_info = { "etype": reflection.get_class_name(ex), - "message": six.text_type(ex) + "message": str(ex) } raise else: @@ -274,8 +273,7 @@ Possible usage: - >>> @six.add_metaclass(profiler.TracedMeta) - >>> class RpcManagerClass(object): + >>> class RpcManagerClass(object, metaclass=profiler.TracedMeta): >>> __trace_args__ = {'name': 'rpc', >>> 'info': None, >>> 'hide_args': False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/tests/unit/cmd/test_shell.py new/osprofiler-3.4.3/osprofiler/tests/unit/cmd/test_shell.py --- old/osprofiler-3.4.2/osprofiler/tests/unit/cmd/test_shell.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/tests/unit/cmd/test_shell.py 2022-05-05 11:53:10.000000000 +0200 @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. +import io import json import os import sys from unittest import mock import ddt -import six from osprofiler.cmd import shell from osprofiler import exc @@ -43,7 +43,7 @@ cmd = "trace show --connection-string redis:// %s" % self.TRACE_ID return cmd if format_ is None else "%s --%s" % (cmd, format_) - @mock.patch("sys.stdout", six.StringIO()) + @mock.patch("sys.stdout", io.StringIO()) @mock.patch("osprofiler.cmd.shell.OSProfilerShell") def test_shell_main(self, mock_shell): mock_shell.side_effect = exc.CommandError("some_message") @@ -99,7 +99,7 @@ } return notifications - @mock.patch("sys.stdout", six.StringIO()) + @mock.patch("sys.stdout", io.StringIO()) @mock.patch("osprofiler.drivers.redis_driver.Redis.get_report") def test_trace_show_in_json(self, mock_get): notifications = self._create_mock_notifications() @@ -110,7 +110,7 @@ separators=(",", ": "),), sys.stdout.getvalue()) - @mock.patch("sys.stdout", six.StringIO()) + @mock.patch("sys.stdout", io.StringIO()) @mock.patch("osprofiler.drivers.redis_driver.Redis.get_report") def test_trace_show_in_html(self, mock_get): notifications = self._create_mock_notifications() @@ -139,7 +139,7 @@ separators=(",", ": ")), sys.stdout.getvalue()) - @mock.patch("sys.stdout", six.StringIO()) + @mock.patch("sys.stdout", io.StringIO()) @mock.patch("osprofiler.drivers.redis_driver.Redis.get_report") def test_trace_show_write_to_file(self, mock_get): notifications = self._create_mock_notifications() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/tests/unit/test_profiler.py new/osprofiler-3.4.3/osprofiler/tests/unit/test_profiler.py --- old/osprofiler-3.4.2/osprofiler/tests/unit/test_profiler.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/tests/unit/test_profiler.py 2022-05-05 11:53:10.000000000 +0200 @@ -19,7 +19,6 @@ import re from unittest import mock -import six from osprofiler import profiler from osprofiler.tests import test @@ -462,7 +461,6 @@ # - and FakeTraceStatic.method4 in PY3 "name": "osprofiler.tests.unit.test_profiler" - ".method4" if six.PY2 else "osprofiler.tests.unit.test_profiler.FakeTraceStatic" ".method4", "args": str((25,)), @@ -490,8 +488,7 @@ self.assertFalse(mock_stop.called) -@six.add_metaclass(profiler.TracedMeta) -class FakeTraceWithMetaclassBase(object): +class FakeTraceWithMetaclassBase(object, metaclass=profiler.TracedMeta): __trace_args__ = {"name": "rpc", "info": {"a": 10}} @@ -534,8 +531,8 @@ def test_no_name_exception(self): def define_class_with_no_name(): - @six.add_metaclass(profiler.TracedMeta) - class FakeTraceWithMetaclassNoName(FakeTracedCls): + class FakeTraceWithMetaclassNoName(FakeTracedCls, + metaclass=profiler.TracedMeta): pass self.assertRaises(TypeError, define_class_with_no_name, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler/web.py new/osprofiler-3.4.3/osprofiler/web.py --- old/osprofiler-3.4.2/osprofiler/web.py 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler/web.py 2022-05-05 11:53:10.000000000 +0200 @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six import webob.dec from osprofiler import _utils as utils @@ -98,7 +97,7 @@ def _trace_is_valid(self, trace_info): if not isinstance(trace_info, dict): return False - trace_keys = set(six.iterkeys(trace_info)) + trace_keys = set(trace_info.keys()) if not all(k in trace_keys for k in _REQUIRED_KEYS): return False if trace_keys.difference(_REQUIRED_KEYS + _OPTIONAL_KEYS): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler.egg-info/PKG-INFO new/osprofiler-3.4.3/osprofiler.egg-info/PKG-INFO --- old/osprofiler-3.4.2/osprofiler.egg-info/PKG-INFO 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler.egg-info/PKG-INFO 2022-05-05 11:53:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: osprofiler -Version: 3.4.2 +Version: 3.4.3 Summary: OpenStack Profiler Library Home-page: https://docs.openstack.org/osprofiler/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler.egg-info/SOURCES.txt new/osprofiler-3.4.3/osprofiler.egg-info/SOURCES.txt --- old/osprofiler-3.4.2/osprofiler.egg-info/SOURCES.txt 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler.egg-info/SOURCES.txt 2022-05-05 11:53:50.000000000 +0200 @@ -17,6 +17,7 @@ devstack/plugin.sh devstack/settings devstack/lib/osprofiler +doc/requirements.txt doc/source/Makefile doc/source/conf.py doc/source/index.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler.egg-info/pbr.json new/osprofiler-3.4.3/osprofiler.egg-info/pbr.json --- old/osprofiler-3.4.2/osprofiler.egg-info/pbr.json 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler.egg-info/pbr.json 2022-05-05 11:53:50.000000000 +0200 @@ -1 +1 @@ -{"git_version": "e475de6", "is_release": true} \ No newline at end of file +{"git_version": "3286301", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osprofiler-3.4.2/osprofiler.egg-info/requires.txt new/osprofiler-3.4.3/osprofiler.egg-info/requires.txt --- old/osprofiler-3.4.2/osprofiler.egg-info/requires.txt 2021-09-06 10:40:35.000000000 +0200 +++ new/osprofiler-3.4.3/osprofiler.egg-info/requires.txt 2022-05-05 11:53:50.000000000 +0200 @@ -5,7 +5,6 @@ oslo.serialization>=2.18.0 oslo.utils>=3.33.0 requests>=2.14.2 -six>=1.10.0 [:(python_version<'3.8')] importlib_metadata>=1.7.0 @@ -17,15 +16,13 @@ bandit<1.7.0,>=1.6.0 coverage>=4.0 ddt>=1.0.1 +docutils>=0.14 elasticsearch<3.0.0,>=2.0.0 flake8-import-order==0.18.1 hacking<3.2.0,>=3.1.0 jaeger-client>=3.8.0 -openstackdocstheme>=2.2.1 pre-commit>=2.6.0 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.4.2/requirements.txt new/osprofiler-3.4.3/requirements.txt --- old/osprofiler-3.4.2/requirements.txt 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/requirements.txt 2022-05-05 11:53:10.000000000 +0200 @@ -4,6 +4,5 @@ oslo.utils>=3.33.0 # Apache-2.0 PrettyTable>=0.7.2 # BSD 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.4.2/test-requirements.txt new/osprofiler-3.4.3/test-requirements.txt --- old/osprofiler-3.4.2/test-requirements.txt 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/test-requirements.txt 2022-05-05 11:53:10.000000000 +0200 @@ -5,9 +5,7 @@ ddt>=1.0.1 # MIT stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT - -openstackdocstheme>=2.2.1 # Apache-2.0 -sphinx>=2.0.0,!=2.1.0 # BSD +docutils>=0.14 # OSI-Approved Open Source, Public Domain # Bandit security code scanner bandit>=1.6.0,<1.7.0 # Apache-2.0 @@ -20,9 +18,6 @@ # Redis python client redis>=2.10.0 # MIT -# Build release notes -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.4.2/tox.ini new/osprofiler-3.4.3/tox.ini --- old/osprofiler-3.4.2/tox.ini 2021-09-06 10:39:16.000000000 +0200 +++ new/osprofiler-3.4.3/tox.ini 2022-05-05 11:53:10.000000000 +0200 @@ -1,5 +1,5 @@ [tox] -minversion = 3.1.0 +minversion = 3.18.0 # Needed to create ChangeLog for docs building skipsdist = False envlist = py3,pep8 @@ -12,7 +12,7 @@ LANGUAGE=en_US:en LC_ALL=C deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt usedevelop = True @@ -52,7 +52,13 @@ coverage xml -o cover/coverage.xml [testenv:docs] +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/doc/requirements.txt +allowlist_externals = rm commands = + rm -rf doc/build api-guide/build api-ref/build doc/source/contributor/modules sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html [testenv:bandit] @@ -83,7 +89,13 @@ paths = ./osprofiler/hacking [testenv:releasenotes] -commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt +allowlist_externals = rm +commands = + rm -rf releasenotes/build + sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] deps =