Hello community,
here is the log from the commit of package python-oslo.utils for
openSUSE:Factory checked in at 2020-10-26 16:17:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.utils (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.utils.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.utils"
Mon Oct 26 16:17:22 2020 rev:23 rq:841219 version:4.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-oslo.utils/python-oslo.utils.changes
2020-08-10 15:06:44.720277578 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.utils.new.3463/python-oslo.utils.changes
2020-10-26 16:18:01.611017820 +0100
@@ -1,0 +2,24 @@
+Fri Oct 9 19:18:13 UTC 2020 - [email protected]
+
+- update to version 4.6.0
+ - Remove monotonic usage
+ - Fix is_same_callback() testing for python3.8
+ - Switch to newer openstackdocstheme and reno versions
+ - Fix hacking min version to 3.0.1
+ - versionutils: switch from pkg_resources to packaging
+ - Fix uuidsentinel to follow getattr protocol
+ - Add util methods for checking json and yaml formatted file
+ - Align contributing doc with oslo's policy
+ - Remove the unused coding style modules
+ - Remove translation sections from setup.cfg
+ - Imported Translations from Zanata
+ - Add release notes links to doc index
+ - Bump bandit version
+ - Fix pygments style
+ - Release greenthread when computing checksum
+ - Update master for stable/ussuri
+ - Stop to use the __future__ module.
+ - New method in netutils: get_mac_addr_by_ipv6
+ - [goal] Migrate testing to ubuntu focal
+
+-------------------------------------------------------------------
Old:
----
oslo.utils-4.1.2.tar.gz
New:
----
oslo.utils-4.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.utils.spec ++++++
--- /var/tmp/diff_new_pack.ExDLco/_old 2020-10-26 16:18:02.743018730 +0100
+++ /var/tmp/diff_new_pack.ExDLco/_new 2020-10-26 16:18:02.759018743 +0100
@@ -17,13 +17,13 @@
Name: python-oslo.utils
-Version: 4.1.2
+Version: 4.6.0
Release: 0
Summary: OpenStack Utils Library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.utils
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.utils/oslo.utils-4.1.2.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.utils/oslo.utils-4.6.0.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-Babel
BuildRequires: python3-ddt
@@ -76,7 +76,7 @@
Documentation for OpenStack utils library.
%prep
-%autosetup -p1 -n oslo.utils-4.1.2
+%autosetup -p1 -n oslo.utils-4.6.0
%py_req_cleanup
@@ -87,7 +87,7 @@
%py3_install
# generate html docs
-PBR_VERSION=4.1.2 %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=4.6.0 %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ExDLco/_old 2020-10-26 16:18:02.791018769 +0100
+++ /var/tmp/diff_new_pack.ExDLco/_new 2020-10-26 16:18:02.795018772 +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/oslo.utils/oslo.utils.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/oslo.utils/oslo.utils.spec.j2</param>
<param name="output-name">python-oslo.utils.spec</param>
- <param
name="requirements">https://opendev.org/openstack/oslo.utils/raw/branch/stable/ussuri/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.utils/raw/branch/stable/victoria/requirements.txt</param>
<param name="changelog-email">[email protected]</param>
<param name="changelog-provider">gh,openstack,oslo.utils</param>
</service>
++++++ oslo.utils-4.1.2.tar.gz -> oslo.utils-4.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/AUTHORS new/oslo.utils-4.6.0/AUTHORS
--- old/oslo.utils-4.1.2/AUTHORS 2020-07-02 12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/AUTHORS 2020-09-11 21:24:01.000000000 +0200
@@ -17,8 +17,10 @@
Andreas Jaeger <[email protected]>
Angus Lees <[email protected]>
Ann Kamyshnikova <[email protected]>
+Balazs Gibizer <[email protected]>
Ben Nemec <[email protected]>
Ben Nemec <[email protected]>
+Bence Romsics <[email protected]>
Bin Zhou <[email protected]>
Brant Knudson <[email protected]>
BubaVV <[email protected]>
@@ -92,6 +94,7 @@
Matthew Booth <[email protected]>
Mehdi Abaakouk <[email protected]>
Michael Wilson <[email protected]>
+Moisés Guimarães de Medeiros <[email protected]>
Monty Taylor <[email protected]>
Morgan Fainberg <[email protected]>
Nguyen Hung Phuong <[email protected]>
@@ -166,5 +169,6 @@
sridhargaddam <[email protected]>
sunyandi <[email protected]>
yenai <[email protected]>
+zhangboye <[email protected]>
zhangsong <[email protected]>
zhengyao1 <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/CONTRIBUTING.rst
new/oslo.utils-4.6.0/CONTRIBUTING.rst
--- old/oslo.utils-4.1.2/CONTRIBUTING.rst 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/CONTRIBUTING.rst 2020-09-11 21:22:56.000000000
+0200
@@ -1,3 +1,8 @@
+If you would like to contribute to the development of oslo's libraries,
+first you must take a look to this page:
+
+
https://specs.openstack.org/openstack/oslo-specs/specs/policy/contributing.html
+
If you would like to contribute to the development of OpenStack,
you must follow the steps in this page:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/ChangeLog
new/oslo.utils-4.6.0/ChangeLog
--- old/oslo.utils-4.1.2/ChangeLog 2020-07-02 12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/ChangeLog 2020-09-11 21:24:00.000000000 +0200
@@ -1,12 +1,52 @@
CHANGES
=======
-4.1.2
+4.6.0
+-----
+
+* [goal] Migrate testing to ubuntu focal
+* Fix is\_same\_callback() testing for python3.8
+
+4.5.0
+-----
+
+* Add util methods for checking json and yaml formatted file
+* Bump bandit version
+
+4.4.0
+-----
+
+
+4.3.0
+-----
+
+* versionutils: switch from pkg\_resources to packaging
+* New method in netutils: get\_mac\_addr\_by\_ipv6
+
+4.2.2
+-----
+
+* Fix uuidsentinel to follow getattr protocol
+
+4.2.1
-----
* Release greenthread when computing checksum
-* Update TOX/UPPER\_CONSTRAINTS\_FILE for stable/ussuri
-* Update .gitreview for stable/ussuri
+* Fix pygments style
+
+4.2.0
+-----
+
+* Stop to use the \_\_future\_\_ module
+* Fix hacking min version to 3.0.1
+* Switch to newer openstackdocstheme and reno versions
+* Remove the unused coding style modules
+* Remove translation sections from setup.cfg
+* Remove monotonic usage
+* Align contributing doc with oslo's policy
+* Imported Translations from Zanata
+* Add release notes links to doc index
+* Update master for stable/ussuri
4.1.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/PKG-INFO
new/oslo.utils-4.6.0/PKG-INFO
--- old/oslo.utils-4.1.2/PKG-INFO 2020-07-02 12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/PKG-INFO 2020-09-11 21:24:01.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.utils
-Version: 4.1.2
+Version: 4.6.0
Summary: Oslo Utility library
Home-page: https://docs.openstack.org/oslo.utils/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/babel.cfg
new/oslo.utils-4.6.0/babel.cfg
--- old/oslo.utils-4.1.2/babel.cfg 2020-07-02 12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/babel.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[python: **.py]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/doc/requirements.txt
new/oslo.utils-4.6.0/doc/requirements.txt
--- old/oslo.utils-4.1.2/doc/requirements.txt 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/doc/requirements.txt 2020-09-11 21:22:56.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.
# this is required for the docs build jobs
-sphinx>=1.8.0,!=2.1.0 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/doc/source/conf.py
new/oslo.utils-4.6.0/doc/source/conf.py
--- old/oslo.utils-4.1.2/doc/source/conf.py 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/doc/source/conf.py 2020-09-11 21:22:56.000000000
+0200
@@ -26,9 +26,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.utils'
-bug_project = 'oslo.utils'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.utils'
+openstackdocs_bug_project = 'oslo.utils'
+openstackdocs_bug_tag = ''
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
@@ -52,7 +52,7 @@
add_module_names = True
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# -- Options for HTML output --------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/doc/source/index.rst
new/oslo.utils-4.6.0/doc/source/index.rst
--- old/oslo.utils-4.1.2/doc/source/index.rst 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/doc/source/index.rst 2020-09-11 21:22:56.000000000
+0200
@@ -5,6 +5,9 @@
The `Oslo`_ utils library provides support for common utility type functions,
such as encoding, exception handling, string manipulation, and time handling.
+Contents
+========
+
.. toctree::
:maxdepth: 1
@@ -13,7 +16,15 @@
reference/index
contributor/index
-.. rubric:: Indices and tables
+Release Notes
+=============
+
+Read also the `oslo.utils Release Notes
+<https://docs.openstack.org/releasenotes/oslo.utils/>`_.
+
+
+Indices and tables
+==================
* :ref:`genindex`
* :ref:`modindex`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/lower-constraints.txt
new/oslo.utils-4.6.0/lower-constraints.txt
--- old/oslo.utils-4.1.2/lower-constraints.txt 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/lower-constraints.txt 2020-09-11 21:22:56.000000000
+0200
@@ -13,19 +13,19 @@
iso8601==0.1.11
keystoneauth1==3.4.0
linecache2==1.0.0
-mccabe==0.2.1
netaddr==0.7.18
netifaces==0.10.4
os-client-config==1.28.0
oslo.config==5.2.0
oslo.i18n==3.15.3
oslotest==3.2.0
+packaging==20.4
pbr==2.0.0
pyparsing==2.1.0
python-mimeparse==1.6.0
python-subunit==1.0.0
pytz==2013.6
-PyYAML==3.12
+PyYAML==3.13
requests==2.14.2
requestsexceptions==1.2.0
rfc3986==0.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo.utils.egg-info/PKG-INFO
new/oslo.utils-4.6.0/oslo.utils.egg-info/PKG-INFO
--- old/oslo.utils-4.1.2/oslo.utils.egg-info/PKG-INFO 2020-07-02
12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo.utils.egg-info/PKG-INFO 2020-09-11
21:24:01.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.utils
-Version: 4.1.2
+Version: 4.6.0
Summary: Oslo Utility library
Home-page: https://docs.openstack.org/oslo.utils/latest/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo.utils.egg-info/SOURCES.txt
new/oslo.utils-4.6.0/oslo.utils.egg-info/SOURCES.txt
--- old/oslo.utils-4.1.2/oslo.utils.egg-info/SOURCES.txt 2020-07-02
12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo.utils.egg-info/SOURCES.txt 2020-09-11
21:24:01.000000000 +0200
@@ -8,7 +8,6 @@
HACKING.rst
LICENSE
README.rst
-babel.cfg
bindep.txt
lower-constraints.txt
requirements.txt
@@ -94,12 +93,14 @@
oslo_utils/tests/fake/__init__.py
oslo_utils/tests/fake/v2/__init__.py
oslo_utils/tests/fake/v2/dummpy.py
+releasenotes/notes/add-methods-for-json-yaml-file-check-746dca0a11c2f9c9.yaml
releasenotes/notes/add-reno-350f5f34f794fb5e.yaml
releasenotes/notes/bump-up-port-range-f774a16336158339.yaml
releasenotes/notes/drop-python27-support-f97f680651693b47.yaml
releasenotes/notes/image-utils-handle-scientific-notation-6f65d46e9c8c8f8c.yaml
releasenotes/notes/mask-dict-passwords-99357ffb7972fb0b.yaml
releasenotes/notes/mask-password-patterns-f41524069b8ae488.yaml
+releasenotes/notes/netutils-get_mac_addr_by_ipv6-c3ce6a35a69f7c2b.yaml
releasenotes/source/conf.py
releasenotes/source/index.rst
releasenotes/source/newton.rst
@@ -110,6 +111,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
releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo.utils.egg-info/pbr.json
new/oslo.utils-4.6.0/oslo.utils.egg-info/pbr.json
--- old/oslo.utils-4.1.2/oslo.utils.egg-info/pbr.json 2020-07-02
12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo.utils.egg-info/pbr.json 2020-09-11
21:24:01.000000000 +0200
@@ -1 +1 @@
-{"git_version": "eeb7b10", "is_release": true}
\ No newline at end of file
+{"git_version": "91497da", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo.utils.egg-info/requires.txt
new/oslo.utils-4.6.0/oslo.utils.egg-info/requires.txt
--- old/oslo.utils-4.1.2/oslo.utils.egg-info/requires.txt 2020-07-02
12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo.utils.egg-info/requires.txt 2020-09-11
21:24:01.000000000 +0200
@@ -3,6 +3,7 @@
netaddr>=0.7.18
netifaces>=0.10.4
oslo.i18n>=3.15.3
+packaging>=20.4
pbr!=2.1.0,>=2.0.0
pyparsing>=2.1.0
pytz>=2013.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/fileutils.py
new/oslo.utils-4.6.0/oslo_utils/fileutils.py
--- old/oslo.utils-4.1.2/oslo_utils/fileutils.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/fileutils.py 2020-09-11
21:22:56.000000000 +0200
@@ -22,10 +22,12 @@
import contextlib
import errno
import hashlib
+import json
import os
import stat
import tempfile
import time
+import yaml
from oslo_utils import excutils
@@ -158,3 +160,50 @@
raise
unread_bytes = fp.tell()
return (fp.read(), unread_bytes)
+
+
+def is_json(file_path):
+ """Check if file is of json type or not.
+
+ This function try to load the input file using json.loads()
+ and return False if ValueError otherwise True.
+
+ :param file_path: The file path to check
+
+ :returns: bool
+
+ """
+ with open(file_path, 'r') as fh:
+ data = fh.read()
+ try:
+ json.loads(data)
+ return True
+ except ValueError:
+ return False
+
+
+def is_yaml(file_path):
+ """Check if file is of yaml type or not.
+
+ This function try to load the input file using yaml.safe_load()
+ and return True if loadable. Because every json file can be loadable
+ in yaml, so this function return False if file is loadable using
+ json.loads() means it is json file.
+
+ :param file_path: The file path to check
+
+ :returns: bool
+
+ """
+ with open(file_path, 'r') as fh:
+ data = fh.read()
+ is_yaml = False
+ try:
+ json.loads(data)
+ except ValueError:
+ try:
+ yaml.safe_load(data)
+ is_yaml = True
+ except yaml.scanner.ScannerError:
+ pass
+ return is_yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/fixture.py
new/oslo.utils-4.6.0/oslo_utils/fixture.py
--- old/oslo.utils-4.1.2/oslo_utils/fixture.py 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/oslo_utils/fixture.py 2020-09-11 21:22:56.000000000
+0200
@@ -79,7 +79,7 @@
def __getattr__(self, name):
if name.startswith('_'):
- raise ValueError('Sentinels must not start with _')
+ raise AttributeError('Sentinels must not start with _')
with self._lock:
if name not in self._sentinels:
self._sentinels[name] = uuidutils.generate_uuid()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/fnmatch.py
new/oslo.utils-4.6.0/oslo_utils/fnmatch.py
--- old/oslo.utils-4.1.2/oslo_utils/fnmatch.py 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/oslo_utils/fnmatch.py 2020-09-11 21:22:56.000000000
+0200
@@ -19,8 +19,6 @@
.. versionadded:: 3.3
"""
-from __future__ import absolute_import
-
import fnmatch as standard_fnmatch
import os
import posixpath
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/netutils.py
new/oslo.utils-4.6.0/oslo_utils/netutils.py
--- old/oslo.utils-4.1.2/oslo_utils/netutils.py 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/oslo_utils/netutils.py 2020-09-11 21:22:56.000000000
+0200
@@ -193,6 +193,35 @@
'EUI-64: %s') % prefix)
+def get_mac_addr_by_ipv6(ipv6, dialect=netaddr.mac_unix_expanded):
+ """Extract MAC address from interface identifier based IPv6 address.
+
+ For example from link-local addresses (fe80::/10) generated from MAC.
+
+ :param ipv6: An interface identifier (i.e. mostly MAC) based IPv6
+ address as a netaddr.IPAddress() object.
+ :param dialect: The netaddr dialect of the the object returned.
+ Defaults to netaddr.mac_unix_expanded.
+ :returns: A MAC address as a netaddr.EUI() object.
+
+ See also:
+ * https://tools.ietf.org/html/rfc4291#appendix-A
+ * https://tools.ietf.org/html/rfc4291#section-2.5.6
+
+ .. versionadded:: 4.3.0
+ """
+ return netaddr.EUI(int(
+ # out of the lowest 8 bytes (byte positions 8-1)
+ # delete the middle 2 bytes (5-4, 0xff_fe)
+ # by shifting the highest 3 bytes to the right by 2 bytes (8-6 -> 6-4)
+ (((ipv6 & 0xff_ff_ff_00_00_00_00_00) >> 16) +
+ # adding the lowest 3 bytes as they are (3-1)
+ (ipv6 & 0xff_ff_ff)) ^
+ # then invert the universal/local bit
+ 0x02_00_00_00_00_00),
+ dialect=dialect)
+
+
def is_ipv6_enabled():
"""Check if IPv6 support is enabled on the platform.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/reflection.py
new/oslo.utils-4.6.0/oslo_utils/reflection.py
--- old/oslo.utils-4.1.2/oslo_utils/reflection.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/reflection.py 2020-09-11
21:22:56.000000000 +0200
@@ -21,6 +21,7 @@
"""
import inspect
+import logging
import types
import six
@@ -35,6 +36,10 @@
# others)...
_BUILTIN_MODULES = ('builtins', '__builtin__', '__builtins__', 'exceptions')
+
+LOG = logging.getLogger(__name__)
+
+
if six.PY3:
Parameter = inspect.Parameter
Signature = inspect.Signature
@@ -164,19 +169,39 @@
def is_same_callback(callback1, callback2, strict=True):
- """Returns if the two callbacks are the same."""
+ """Returns if the two callbacks are the same.
+
+ 'strict' arg has no meaning for python 3.8 onwards and will
+ always return the equality of both callback based on 'self'
+ comparison only.
+ """
if callback1 is callback2:
# This happens when plain methods are given (or static/non-bound
# methods).
return True
if callback1 == callback2:
+ # NOTE(gmann): python3.8 onward, comparison of bound methods is
+ # changed. It no longer decide the bound method's equality based
+ # on their bounded objects equality instead it checks the identity
+ # of their '__self__'. So python3.8 onward, two different bound
+ # methods are no longer equal even __eq__ method return True.
+ # Or in other term, 'strict' arg has no meaning from python 3.8
+ # onwards above if condition never satisfy if both callback are
+ # bounded to two different objects.
+ # For backward compatibility for python <3.8, we can keep the 'strict'
+ # arg and the below code of comparing 'self' and once minimum
+ # supported python version is 3.8 we can remove both because python
+ # 3.8 onward == operator itself checks identity of 'self'.
+ # Ref bug: https://bugs.launchpad.net/oslo.utils/+bug/1841072
if not strict:
+ LOG.warning('"strict" arg is deprecated because it no '
+ 'longer work for python 3.8 onwards')
return True
- # Two bound methods are equal if functions themselves are equal and
- # objects they are applied to are equal. This means that a bound
- # method could be the same bound method on another object if the
- # objects have __eq__ methods that return true (when in fact it is a
- # different bound method). Python u so crazy!
+ # Until python 3.7, two bound methods are equal if functions
+ # themselves are equal and objects they are applied to are equal.
+ # This means that a bound method could be the same bound method on
+ # another object if the objects have __eq__ methods that return true
+ # (when in fact it is a different bound method). Python u so crazy!
try:
self1 = six.get_method_self(callback1)
self2 = six.get_method_self(callback2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/tests/test_fileutils.py
new/oslo.utils-4.6.0/oslo_utils/tests/test_fileutils.py
--- old/oslo.utils-4.1.2/oslo_utils/tests/test_fileutils.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/tests/test_fileutils.py 2020-09-11
21:22:56.000000000 +0200
@@ -15,6 +15,7 @@
import errno
import hashlib
+import json
import os
import shutil
import stat
@@ -22,13 +23,13 @@
import time
from unittest import mock
import uuid
+import yaml
from oslotest import base as test_base
import six
from oslo_utils import fileutils
-
TEST_PERMISSIONS = stat.S_IRWXU
@@ -289,3 +290,30 @@
def test_non_exist_file(self):
self.assertRaises(IOError, fileutils.last_bytes,
'non_exist_file', 1000)
+
+
+class FileTypeTestCase(test_base.BaseTestCase):
+ """Test the is_yaml() and is_json() utility methods."""
+
+ def setUp(self):
+ super(FileTypeTestCase, self).setUp()
+ data = {
+ 'name': 'test',
+ 'website': 'example.com'
+ }
+ temp_dir = tempfile.mkdtemp()
+ self.json_file = tempfile.mktemp(dir=temp_dir)
+ self.yaml_file = tempfile.mktemp(dir=temp_dir)
+
+ with open(self.json_file, 'w') as fh:
+ json.dump(data, fh)
+ with open(self.yaml_file, 'w') as fh:
+ yaml.dump(data, fh)
+
+ def test_is_json(self):
+ self.assertTrue(fileutils.is_json(self.json_file))
+ self.assertFalse(fileutils.is_json(self.yaml_file))
+
+ def test_is_yaml(self):
+ self.assertTrue(fileutils.is_yaml(self.yaml_file))
+ self.assertFalse(fileutils.is_yaml(self.json_file))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/tests/test_fixture.py
new/oslo.utils-4.6.0/oslo_utils/tests/test_fixture.py
--- old/oslo.utils-4.1.2/oslo_utils/tests/test_fixture.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/tests/test_fixture.py 2020-09-11
21:22:56.000000000 +0200
@@ -80,5 +80,5 @@
self.assertIsInstance(uuids.foo, str)
def test_with_underline_prefix(self):
- ex = self.assertRaises(ValueError, getattr, uuids, '_foo')
+ ex = self.assertRaises(AttributeError, getattr, uuids, '_foo')
self.assertIn("Sentinels must not start with _", six.text_type(ex))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/tests/test_fnmatch.py
new/oslo.utils-4.6.0/oslo_utils/tests/test_fnmatch.py
--- old/oslo.utils-4.1.2/oslo_utils/tests/test_fnmatch.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/tests/test_fnmatch.py 2020-09-11
21:22:56.000000000 +0200
@@ -10,8 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-from __future__ import absolute_import
-
import fnmatch as standard_fnmatch
import ntpath
import posixpath
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/tests/test_netutils.py
new/oslo.utils-4.6.0/oslo_utils/tests/test_netutils.py
--- old/oslo.utils-4.1.2/oslo_utils/tests/test_netutils.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/tests/test_netutils.py 2020-09-11
21:22:56.000000000 +0200
@@ -17,6 +17,7 @@
import socket
from unittest import mock
+import netaddr
import netifaces
from oslotest import base as test_base
import six
@@ -357,6 +358,38 @@
netutils.get_ipv6_addr_by_EUI64(prefix, mac))
+class MACbyIPv6TestCase(test_base.BaseTestCase):
+ """Unit tests to extract MAC from IPv6."""
+
+ def test_reverse_generate_IPv6_by_EUI64(self):
+ self.assertEqual(
+ netaddr.EUI('00:16:3e:33:44:55'),
+ netutils.get_mac_addr_by_ipv6(
+ netaddr.IPAddress('2001:db8::216:3eff:fe33:4455')),
+ )
+
+ def test_random_qemu_mac(self):
+ self.assertEqual(
+ netaddr.EUI('52:54:00:42:02:19'),
+ netutils.get_mac_addr_by_ipv6(
+ netaddr.IPAddress('fe80::5054:ff:fe42:219')),
+ )
+
+ def test_local(self):
+ self.assertEqual(
+ netaddr.EUI('02:00:00:00:00:00'),
+ netutils.get_mac_addr_by_ipv6(
+ netaddr.IPAddress('fe80::ff:fe00:0')),
+ )
+
+ def test_universal(self):
+ self.assertEqual(
+ netaddr.EUI('00:00:00:00:00:00'),
+ netutils.get_mac_addr_by_ipv6(
+ netaddr.IPAddress('fe80::200:ff:fe00:0')),
+ )
+
+
@contextlib.contextmanager
def mock_file_content(content):
# Allows StringIO to act like a context manager-enabled file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/tests/test_reflection.py
new/oslo.utils-4.6.0/oslo_utils/tests/test_reflection.py
--- old/oslo.utils-4.1.2/oslo_utils/tests/test_reflection.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/tests/test_reflection.py 2020-09-11
21:22:56.000000000 +0200
@@ -14,6 +14,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+import sys
+
from oslotest import base as test_base
import six
import testtools
@@ -153,7 +155,16 @@
c = A()
self.assertFalse(reflection.is_same_callback(b.b, c.b))
- self.assertTrue(reflection.is_same_callback(b.b, c.b, strict=False))
+ # NOTE(gmann): python3.8 onwards, comparision of bound methods is
+ # changed and 'strict' arg has no meaning.
+ # Ref bug: https://bugs.launchpad.net/oslo.utils/+bug/1841072
+ if sys.version_info < (3, 8):
+ self.assertTrue(reflection.is_same_callback(b.b, c.b,
+ strict=False))
+ else:
+ self.assertFalse(reflection.is_same_callback(b.b, c.b,
+ strict=False))
+ self.assertTrue(reflection.is_same_callback(b.b, b.b))
class BoundMethodTest(test_base.BaseTestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/timeutils.py
new/oslo.utils-4.6.0/oslo_utils/timeutils.py
--- old/oslo.utils-4.1.2/oslo_utils/timeutils.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/timeutils.py 2020-09-11
21:22:56.000000000 +0200
@@ -29,11 +29,6 @@
from oslo_utils import reflection
-if hasattr(time, 'monotonic'):
- now = time.monotonic
-else:
- from monotonic import monotonic as now # noqa
-
# ISO 8601 extended time format with microseconds
_ISO8601_TIME_FORMAT_SUBSECOND = '%Y-%m-%dT%H:%M:%S.%f'
_ISO8601_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S'
@@ -41,6 +36,8 @@
_MAX_DATETIME_SEC = 59
+now = time.monotonic
+
@removals.remove(
message="use datetime.datetime.isoformat()",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/oslo_utils/versionutils.py
new/oslo.utils-4.6.0/oslo_utils/versionutils.py
--- old/oslo.utils-4.1.2/oslo_utils/versionutils.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/oslo_utils/versionutils.py 2020-09-11
21:22:56.000000000 +0200
@@ -19,7 +19,7 @@
.. versionadded:: 1.6
"""
-import pkg_resources
+import packaging.version
import six
from oslo_utils._i18n import _
@@ -39,17 +39,14 @@
True.
:returns: True if compatible, False if not
"""
- requested_parts = pkg_resources.parse_version(requested_version)
- current_parts = pkg_resources.parse_version(current_version)
+ requested = packaging.version.Version(requested_version)
+ current = packaging.version.Version(current_version)
if same_major:
- # NOTE(jlvillal) pkg_resources issues a warning if we try to access
- # portions of the version, for example requested_parts[0] will issue a
- # warning message. So get the major_version from the string instead.
- if requested_version.split('.')[0] != current_version.split('.')[0]:
+ if requested.major != current.major:
return False
- return current_parts >= requested_parts
+ return current >= requested
def convert_version_to_int(version):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.utils-4.1.2/releasenotes/notes/add-methods-for-json-yaml-file-check-746dca0a11c2f9c9.yaml
new/oslo.utils-4.6.0/releasenotes/notes/add-methods-for-json-yaml-file-check-746dca0a11c2f9c9.yaml
---
old/oslo.utils-4.1.2/releasenotes/notes/add-methods-for-json-yaml-file-check-746dca0a11c2f9c9.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.utils-4.6.0/releasenotes/notes/add-methods-for-json-yaml-file-check-746dca0a11c2f9c9.yaml
2020-09-11 21:22:56.000000000 +0200
@@ -0,0 +1,6 @@
+---
+features:
+ - |
+ New method ``is_json`` ``is_yaml`` added in fileutils.
+ These can be used to check if file is JSON or YAML
+ formatted.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.utils-4.1.2/releasenotes/notes/netutils-get_mac_addr_by_ipv6-c3ce6a35a69f7c2b.yaml
new/oslo.utils-4.6.0/releasenotes/notes/netutils-get_mac_addr_by_ipv6-c3ce6a35a69f7c2b.yaml
---
old/oslo.utils-4.1.2/releasenotes/notes/netutils-get_mac_addr_by_ipv6-c3ce6a35a69f7c2b.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/oslo.utils-4.6.0/releasenotes/notes/netutils-get_mac_addr_by_ipv6-c3ce6a35a69f7c2b.yaml
2020-09-11 21:22:56.000000000 +0200
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ New method ``netutils.get_mac_addr_by_ipv6(ipv6, dialect)`` extracts
+ the MAC address from IPv6 addresses generated from MACs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/releasenotes/source/conf.py
new/oslo.utils-4.6.0/releasenotes/source/conf.py
--- old/oslo.utils-4.1.2/releasenotes/source/conf.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/releasenotes/source/conf.py 2020-09-11
21:22:56.000000000 +0200
@@ -40,9 +40,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.utils'
-bug_project = 'oslo.utils'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.utils'
+openstackdocs_bug_project = 'oslo.utils'
+openstackdocs_bug_tag = ''
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -96,7 +96,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 = []
@@ -231,7 +231,6 @@
# If true, show URL addresses after external links.
# man_show_urls = False
-
# -- Options for Texinfo output -------------------------------------------
# Grouping the document tree into Texinfo files. List of tuples
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/releasenotes/source/index.rst
new/oslo.utils-4.6.0/releasenotes/source/index.rst
--- old/oslo.utils-4.1.2/releasenotes/source/index.rst 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/releasenotes/source/index.rst 2020-09-11
21:22:56.000000000 +0200
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ ussuri
train
stein
rocky
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.utils-4.1.2/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
new/oslo.utils-4.6.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
---
old/oslo.utils-4.1.2/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2020-07-02 12:19:00.000000000 +0200
+++
new/oslo.utils-4.6.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
2020-09-11 21:22:56.000000000 +0200
@@ -1,14 +1,15 @@
# Andi Chandler <[email protected]>, 2017. #zanata
# Andi Chandler <[email protected]>, 2018. #zanata
+# Andi Chandler <[email protected]>, 2020. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: oslo.utils Release Notes\n"
+"Project-Id-Version: oslo.utils\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-09 13:01+0000\n"
+"POT-Creation-Date: 2020-04-14 11:54+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2018-02-06 11:26+0000\n"
+"PO-Revision-Date: 2020-04-27 08:23+0000\n"
"Last-Translator: Andi Chandler <[email protected]>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en_GB\n"
@@ -21,6 +22,40 @@
msgid "3.18.0"
msgstr "3.18.0"
+msgid "3.36.5"
+msgstr "3.36.5"
+
+msgid "3.40.5"
+msgstr "3.40.5"
+
+msgid "3.40.6"
+msgstr "3.40.6"
+
+msgid "3.41.3"
+msgstr "3.41.3"
+
+msgid "3.41.4"
+msgstr "3.41.4"
+
+msgid "3.41.5"
+msgstr "3.41.5"
+
+msgid "3.42.1"
+msgstr "3.42.1"
+
+msgid "4.0.0"
+msgstr "4.0.0"
+
+msgid "4.1.0"
+msgstr "4.1.0"
+
+msgid ""
+"Additional password names were included from real world logs that contained "
+"sensitive information."
+msgstr ""
+"Additional password names were included from real world logs that contained "
+"sensitive information."
+
msgid "Bug Fixes"
msgstr "Bug Fixes"
@@ -30,6 +65,13 @@
msgid "Introduce reno for deployer release notes."
msgstr "Introduce Reno for developer release notes."
+msgid ""
+"It also ensures that some fancy names with a common base, but added number "
+"are actually taken care of."
+msgstr ""
+"It also ensures that some fancy names with a common base, but added number "
+"are actually taken care of."
+
msgid "Newton Series Release Notes"
msgstr "Newton Series Release Notes"
@@ -45,8 +87,59 @@
msgid "Queens Series Release Notes"
msgstr "Queens Series Release Notes"
+msgid "Rocky Series Release Notes"
+msgstr "Rocky Series Release Notes"
+
+msgid "Security Issues"
+msgstr "Security Issues"
+
+msgid "Stein Series Release Notes"
+msgstr "Stein Series Release Notes"
+
+msgid ""
+"Support for Python 2.7 has been dropped. The minimum version of Python now "
+"supported is Python 3.6."
+msgstr ""
+"Support for Python 2.7 has been dropped. The minimum version of Python now "
+"supported is Python 3.6."
+
+msgid ""
+"This patch ensures that we mask sensitive data when masking dicts, even if "
+"the case doesn't match. This means the behaviour of mask_password and "
+"mask_dict_password is now the same."
+msgstr ""
+"This patch ensures that we mask sensitive data when masking dicts, even if "
+"the case doesn't match. This means the behaviour of mask_password and "
+"mask_dict_password is now the same."
+
+msgid ""
+"This patch ensures we actually mask sensitive data, even if case doesn't "
+"match the static entry we have in the patterns."
+msgstr ""
+"This patch ensures we actually mask sensitive data, even if case doesn't "
+"match the static entry we have in the patterns."
+
+msgid "Train Series Release Notes"
+msgstr "Train Series Release Notes"
+
msgid "Unreleased Release Notes"
msgstr "Unreleased Release Notes"
+msgid "Upgrade Notes"
+msgstr "Upgrade Notes"
+
+msgid "Ussuri Series Release Notes"
+msgstr "Ussuri Series Release Notes"
+
+msgid "https://bugs.launchpad.net/tripleo/+bug/1850843";
+msgstr "https://bugs.launchpad.net/tripleo/+bug/1850843";
+
msgid "oslo.utils Release Notes"
msgstr "oslo.utils Release Notes"
+
+msgid ""
+"qemu 4.1.0 output shifts to scientific notation at 1000mb, breaking oslo."
+"utils. ``QemuImgInfo`` is now fixed to support this notation."
+msgstr ""
+"QEMU 4.1.0 output shifts to scientific notation at 1000MB, breaking oslo."
+"utils. ``QemuImgInfo`` is now fixed to support this notation."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/releasenotes/source/ussuri.rst
new/oslo.utils-4.6.0/releasenotes/source/ussuri.rst
--- old/oslo.utils-4.1.2/releasenotes/source/ussuri.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.utils-4.6.0/releasenotes/source/ussuri.rst 2020-09-11
21:22:56.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/oslo.utils-4.1.2/requirements.txt
new/oslo.utils-4.6.0/requirements.txt
--- old/oslo.utils-4.1.2/requirements.txt 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/requirements.txt 2020-09-11 21:22:56.000000000
+0200
@@ -16,3 +16,4 @@
netifaces>=0.10.4 # MIT
debtcollector>=1.2.0 # Apache-2.0
pyparsing>=2.1.0 # MIT
+packaging>=20.4 # BSD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/setup.cfg
new/oslo.utils-4.6.0/setup.cfg
--- old/oslo.utils-4.1.2/setup.cfg 2020-07-02 12:20:25.000000000 +0200
+++ new/oslo.utils-4.6.0/setup.cfg 2020-09-11 21:24:01.000000000 +0200
@@ -24,20 +24,6 @@
packages =
oslo_utils
-[compile_catalog]
-directory = oslo_utils/locale
-domain = oslo_utils
-
-[update_catalog]
-domain = oslo_utils
-output_dir = oslo_utils/locale
-input_file = oslo_utils/locale/oslo_utils.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = oslo_utils/locale/oslo_utils.pot
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/test-requirements.txt
new/oslo.utils-4.6.0/test-requirements.txt
--- old/oslo.utils-4.1.2/test-requirements.txt 2020-07-02 12:19:00.000000000
+0200
+++ new/oslo.utils-4.6.0/test-requirements.txt 2020-09-11 21:22:56.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>=3.0,<3.1.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
eventlet>=0.18.2,!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
@@ -21,4 +21,4 @@
oslo.config>=5.2.0 # Apache-2.0
# Bandit security code scanner
-bandit>=1.1.0,<1.6.0 # Apache-2.0
+bandit>=1.6.0,<1.7.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/tools/perf_test_mask_password.py
new/oslo.utils-4.6.0/tools/perf_test_mask_password.py
--- old/oslo.utils-4.1.2/tools/perf_test_mask_password.py 2020-07-02
12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/tools/perf_test_mask_password.py 2020-09-11
21:22:56.000000000 +0200
@@ -16,8 +16,6 @@
"""Performance tests for mask_password.
"""
-from __future__ import print_function
-
import timeit
from oslo_utils import strutils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.utils-4.1.2/tox.ini new/oslo.utils-4.6.0/tox.ini
--- old/oslo.utils-4.1.2/tox.ini 2020-07-02 12:19:00.000000000 +0200
+++ new/oslo.utils-4.6.0/tox.ini 2020-09-11 21:22:56.000000000 +0200
@@ -6,7 +6,7 @@
[testenv]
basepython = python3
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands = stestr run --slowest {posargs}
@@ -23,7 +23,7 @@
[testenv:docs]
whitelist_externals = rm
deps =
-
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
rm -fr doc/build
