Hello community,
here is the log from the commit of package python-oslo.middleware for
openSUSE:Factory checked in at 2020-10-26 16:16:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-oslo.middleware (Old)
and /work/SRC/openSUSE:Factory/.python-oslo.middleware.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.middleware"
Mon Oct 26 16:16:53 2020 rev:16 rq:841212 version:4.1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-oslo.middleware/python-oslo.middleware.changes
2020-06-05 20:16:39.427078197 +0200
+++
/work/SRC/openSUSE:Factory/.python-oslo.middleware.new.3463/python-oslo.middleware.changes
2020-10-26 16:17:34.738996205 +0100
@@ -1,0 +2,20 @@
+Fri Oct 9 19:17:27 UTC 2020 - cloud-de...@suse.de
+
+- update to version 4.1.1
+ - Remove the unused coding style modules
+ - Update master for stable/ussuri
+ - Stop to use the __future__ module.
+ - Remove translation sections from setup.cfg
+ - Fix pygments style
+ - Cleanup py27 support
+ - Add py38 package metadata
+ - Fix hacking min version to 3.0.1
+ - Add Python3 victoria unit tests
+ - Align contributing doc with oslo's policy
+ - Bump bandit version
+ - Add release notes links to doc index
+ - Switch to newer openstackdocstheme and reno versions
+ - Drop use of six
+ - Bump default tox env from py37 to py38
+
+-------------------------------------------------------------------
Old:
----
oslo.middleware-4.0.2.tar.gz
New:
----
oslo.middleware-4.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.middleware.spec ++++++
--- /var/tmp/diff_new_pack.cnSIPo/_old 2020-10-26 16:17:36.110997310 +0100
+++ /var/tmp/diff_new_pack.cnSIPo/_new 2020-10-26 16:17:36.110997310 +0100
@@ -17,13 +17,13 @@
Name: python-oslo.middleware
-Version: 4.0.2
+Version: 4.1.1
Release: 0
Summary: OpenStack oslo.middleware library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://launchpad.net/oslo.middleware
-Source0:
https://files.pythonhosted.org/packages/source/o/oslo.middleware/oslo.middleware-4.0.2.tar.gz
+Source0:
https://files.pythonhosted.org/packages/source/o/oslo.middleware/oslo.middleware-4.1.1.tar.gz
BuildRequires: openstack-macros
BuildRequires: python3-Jinja2 >= 2.10
BuildRequires: python3-WebOb >= 1.8.0
@@ -38,7 +38,7 @@
BuildRequires: python3-oslo.utils >= 3.33.0
BuildRequires: python3-oslotest
BuildRequires: python3-pbr >= 2.0.0
-BuildRequires: python3-six >= 1.10.0
+BuildRequires: python3-six
BuildRequires: python3-statsd >= 3.2.1
BuildRequires: python3-stestr
BuildRequires: python3-stevedore >= 1.20.0
@@ -62,7 +62,7 @@
Requires: python3-oslo.i18n >= 3.15.3
Requires: python3-oslo.serialization
Requires: python3-oslo.utils >= 3.33.0
-Requires: python3-six >= 1.10.0
+Requires: python3-six
Requires: python3-statsd >= 3.2.1
Requires: python3-stevedore >= 1.20.0
@@ -88,7 +88,7 @@
This package contains the documentation.
%prep
-%autosetup -p1 -n oslo.middleware-4.0.2
+%autosetup -p1 -n oslo.middleware-4.1.1
%py_req_cleanup
%build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.cnSIPo/_old 2020-10-26 16:17:36.138997332 +0100
+++ /var/tmp/diff_new_pack.cnSIPo/_new 2020-10-26 16:17:36.142997335 +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.middleware/oslo.middleware.spec.j2</param>
+ <param
name="input-template">https://opendev.org/openstack/rpm-packaging/raw/branch/stable/victoria/openstack/oslo.middleware/oslo.middleware.spec.j2</param>
<param name="output-name">python-oslo.middleware.spec</param>
- <param
name="requirements">https://opendev.org/openstack/oslo.middleware/raw/branch/stable/ussuri/requirements.txt</param>
+ <param
name="requirements">https://opendev.org/openstack/oslo.middleware/raw/branch/stable/victoria/requirements.txt</param>
<param name="changelog-email">cloud-de...@suse.de</param>
<param name="changelog-provider">gh,openstack,oslo.middleware</param>
</service>
++++++ oslo.middleware-4.0.2.tar.gz -> oslo.middleware-4.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/.zuul.yaml
new/oslo.middleware-4.1.1/.zuul.yaml
--- old/oslo.middleware-4.0.2/.zuul.yaml 2020-04-07 12:07:24.000000000
+0200
+++ new/oslo.middleware-4.1.1/.zuul.yaml 2020-09-11 21:22:41.000000000
+0200
@@ -3,7 +3,7 @@
- check-requirements
- lib-forward-testing-python3
- 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/oslo.middleware-4.0.2/AUTHORS
new/oslo.middleware-4.1.1/AUTHORS
--- old/oslo.middleware-4.0.2/AUTHORS 2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/AUTHORS 2020-09-11 21:23:35.000000000 +0200
@@ -61,6 +61,7 @@
Mehdi Abaakouk <mehdi.abaak...@enovance.com>
Mehdi Abaakouk <sil...@redhat.com>
Michael Krotscheck <krotsch...@gmail.com>
+Moisés Guimarães de Medeiros <mogui...@redhat.com>
Monty Taylor <mord...@inaugust.com>
Noorul Islam K M <noo...@noorul.com>
OpenStack Release Bot <infra-r...@openstack.org>
@@ -95,4 +96,5 @@
sonu.kumar <sonu.ku...@nectechnologies.in>
venkatamahesh <venkatamaheshko...@gmail.com>
yan.haifeng <yanhe...@qq.com>
+zhangboye <zhangb...@inspur.com>
zhangguoqing <zhang.guoq...@99cloud.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/CONTRIBUTING.rst
new/oslo.middleware-4.1.1/CONTRIBUTING.rst
--- old/oslo.middleware-4.0.2/CONTRIBUTING.rst 2020-04-07 12:07:24.000000000
+0200
+++ new/oslo.middleware-4.1.1/CONTRIBUTING.rst 2020-09-11 21:22:41.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.middleware-4.0.2/ChangeLog
new/oslo.middleware-4.1.1/ChangeLog
--- old/oslo.middleware-4.0.2/ChangeLog 2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/ChangeLog 2020-09-11 21:23:35.000000000 +0200
@@ -1,6 +1,29 @@
CHANGES
=======
+4.1.1
+-----
+
+* Bump bandit version
+* Fix pygments style
+
+4.1.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
+* Drop use of six
+* Align contributing doc with oslo's policy
+* Bump default tox env from py37 to py38
+* Add py38 package metadata
+* Add release notes links to doc index
+* Add Python3 victoria unit tests
+* Update master for stable/ussuri
+* Cleanup py27 support
+
4.0.2
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/PKG-INFO
new/oslo.middleware-4.1.1/PKG-INFO
--- old/oslo.middleware-4.0.2/PKG-INFO 2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/PKG-INFO 2020-09-11 21:23:35.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.middleware
-Version: 4.0.2
+Version: 4.1.1
Summary: Oslo Middleware library
Home-page: https://docs.openstack.org/oslo.middleware/latest/
Author: OpenStack
@@ -40,6 +40,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/oslo.middleware-4.0.2/babel.cfg
new/oslo.middleware-4.1.1/babel.cfg
--- old/oslo.middleware-4.0.2/babel.cfg 2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/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.middleware-4.0.2/doc/requirements.txt
new/oslo.middleware-4.1.1/doc/requirements.txt
--- old/oslo.middleware-4.0.2/doc/requirements.txt 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/doc/requirements.txt 2020-09-11
21:22:41.000000000 +0200
@@ -2,7 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# These are needed for docs generation
-openstackdocstheme>=1.20.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0 # BSD
-reno>=2.5.0 # Apache-2.0
+
+openstackdocstheme>=2.2.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+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.middleware-4.0.2/doc/source/conf.py
new/oslo.middleware-4.1.1/doc/source/conf.py
--- old/oslo.middleware-4.0.2/doc/source/conf.py 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/doc/source/conf.py 2020-09-11
21:22:41.000000000 +0200
@@ -29,9 +29,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.middleware'
-bug_project = 'oslo.middleware'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.middleware'
+openstackdocs_bug_project = 'oslo.middleware'
+openstackdocs_bug_tag = ''
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
@@ -54,7 +54,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.middleware-4.0.2/doc/source/index.rst
new/oslo.middleware-4.1.1/doc/source/index.rst
--- old/oslo.middleware-4.0.2/doc/source/index.rst 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/doc/source/index.rst 2020-09-11
21:22:41.000000000 +0200
@@ -16,7 +16,5 @@
Release Notes
=============
-.. toctree::
- :maxdepth: 1
-
- user/history
+Read also the `oslo.middleware Release Notes
+<https://docs.openstack.org/releasenotes/oslo.middleware/>`_.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/doc/source/user/history.rst
new/oslo.middleware-4.1.1/doc/source/user/history.rst
--- old/oslo.middleware-4.0.2/doc/source/user/history.rst 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/doc/source/user/history.rst 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.. include:: ../../../ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/lower-constraints.txt
new/oslo.middleware-4.1.1/lower-constraints.txt
--- old/oslo.middleware-4.0.2/lower-constraints.txt 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/lower-constraints.txt 2020-09-11
21:22:41.000000000 +0200
@@ -5,16 +5,13 @@
debtcollector==1.2.0
extras==1.0.0
fixtures==3.0.0
-flake8==2.5.5
gitdb==0.6.4
GitPython==1.0.1
-hacking==0.12.0
iso8601==0.1.11
Jinja2==2.10
keystoneauth1==3.4.0
linecache2==1.0.0
MarkupSafe==1.0
-mccabe==0.2.1
mox3==0.20.0
msgpack-python==0.4.0
netaddr==0.7.18
@@ -27,8 +24,6 @@
oslo.utils==3.33.0
oslotest==3.2.0
pbr==2.0.0
-pep8==1.5.7
-pyflakes==0.8.1
pyparsing==2.1.0
python-mimeparse==1.6.0
python-subunit==1.0.0
@@ -37,7 +32,6 @@
requests==2.14.2
requestsexceptions==1.2.0
rfc3986==0.3.1
-six==1.10.0
smmap==0.9.0
statsd==3.2.1
stestr==2.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo.middleware.egg-info/PKG-INFO
new/oslo.middleware-4.1.1/oslo.middleware.egg-info/PKG-INFO
--- old/oslo.middleware-4.0.2/oslo.middleware.egg-info/PKG-INFO 2020-04-07
12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo.middleware.egg-info/PKG-INFO 2020-09-11
21:23:35.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: oslo.middleware
-Version: 4.0.2
+Version: 4.1.1
Summary: Oslo Middleware library
Home-page: https://docs.openstack.org/oslo.middleware/latest/
Author: OpenStack
@@ -40,6 +40,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/oslo.middleware-4.0.2/oslo.middleware.egg-info/SOURCES.txt
new/oslo.middleware-4.1.1/oslo.middleware.egg-info/SOURCES.txt
--- old/oslo.middleware-4.0.2/oslo.middleware.egg-info/SOURCES.txt
2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo.middleware.egg-info/SOURCES.txt
2020-09-11 21:23:35.000000000 +0200
@@ -8,7 +8,6 @@
HACKING.rst
LICENSE
README.rst
-babel.cfg
lower-constraints.txt
requirements.txt
setup.cfg
@@ -28,7 +27,6 @@
doc/source/reference/cors.rst
doc/source/reference/healthcheck_plugins.rst
doc/source/reference/index.rst
-doc/source/user/history.rst
oslo/__init__.py
oslo.middleware.egg-info/PKG-INFO
oslo.middleware.egg-info/SOURCES.txt
@@ -88,6 +86,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.middleware-4.0.2/oslo.middleware.egg-info/pbr.json
new/oslo.middleware-4.1.1/oslo.middleware.egg-info/pbr.json
--- old/oslo.middleware-4.0.2/oslo.middleware.egg-info/pbr.json 2020-04-07
12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo.middleware.egg-info/pbr.json 2020-09-11
21:23:35.000000000 +0200
@@ -1 +1 @@
-{"git_version": "8b2aaa3", "is_release": true}
\ No newline at end of file
+{"git_version": "ea8e881", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo.middleware.egg-info/requires.txt
new/oslo.middleware-4.1.1/oslo.middleware.egg-info/requires.txt
--- old/oslo.middleware-4.0.2/oslo.middleware.egg-info/requires.txt
2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo.middleware.egg-info/requires.txt
2020-09-11 21:23:35.000000000 +0200
@@ -1,11 +1,10 @@
-pbr!=2.1.0,>=2.0.0
Jinja2>=2.10
+WebOb>=1.8.0
+debtcollector>=1.2.0
oslo.config>=5.2.0
oslo.context>=2.19.2
oslo.i18n>=3.15.3
oslo.utils>=3.33.0
-six>=1.10.0
-stevedore>=1.20.0
-WebOb>=1.8.0
-debtcollector>=1.2.0
+pbr!=2.1.0,>=2.0.0
statsd>=3.2.1
+stevedore>=1.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/oslo_middleware/base.py
new/oslo.middleware-4.1.1/oslo_middleware/base.py
--- old/oslo.middleware-4.0.2/oslo_middleware/base.py 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/base.py 2020-09-11
21:22:41.000000000 +0200
@@ -15,18 +15,12 @@
"""Base class(es) for WSGI Middleware."""
-import six
-
+from inspect import getfullargspec
from oslo_config import cfg
import webob.dec
import webob.request
import webob.response
-if six.PY2:
- from inspect import getargspec as getfullargspec
-else:
- from inspect import getfullargspec
-
class NoContentTypeResponse(webob.response.Response):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/oslo_middleware/cors.py
new/oslo.middleware-4.1.1/oslo_middleware/cors.py
--- old/oslo.middleware-4.0.2/oslo_middleware/cors.py 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/cors.py 2020-09-11
21:22:41.000000000 +0200
@@ -18,7 +18,6 @@
import debtcollector
from oslo_config import cfg
from oslo_middleware import base
-import six
import webob.exc
@@ -209,7 +208,7 @@
# NOTE(dims): Support older code that still passes in
# a string for allowed_origin instead of a list
- if isinstance(allowed_origin, six.string_types):
+ if isinstance(allowed_origin, str):
# TODO(krotscheck): https://review.opendev.org/#/c/312687/
LOG.warning('DEPRECATED: The `allowed_origin` keyword argument in '
'`add_origin()` should be a list, found String.')
@@ -396,5 +395,6 @@
response.headers['Access-Control-Expose-Headers'] = \
','.join(cors_config['expose_headers'])
+
# NOTE(sileht): Shortcut for backwards compatibility
filter_factory = CORS.factory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/oslo_middleware/debug.py
new/oslo.middleware-4.1.1/oslo_middleware/debug.py
--- old/oslo.middleware-4.0.2/oslo_middleware/debug.py 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/debug.py 2020-09-11
21:22:41.000000000 +0200
@@ -15,8 +15,6 @@
"""Debug middleware"""
-from __future__ import print_function
-
import sys
import webob.dec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/__init__.py
new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/__init__.py
--- old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/__init__.py
2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/__init__.py
2020-09-11 21:22:41.000000000 +0200
@@ -15,6 +15,7 @@
import collections
import gc
+import io
import json
import platform
import socket
@@ -26,7 +27,6 @@
from oslo_utils import reflection
from oslo_utils import strutils
from oslo_utils import timeutils
-import six
import stevedore
import webob.dec
import webob.exc
@@ -395,7 +395,7 @@
('text/html', self._make_html_response),
('application/json', self._make_json_response),
])
- self._accept_order = tuple(six.iterkeys(self._accept_to_functor))
+ self._accept_order = tuple(self._accept_to_functor)
# When no accept type matches instead of returning 406 we will
# always return text/plain (because sending an error from this
# middleware actually can cause issues).
@@ -437,8 +437,8 @@
except AttributeError:
pass
else:
- buf = six.StringIO()
- for stack in six.itervalues(active_frames):
+ buf = io.StringIO()
+ for stack in active_frames.values():
traceback.print_stack(stack, file=buf)
threadstacks.append(buf.getvalue())
buf.seek(0)
@@ -449,7 +449,7 @@
def _get_greenstacks():
greenstacks = []
if greenlet is not None:
- buf = six.StringIO()
+ buf = io.StringIO()
for gt in _find_objects(greenlet.greenlet):
traceback.print_stack(gt.gr_frame, file=buf)
greenstacks.append(buf.getvalue())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/__main__.py
new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/__main__.py
--- old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/__main__.py
2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/__main__.py
2020-09-11 21:22:41.000000000 +0200
@@ -12,15 +12,15 @@
# under the License.
import argparse
+from http import server
+import socketserver
-from six.moves import SimpleHTTPServer # noqa
-from six.moves import socketserver
import webob
from oslo_middleware import healthcheck
-class HttpHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+class HttpHandler(server.SimpleHTTPRequestHandler):
def do_GET(self):
@webob.dec.wsgify
def dummy_application(req):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/pluginbase.py
new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/pluginbase.py
--- old/oslo.middleware-4.0.2/oslo_middleware/healthcheck/pluginbase.py
2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/healthcheck/pluginbase.py
2020-09-11 21:22:41.000000000 +0200
@@ -15,8 +15,6 @@
import abc
-import six
-
class HealthcheckResult(object):
"""Result of a ``healthcheck`` method call should be this object."""
@@ -27,8 +25,7 @@
self.details = details
-@six.add_metaclass(abc.ABCMeta)
-class HealthcheckBaseExtension(object):
+class HealthcheckBaseExtension(metaclass=abc.ABCMeta):
def __init__(self, oslo_conf, conf):
self.oslo_conf = oslo_conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/oslo.middleware-4.0.2/oslo_middleware/tests/test_sizelimit.py
new/oslo.middleware-4.1.1/oslo_middleware/tests/test_sizelimit.py
--- old/oslo.middleware-4.0.2/oslo_middleware/tests/test_sizelimit.py
2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/oslo_middleware/tests/test_sizelimit.py
2020-09-11 21:22:41.000000000 +0200
@@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
+import io
+
from oslo_config import fixture as config
from oslotest import base as test_base
-import six
import webob
from oslo_middleware import sizelimit
@@ -25,14 +26,14 @@
def test_limiting_reader(self):
BYTES = 1024
bytes_read = 0
- data = six.StringIO("*" * BYTES)
+ data = io.StringIO("*" * BYTES)
for chunk in sizelimit.LimitingReader(data, BYTES):
bytes_read += len(chunk)
self.assertEqual(BYTES, bytes_read)
bytes_read = 0
- data = six.StringIO("*" * BYTES)
+ data = io.StringIO("*" * BYTES)
reader = sizelimit.LimitingReader(data, BYTES)
byte = reader.read(1)
while len(byte) != 0:
@@ -44,7 +45,7 @@
def test_read_default_value(self):
BYTES = 1024
data_str = "*" * BYTES
- data = six.StringIO(data_str)
+ data = io.StringIO(data_str)
reader = sizelimit.LimitingReader(data, BYTES)
res = reader.read()
self.assertEqual(data_str, res)
@@ -54,7 +55,7 @@
def _consume_all_iter():
bytes_read = 0
- data = six.StringIO("*" * BYTES)
+ data = io.StringIO("*" * BYTES)
for chunk in sizelimit.LimitingReader(data, BYTES - 1):
bytes_read += len(chunk)
@@ -63,7 +64,7 @@
def _consume_all_read():
bytes_read = 0
- data = six.StringIO("*" * BYTES)
+ data = io.StringIO("*" * BYTES)
reader = sizelimit.LimitingReader(data, BYTES - 1)
byte = reader.read(1)
while len(byte) != 0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/releasenotes/source/conf.py
new/oslo.middleware-4.1.1/releasenotes/source/conf.py
--- old/oslo.middleware-4.0.2/releasenotes/source/conf.py 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/releasenotes/source/conf.py 2020-09-11
21:22:41.000000000 +0200
@@ -39,9 +39,9 @@
]
# openstackdocstheme options
-repository_name = 'openstack/oslo.middleware'
-bug_project = 'oslo.middleware'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/oslo.middleware'
+openstackdocs_bug_project = 'oslo.middleware'
+openstackdocs_bug_tag = ''
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -88,7 +88,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 = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/releasenotes/source/index.rst
new/oslo.middleware-4.1.1/releasenotes/source/index.rst
--- old/oslo.middleware-4.0.2/releasenotes/source/index.rst 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/releasenotes/source/index.rst 2020-09-11
21:22:41.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.middleware-4.0.2/releasenotes/source/ussuri.rst
new/oslo.middleware-4.1.1/releasenotes/source/ussuri.rst
--- old/oslo.middleware-4.0.2/releasenotes/source/ussuri.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/oslo.middleware-4.1.1/releasenotes/source/ussuri.rst 2020-09-11
21:22:41.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.middleware-4.0.2/requirements.txt
new/oslo.middleware-4.1.1/requirements.txt
--- old/oslo.middleware-4.0.2/requirements.txt 2020-04-07 12:07:24.000000000
+0200
+++ new/oslo.middleware-4.1.1/requirements.txt 2020-09-11 21:22:41.000000000
+0200
@@ -8,7 +8,6 @@
oslo.context>=2.19.2 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
-six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0
WebOb>=1.8.0 # MIT
debtcollector>=1.2.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/setup.cfg
new/oslo.middleware-4.1.1/setup.cfg
--- old/oslo.middleware-4.0.2/setup.cfg 2020-04-07 12:08:41.000000000 +0200
+++ new/oslo.middleware-4.1.1/setup.cfg 2020-09-11 21:23:35.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
@@ -48,29 +49,6 @@
sizelimit = oslo_middleware:RequestBodySizeLimiter.factory
ssl = oslo_middleware:SSLMiddleware.factory
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
-[compile_catalog]
-directory = oslo_middleware/locale
-domain = oslo_middleware
-
-[update_catalog]
-domain = oslo_middleware
-output_dir = oslo_middleware/locale
-input_file = oslo_middleware/locale/oslo_middleware.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = oslo_middleware/locale/oslo_middleware.pot
-
[egg_info]
tag_build =
tag_date = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/test-requirements.txt
new/oslo.middleware-4.1.1/test-requirements.txt
--- old/oslo.middleware-4.0.2/test-requirements.txt 2020-04-07
12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/test-requirements.txt 2020-09-11
21:22:41.000000000 +0200
@@ -3,11 +3,11 @@
# process, which may cause wedges in the gate later.
fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=3.0.1,<3.1.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
testtools>=2.2.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.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
stestr>=2.0.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oslo.middleware-4.0.2/tox.ini
new/oslo.middleware-4.1.1/tox.ini
--- old/oslo.middleware-4.0.2/tox.ini 2020-04-07 12:07:24.000000000 +0200
+++ new/oslo.middleware-4.1.1/tox.ini 2020-09-11 21:22:41.000000000 +0200
@@ -1,6 +1,6 @@
[tox]
minversion = 3.1
-envlist = py37,pep8
+envlist = py38,pep8
ignore_basepython_conflict = true
[testenv]
@@ -34,9 +34,9 @@
[flake8]
# E123, E125 skipped as they are invalid PEP-8.
-
+# W504 line break after binary operator
show-source = True
-ignore = E123,E125
+ignore = E123,E125,W504
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py
[hacking]
