--- a/components/python/oslo.middleware/Makefile Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.middleware/Makefile Wed Sep 07 14:48:33 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.middleware
-COMPONENT_VERSION= 1.0.0
+COMPONENT_VERSION= 3.8.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:5ccf160ae5ce23f3f59b86535352e3b5a9fa35dab0edc4ede8b17438da559995
+ sha256:2d985b238182cf70c1adbe1a041eb96eacde3106751fe2c7f1cd81d57a4dbda2
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/oslo.middleware
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/oslo.middleware/
COMPONENT_BUGDB= python-mod/oslo.middlewar
-TPNO= 25765
+TPNO= 28413
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -48,8 +48,8 @@
install: $(INSTALL_NO_ARCH)
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
# required to execute unittests.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/oslo.middleware/oslo.middleware-PYVER.p5m Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.middleware/oslo.middleware-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
@@ -23,6 +23,13 @@
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
+#
+# As an earlier Python 3 version of oslo.middleware was published, we
+# continue to do so for now by dropping the dependency on the
+# corresponding oslo.utils as the latter is not Python 3 ready.
+#
+<transform depend fmri=library/python/oslo.utils-3\d type=require -> drop>
+#
set name=pkg.fmri \
value=pkg:/library/python/oslo.middleware-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Oslo Middleware library"
@@ -39,42 +46,47 @@
set name=org.opensolaris.arc-caseid value=PSARC/2015/058
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.middleware-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/catch_errors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/correlation_id.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/debug.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/request_id.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/middleware/sizelimit.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/_i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/catch_errors.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/correlation_id.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/cors.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/debug.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/healthcheck/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/healthcheck/disable_by_file.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/healthcheck/pluginbase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/http_proxy_to_wsgi.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/opts.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/request_id.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/sizelimit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_middleware/ssl.py
#
license oslo.middleware.license license="Apache v2.0"
+# force a group dependency on the optional greenlet; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/greenlet-$(PYV)
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
+# force a dependency on debtcollector; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/debtcollector-$(PYV)
+
+# force a dependency on jinja2; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jinja2-$(PYV)
+
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.config-$(PYV)
@@ -89,8 +101,8 @@
depend type=require \
fmri=library/python/oslo.middleware@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.utils-$(PYV)
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
--- a/components/python/oslo.middleware/oslo.middleware.license Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.middleware/oslo.middleware.license Wed Sep 07 14:48:33 2016 -0700
@@ -1,3 +1,5 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also reproduced below.
@@ -180,186 +182,3 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
-============================================================
-
-oslo.middleware-0.2.0/oslo.middleware/locale/oslo.middleware-log-critical.pot
-oslo.middleware-0.2.0/oslo.middleware/locale/oslo.middleware-log-error.pot
-oslo.middleware-0.2.0/oslo.middleware/locale/oslo.middleware-log-warning.pot
-oslo.middleware-0.2.0/oslo.middleware/locale/oslo.middleware-log-info.pot
-oslo.middleware-0.2.0/oslo.middleware/locale/oslo.middleware.pot
-
-# Translations template for oslo.middleware.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.middleware
-# project.
-# FIRST AUTHOR , 2014.
-#
-============================================================
-
-oslo.middleware-0.2.0/oslo.middleware/locale/de/LC_MESSAGES/oslo.middleware.po
-oslo.middleware-0.2.0/oslo.middleware/locale/de/LC_MESSAGES/oslo.middleware-log-error.po
-
-# German translations for oslo.middleware.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.middleware
-# project.
-#
-# Translators:
-# Andreas Jaeger , 2014
-============================================================
-
-oslo.middleware-0.2.0/oslo.middleware/locale/fr/LC_MESSAGES/oslo.middleware-log-error.po
-oslo.middleware-0.2.0/oslo.middleware/locale/fr/LC_MESSAGES/oslo.middleware.po
-
-# Translations template for oslo.middleware.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.middleware
-# project.
-#
-# Translators:
-# Maxime COQUEREL , 2014
-============================================================
-
-oslo.middleware-0.2.0/oslo.middleware/locale/en_GB/LC_MESSAGES/oslo.middleware.po
-oslo.middleware-0.2.0/oslo.middleware/locale/en_GB/LC_MESSAGES/oslo.middleware-log-error.po
-
-# English (United Kingdom) translations for oslo.middleware.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.middleware
-# project.
-#
-# Translators:
-# Andi Chandler , 2014
-============================================================
-
-oslo.middleware-0.2.0/tests/test_correlation_id.py
-oslo.middleware-0.2.0/oslo/middleware/correlation_id.py
-
-# Copyright (c) 2013 Rackspace Hosting
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
-
-oslo.middleware-0.2.0/tests/test_sizelimit.py
-oslo.middleware-0.2.0/oslo/middleware/sizelimit.py
-
-# Copyright (c) 2012 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
-
-oslo.middleware-0.2.0/tests/test_request_id.py
-oslo.middleware-0.2.0/tests/test_catch_errors.py
-oslo.middleware-0.2.0/oslo/middleware/request_id.py
-oslo.middleware-0.2.0/oslo/middleware/catch_errors.py
-
-# Copyright (c) 2013 NEC Corporation
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
-
-oslo.middleware-0.2.0/setup.py
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-============================================================
-
-oslo.middleware-0.2.0/oslo/middleware/debug.py
-oslo.middleware-0.2.0/oslo/middleware/base.py
-oslo.middleware-0.2.0/oslo/middleware/openstack/common/context.py
-
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
-
-oslo.middleware-0.2.0/oslo/middleware/openstack/common/__init__.py
-oslo.middleware-0.2.0/oslo/middleware/i18n.py
-oslo.middleware-0.2.0/oslo/middleware/__init__.py
-oslo.middleware-0.2.0/oslo/__init__.py
-
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
-
-oslo.middleware-0.2.0/oslo/middleware/opts.py
-
-# Copyright 2014 IBM Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-============================================================
--- a/components/python/oslo.middleware/patches/disable-oslo-deprecation.patch Wed Sep 07 14:48:32 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This patch removes the legacy oslo namespace deprecation check from the
-oslo.middleware library. The deprecated() function is left to satisfy
-the unit tests. It is not suitable for the upstream and should be
-removed once all of the relevant consumers have switched over to the
-new namespace.
-
---- oslo.middleware-0.4.0/oslo/middleware/__init__.py.~1~ 2015-01-29 08:34:30.000000000 -0800
-+++ oslo.middleware-0.4.0/oslo/middleware/__init__.py 2015-03-02 23:04:40.549834298 -0800
-@@ -23,6 +23,3 @@ def deprecated():
- DeprecationWarning,
- stacklevel=3,
- )
--
--
--deprecated()