Hello community, here is the log from the commit of package python-oslo.middleware for openSUSE:Factory checked in at 2020-02-18 10:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.middleware (Old) and /work/SRC/openSUSE:Factory/.python-oslo.middleware.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.middleware" Tue Feb 18 10:41:26 2020 rev:13 rq:774916 version:3.38.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.middleware/python-oslo.middleware.changes 2019-05-03 22:42:29.347249368 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.middleware.new.26092/python-oslo.middleware.changes 2020-02-18 10:41:44.781108663 +0100 @@ -1,0 +2,17 @@ +Wed Oct 9 12:27:08 UTC 2019 - cloud-de...@suse.de + +- update to version 3.38.1 + - Fix invalid escape sequence warnings + - Cap Bandit below 1.6.0 and update Sphinx requirement + - Update master for stable/stein + - OpenDev Migration Patch + - More details when logging 413 Entity Too Large + - Add Python 3 Train unit tests + - Bump the openstackdocstheme extension to 1.20 + - Update hacking version + - Replace git.openstack.org URLs with opendev.org URLs + - Dropping the py35 testing + - Do not use the deprecated best_match() method + - Blacklist sphinx 2.1.0 (autodoc bug) + +------------------------------------------------------------------- Old: ---- oslo.middleware-3.37.1.tar.gz New: ---- oslo.middleware-3.38.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.middleware.spec ++++++ --- /var/tmp/diff_new_pack.w0QS2U/_old 2020-02-18 10:41:45.497110124 +0100 +++ /var/tmp/diff_new_pack.w0QS2U/_new 2020-02-18 10:41:45.497110124 +0100 @@ -17,17 +17,17 @@ Name: python-oslo.middleware -Version: 3.37.1 +Version: 3.38.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-3.37.1.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.middleware/oslo.middleware-3.38.1.tar.gz BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: python2-Jinja2 >= 2.10 -BuildRequires: python2-WebOb >= 1.7.1 +BuildRequires: python2-WebOb >= 1.8.0 BuildRequires: python2-debtcollector >= 1.2.0 BuildRequires: python2-fixtures BuildRequires: python2-mock @@ -44,7 +44,7 @@ BuildRequires: python2-stevedore >= 1.20.0 BuildRequires: python2-testtools BuildRequires: python3-Jinja2 >= 2.10 -BuildRequires: python3-WebOb >= 1.7.1 +BuildRequires: python3-WebOb >= 1.8.0 BuildRequires: python3-debtcollector >= 1.2.0 BuildRequires: python3-devel BuildRequires: python3-fixtures @@ -62,7 +62,7 @@ BuildRequires: python3-stevedore >= 1.20.0 BuildRequires: python3-testtools Requires: python-Jinja2 >= 2.10 -Requires: python-WebOb >= 1.7.1 +Requires: python-WebOb >= 1.8.0 Requires: python-debtcollector >= 1.2.0 Requires: python-oslo.config >= 5.2.0 Requires: python-oslo.context >= 2.19.2 @@ -84,9 +84,8 @@ %package -n python-oslo-middleware-doc Summary: Documentation for OpenStack middleware library Group: Development/Languages/Python -BuildRequires: python-Sphinx -BuildRequires: python-openstackdocstheme -BuildRequires: python-reno +BuildRequires: python3-Sphinx +BuildRequires: python3-openstackdocstheme %description -n python-oslo-middleware-doc Oslo middleware library includes components that can be injected into wsgi @@ -96,14 +95,14 @@ This package contains the documentation. %prep -%autosetup -p1 -n oslo.middleware-3.37.1 +%autosetup -p1 -n oslo.middleware-3.38.1 %py_req_cleanup %build %{python_build} # generate html docs -%{__python2} setup.py build_sphinx +PBR_VERSION=%{version} %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.w0QS2U/_old 2020-02-18 10:41:45.537110206 +0100 +++ /var/tmp/diff_new_pack.w0QS2U/_new 2020-02-18 10:41:45.537110206 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/oslo.middleware/oslo.middleware.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/oslo.middleware/oslo.middleware.spec.j2</param> <param name="output-name">python-oslo.middleware.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.middleware/stable/stein/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.middleware/stable/train/requirements.txt</param> <param name="changelog-email">cloud-de...@suse.de</param> <param name="changelog-provider">gh,openstack,oslo.middleware</param> </service> ++++++ oslo.middleware-3.37.1.tar.gz -> oslo.middleware-3.38.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/.zuul.yaml new/oslo.middleware-3.38.1/.zuul.yaml --- old/oslo.middleware-3.37.1/.zuul.yaml 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/.zuul.yaml 2019-08-05 11:32:24.000000000 +0200 @@ -5,9 +5,7 @@ - lib-forward-testing-python3 - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-train-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-3.37.1/AUTHORS new/oslo.middleware-3.38.1/AUTHORS --- old/oslo.middleware-3.37.1/AUTHORS 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/AUTHORS 2019-08-05 11:33:21.000000000 +0200 @@ -17,8 +17,10 @@ Christian Berendt <bere...@b1-systems.de> Chuck Short <chuck.sh...@canonical.com> Chuck Short <chu...@redhat.com> +Corey Bryant <corey.bry...@canonical.com> Craige McWhirter <cra...@mcwhirter.com.au> Cyril Roelandt <cyril.roela...@enovance.com> +Cyril Roelandt <cy...@redhat.com> Dan Prince <dpri...@redhat.com> Davanum Srinivas (dims) <dava...@gmail.com> Davanum Srinivas <dava...@gmail.com> @@ -30,6 +32,7 @@ Eric Brown <bro...@vmware.com> Flavio Percoco <fperc...@redhat.com> Gabriel Adrian Samfira <gsamf...@cloudbasesolutions.com> +Ghanshyam Mann <gm...@ghanshyammann.com> Gordon Chung <g...@live.ca> Guang Yee <guang....@hpe.com> Haifeng.Yan <yanhe...@qq.com> @@ -41,6 +44,7 @@ Jeremy Stanley <fu...@yuggoth.org> JiaJunsu <jiaju...@huawei.com> Joe Gordon <joe.gord...@gmail.com> +Johan Guldmyr <johan.guld...@csc.fi> Joshua Harlow <harlo...@gmail.com> Joshua Harlow <harlo...@yahoo-inc.com> Joshua Harlow <jxhar...@godaddy.com> @@ -62,6 +66,7 @@ Ronald Bradford <ronald.bradf...@gmail.com> Samuel de Medeiros Queiroz <samuel...@gmail.com> Sean Dague <s...@dague.net> +Sean McGinnis <sean.mcgin...@gmail.com> Sergey Kraynev <skray...@mirantis.com> Thomas Goirand <tho...@goirand.fr> Thomas Goirand <z...@debian.org> @@ -80,8 +85,10 @@ gord chung <g...@live.ca> gordon chung <g...@live.ca> howardlee <lihongwe...@inspur.com> +jacky06 <zhang....@99cloud.net> lioplhp <hpliu5...@fiberhome.com> melissaml <ma....@99cloud.net> +pengyuesheng <pengyuesh...@gohighsec.com> ricolin <rico....@easystack.cn> sonu.kumar <sonu.ku...@nectechnologies.in> venkatamahesh <venkatamaheshko...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/ChangeLog new/oslo.middleware-3.38.1/ChangeLog --- old/oslo.middleware-3.37.1/ChangeLog 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/ChangeLog 2019-08-05 11:33:21.000000000 +0200 @@ -1,6 +1,26 @@ CHANGES ======= +3.38.1 +------ + +* More details when logging 413 Entity Too Large +* Add Python 3 Train unit tests +* Bump the openstackdocstheme extension to 1.20 +* Blacklist sphinx 2.1.0 (autodoc bug) +* Cap Bandit below 1.6.0 and update Sphinx requirement +* Replace git.openstack.org URLs with opendev.org URLs + +3.38.0 +------ + +* OpenDev Migration Patch +* Dropping the py35 testing +* Fix invalid escape sequence warnings +* Do not use the deprecated best\_match() method +* Update hacking version +* Update master for stable/stein + 3.37.1 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/PKG-INFO new/oslo.middleware-3.38.1/PKG-INFO --- old/oslo.middleware-3.37.1/PKG-INFO 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/PKG-INFO 2019-08-05 11:33:21.000000000 +0200 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.middleware -Version: 3.37.1 +Version: 3.38.1 Summary: Oslo Middleware library Home-page: https://docs.openstack.org/oslo.middleware/latest/ Author: OpenStack Author-email: openstack-disc...@lists.openstack.org License: UNKNOWN -Description: =================================== +Description: =============== oslo.middleware - =================================== + =============== .. image:: https://img.shields.io/pypi/v/oslo.middleware.svg :target: https://pypi.org/project/oslo.middleware/ @@ -25,7 +25,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.middleware/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.middleware + * Source: https://opendev.org/openstack/oslo.middleware * Bugs: https://bugs.launchpad.net/oslo.middleware * Release notes: https://docs.openstack.org/releasenotes/oslo.middleware/ @@ -40,4 +40,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/README.rst new/oslo.middleware-3.38.1/README.rst --- old/oslo.middleware-3.37.1/README.rst 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/README.rst 2019-08-05 11:32:24.000000000 +0200 @@ -1,6 +1,6 @@ -=================================== +=============== oslo.middleware -=================================== +=============== .. image:: https://img.shields.io/pypi/v/oslo.middleware.svg :target: https://pypi.org/project/oslo.middleware/ @@ -17,6 +17,6 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.middleware/latest/ -* Source: https://git.openstack.org/cgit/openstack/oslo.middleware +* Source: https://opendev.org/openstack/oslo.middleware * Bugs: https://bugs.launchpad.net/oslo.middleware * Release notes: https://docs.openstack.org/releasenotes/oslo.middleware/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/doc/requirements.txt new/oslo.middleware-3.38.1/doc/requirements.txt --- old/oslo.middleware-3.37.1/doc/requirements.txt 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/doc/requirements.txt 2019-08-05 11:32:24.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.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +openstackdocstheme>=1.20.0 # Apache-2.0 +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.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-3.37.1/doc/source/conf.py new/oslo.middleware-3.38.1/doc/source/conf.py --- old/oslo.middleware-3.37.1/doc/source/conf.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/doc/source/conf.py 2019-08-05 11:32:24.000000000 +0200 @@ -33,9 +33,6 @@ bug_project = 'oslo.middleware' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. # execute "export SPHINX_DEBUG=1" in your terminal to disable @@ -47,7 +44,6 @@ master_doc = 'index' # General information about the project. -project = u'oslo.middleware' copyright = u'2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. @@ -67,19 +63,3 @@ # html_theme_path = ["."] html_theme = 'openstackdocs' # html_static_path = ['static'] - -# Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass -# [howto/manual]). -latex_documents = [ - ('index', - '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), -] - -# Example configuration for intersphinx: refer to the Python standard library. -#intersphinx_mapping = {'http://docs.python.org/': None} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/doc/source/reference/index.rst new/oslo.middleware-3.38.1/doc/source/reference/index.rst --- old/oslo.middleware-3.37.1/doc/source/reference/index.rst 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/doc/source/reference/index.rst 2019-08-05 11:32:24.000000000 +0200 @@ -1,6 +1,6 @@ -============================== - oslo.middleware Reference -============================== +========================= +oslo.middleware Reference +========================= .. toctree:: :glob: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/lower-constraints.txt new/oslo.middleware-3.38.1/lower-constraints.txt --- old/oslo.middleware-3.37.1/lower-constraints.txt 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/lower-constraints.txt 2019-08-05 11:32:24.000000000 +0200 @@ -47,5 +47,5 @@ testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 -WebOb==1.7.1 +WebOb==1.8.0 wrapt==1.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo.middleware.egg-info/PKG-INFO new/oslo.middleware-3.38.1/oslo.middleware.egg-info/PKG-INFO --- old/oslo.middleware-3.37.1/oslo.middleware.egg-info/PKG-INFO 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo.middleware.egg-info/PKG-INFO 2019-08-05 11:33:21.000000000 +0200 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.middleware -Version: 3.37.1 +Version: 3.38.1 Summary: Oslo Middleware library Home-page: https://docs.openstack.org/oslo.middleware/latest/ Author: OpenStack Author-email: openstack-disc...@lists.openstack.org License: UNKNOWN -Description: =================================== +Description: =============== oslo.middleware - =================================== + =============== .. image:: https://img.shields.io/pypi/v/oslo.middleware.svg :target: https://pypi.org/project/oslo.middleware/ @@ -25,7 +25,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.middleware/latest/ - * Source: https://git.openstack.org/cgit/openstack/oslo.middleware + * Source: https://opendev.org/openstack/oslo.middleware * Bugs: https://bugs.launchpad.net/oslo.middleware * Release notes: https://docs.openstack.org/releasenotes/oslo.middleware/ @@ -40,4 +40,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo.middleware.egg-info/SOURCES.txt new/oslo.middleware-3.38.1/oslo.middleware.egg-info/SOURCES.txt --- old/oslo.middleware-3.37.1/oslo.middleware.egg-info/SOURCES.txt 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo.middleware.egg-info/SOURCES.txt 2019-08-05 11:33:21.000000000 +0200 @@ -77,12 +77,14 @@ releasenotes/notes/add_reno-3b4ae0789e9c45b4.yaml releasenotes/notes/compat_headers-55a635b8ec01b6f1.yaml releasenotes/notes/global_request_id-a8ec7260fbd76444.yaml +releasenotes/notes/log_max_request_body_size-1835363-6f37946210a100d7.yaml releasenotes/source/conf.py releasenotes/source/index.rst releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst releasenotes/source/rocky.rst +releasenotes/source/stein.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo.middleware.egg-info/pbr.json new/oslo.middleware-3.38.1/oslo.middleware.egg-info/pbr.json --- old/oslo.middleware-3.37.1/oslo.middleware.egg-info/pbr.json 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo.middleware.egg-info/pbr.json 2019-08-05 11:33:21.000000000 +0200 @@ -1 +1 @@ -{"git_version": "acfa72e", "is_release": true} \ No newline at end of file +{"git_version": "9bae80e", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo.middleware.egg-info/requires.txt new/oslo.middleware-3.38.1/oslo.middleware.egg-info/requires.txt --- old/oslo.middleware-3.37.1/oslo.middleware.egg-info/requires.txt 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo.middleware.egg-info/requires.txt 2019-08-05 11:33:21.000000000 +0200 @@ -6,6 +6,6 @@ oslo.utils>=3.33.0 six>=1.10.0 stevedore>=1.20.0 -WebOb>=1.7.1 +WebOb>=1.8.0 debtcollector>=1.2.0 statsd>=3.2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/base.py new/oslo.middleware-3.38.1/oslo_middleware/base.py --- old/oslo.middleware-3.37.1/oslo_middleware/base.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/base.py 2019-08-05 11:32:24.000000000 +0200 @@ -17,16 +17,15 @@ import six -if six.PY2: - from inspect import getargspec as getfullargspec -else: - from inspect import getfullargspec - +from oslo_config import cfg import webob.dec import webob.request import webob.response -from oslo_config import cfg +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-3.37.1/oslo_middleware/catch_errors.py new/oslo.middleware-3.38.1/oslo_middleware/catch_errors.py --- old/oslo.middleware-3.37.1/oslo_middleware/catch_errors.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/catch_errors.py 2019-08-05 11:32:24.000000000 +0200 @@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__) -_TOKEN_RE = re.compile('^(X-\w+-Token):.*$', flags=re.MULTILINE) +_TOKEN_RE = re.compile(r'^(X-\w+-Token):.*$', flags=re.MULTILINE) class CatchErrors(base.ConfigurableMiddleware): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/cors.py new/oslo.middleware-3.38.1/oslo_middleware/cors.py --- old/oslo.middleware-3.37.1/oslo_middleware/cors.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/cors.py 2019-08-05 11:32:24.000000000 +0200 @@ -140,8 +140,8 @@ allow_methods: List of HTTP methods to permit. allow_headers: List of HTTP headers to permit from the client. """ - if ('allowed_origin' not in local_conf - and 'oslo_config_project' not in local_conf): + if ('allowed_origin' not in local_conf and + 'oslo_config_project' not in local_conf): raise TypeError("allowed_origin or oslo_config_project " "is required") return super(CORS, cls).factory(global_conf, **local_conf) @@ -210,7 +210,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): - # TODO(krotscheck): https://review.openstack.org/#/c/312687/ + # 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.') allowed_origin = [allowed_origin] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/healthcheck/__init__.py new/oslo.middleware-3.38.1/oslo_middleware/healthcheck/__init__.py --- old/oslo.middleware-3.37.1/oslo_middleware/healthcheck/__init__.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/healthcheck/__init__.py 2019-08-05 11:32:24.000000000 +0200 @@ -552,8 +552,10 @@ status = self.HEAD_HEALTHY_TO_STATUS_CODES[healthy] else: status = self.HEALTHY_TO_STATUS_CODES[healthy] - accept_type = req.accept.best_match(self._accept_order) - if not accept_type: + try: + offers = req.accept.acceptable_offers(self._accept_order) + accept_type = offers[0][0] + except IndexError: accept_type = self._default_accept functor = self._accept_to_functor[accept_type] body, content_type = functor(results, healthy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/opts.py new/oslo.middleware-3.38.1/oslo_middleware/opts.py --- old/oslo.middleware-3.37.1/oslo_middleware/opts.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/opts.py 2019-08-05 11:32:24.000000000 +0200 @@ -12,6 +12,14 @@ # License for the specific language governing permissions and limitations # under the License. +import copy +import itertools + +from oslo_middleware import cors +from oslo_middleware.healthcheck import opts as healthcheck_opts +from oslo_middleware import http_proxy_to_wsgi +from oslo_middleware import sizelimit +from oslo_middleware import ssl __all__ = [ 'list_opts', @@ -23,16 +31,6 @@ ] -import copy -import itertools - -from oslo_middleware import cors -from oslo_middleware.healthcheck import opts as healthcheck_opts -from oslo_middleware import http_proxy_to_wsgi -from oslo_middleware import sizelimit -from oslo_middleware import ssl - - def list_opts(): """Return a list of oslo.config options for ALL of the middleware classes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/sizelimit.py new/oslo.middleware-3.38.1/oslo_middleware/sizelimit.py --- old/oslo.middleware-3.37.1/oslo_middleware/sizelimit.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/sizelimit.py 2019-08-05 11:32:24.000000000 +0200 @@ -17,6 +17,8 @@ """ +import logging + from oslo_config import cfg import webob.dec import webob.exc @@ -24,6 +26,8 @@ from oslo_middleware._i18n import _ from oslo_middleware import base +LOG = logging.getLogger(__name__) + _oldopts = [cfg.DeprecatedOpt('osapi_max_request_body_size', group='DEFAULT'), @@ -56,7 +60,7 @@ for chunk in self.data: self.bytes_read += len(chunk) if self.bytes_read > self.limit: - msg = _("Request is too large.") + msg = _("Request is too large. Larger than %s") % self.limit raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg) else: yield chunk @@ -70,7 +74,7 @@ result = self.data.read(i) self.bytes_read += len(result) if self.bytes_read > self.limit: - msg = _("Request is too large.") + msg = _("Request is too large. Larger than %s.") % self.limit raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg) return result @@ -87,7 +91,9 @@ max_size = self._conf_get('max_request_body_size') if (req.content_length is not None and req.content_length > max_size): - msg = _("Request is too large.") + msg = _("Request is too large. " + "Larger than max_request_body_size (%s).") % max_size + LOG.info(msg) raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg) if req.content_length is None: limiter = LimitingReader(req.body_file, max_size) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/oslo_middleware/stats.py new/oslo.middleware-3.38.1/oslo_middleware/stats.py --- old/oslo.middleware-3.37.1/oslo_middleware/stats.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/oslo_middleware/stats.py 2019-08-05 11:32:24.000000000 +0200 @@ -21,12 +21,12 @@ from oslo_middleware import base LOG = logging.getLogger(__name__) -VERSION_REGEX = re.compile("/(v[0-9]{1}\.[0-9]{1})") +VERSION_REGEX = re.compile(r"/(v[0-9]{1}\.[0-9]{1})") UUID_REGEX = re.compile( - '.*(\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}).*a', + r'.*(\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}).*a', re.IGNORECASE) # UUIDs without the - char, used in some places in Nova URLs. -SHORT_UUID_REGEX = re.compile('.*(\.[0-9a-fA-F]{32}).*') +SHORT_UUID_REGEX = re.compile(r'.*(\.[0-9a-fA-F]{32}).*') class StatsMiddleware(base.ConfigurableMiddleware): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/releasenotes/notes/log_max_request_body_size-1835363-6f37946210a100d7.yaml new/oslo.middleware-3.38.1/releasenotes/notes/log_max_request_body_size-1835363-6f37946210a100d7.yaml --- old/oslo.middleware-3.37.1/releasenotes/notes/log_max_request_body_size-1835363-6f37946210a100d7.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.middleware-3.38.1/releasenotes/notes/log_max_request_body_size-1835363-6f37946210a100d7.yaml 2019-08-05 11:32:24.000000000 +0200 @@ -0,0 +1,4 @@ +--- +other: + - | + Log when max_request_body_size is exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/releasenotes/source/conf.py new/oslo.middleware-3.38.1/releasenotes/source/conf.py --- old/oslo.middleware-3.37.1/releasenotes/source/conf.py 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/releasenotes/source/conf.py 2019-08-05 11:32:24.000000000 +0200 @@ -56,16 +56,8 @@ master_doc = 'index' # General information about the project. -project = u'oslo.middleware Release Notes' copyright = u'2016, oslo.middleware Developers' -# Release notes do not need a version in the title, they span -# multiple versions. -# The full version, including alpha/beta/rc tags. -release = '' -# The short X.Y version. -version = '' - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None @@ -145,10 +137,6 @@ # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True @@ -186,51 +174,6 @@ # This is the file name suffix for HTML files (e.g. ".xhtml"). # html_file_suffix = None -# Output file base name for HTML help builder. -htmlhelp_basename = 'oslo.middlewareReleaseNotesDoc' - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { - # The paper size ('letterpaper' or 'a4paper'). - # 'papersize': 'letterpaper', - - # The font size ('10pt', '11pt' or '12pt'). - # 'pointsize': '10pt', - - # Additional stuff for the LaTeX preamble. - # 'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'oslo.middlewareReleaseNotes.tex', - u'oslo.middleware Release Notes Documentation', - u'oslo.middleware Developers', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -# latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -# latex_use_parts = False - -# If true, show page references after internal links. -# latex_show_pagerefs = False - -# If true, show URL addresses after external links. -# latex_show_urls = False - -# Documents to append as an appendix to all manuals. -# latex_appendices = [] - -# If false, no module index is generated. -# latex_domain_indices = True - # -- Options for manual page output --------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/releasenotes/source/index.rst new/oslo.middleware-3.38.1/releasenotes/source/index.rst --- old/oslo.middleware-3.37.1/releasenotes/source/index.rst 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/releasenotes/source/index.rst 2019-08-05 11:32:24.000000000 +0200 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + stein rocky queens pike diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/releasenotes/source/stein.rst new/oslo.middleware-3.38.1/releasenotes/source/stein.rst --- old/oslo.middleware-3.37.1/releasenotes/source/stein.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.middleware-3.38.1/releasenotes/source/stein.rst 2019-08-05 11:32:24.000000000 +0200 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/requirements.txt new/oslo.middleware-3.38.1/requirements.txt --- old/oslo.middleware-3.37.1/requirements.txt 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/requirements.txt 2019-08-05 11:32:24.000000000 +0200 @@ -10,6 +10,6 @@ oslo.utils>=3.33.0 # Apache-2.0 six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 -WebOb>=1.7.1 # MIT +WebOb>=1.8.0 # MIT debtcollector>=1.2.0 # Apache-2.0 statsd>=3.2.1 # MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/setup.cfg new/oslo.middleware-3.38.1/setup.cfg --- old/oslo.middleware-3.37.1/setup.cfg 2019-02-28 19:04:29.000000000 +0100 +++ new/oslo.middleware-3.38.1/setup.cfg 2019-08-05 11:33:21.000000000 +0200 @@ -16,7 +16,8 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/test-requirements.txt new/oslo.middleware-3.38.1/test-requirements.txt --- old/oslo.middleware-3.37.1/test-requirements.txt 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/test-requirements.txt 2019-08-05 11:32:24.000000000 +0200 @@ -3,12 +3,12 @@ # process, which may cause wedges in the gate later. fixtures>=3.0.0 # Apache-2.0/BSD -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 mock>=2.0.0 # BSD 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 # Apache-2.0 +bandit>=1.1.0,<1.6.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.middleware-3.37.1/tox.ini new/oslo.middleware-3.38.1/tox.ini --- old/oslo.middleware-3.37.1/tox.ini 2019-02-28 19:02:11.000000000 +0100 +++ new/oslo.middleware-3.38.1/tox.ini 2019-08-05 11:32:24.000000000 +0200 @@ -1,13 +1,13 @@ [tox] minversion = 2.0 -envlist = py35,py27,pep8 +envlist = py27,py37,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs}