--- a/components/python/oslo.utils/Makefile Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.utils/Makefile Wed Sep 07 14:48:33 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.utils
-COMPONENT_VERSION= 1.4.0
+COMPONENT_VERSION= 3.8.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:f90e1d52542225031bc7e3d9bdc1b1270a80388e30285532124586e45e9317f6
+ sha256:c0e935b86e72facc02264271ed09dd9c5879d52452d7a1b4a116a6c7d05077aa
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/oslo.utils
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/oslo.utils/
COMPONENT_BUGDB= python-mod/oslo.utils
-TPNO= 25744
+TPNO= 28358
# Depends on netaddr which is not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
@@ -51,8 +51,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.utils/oslo.utils-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.utils/oslo.utils-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
@@ -38,38 +38,31 @@
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.utils-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.utils-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/encodeutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/excutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/netutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/reflection.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/strutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/timeutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/units.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/utils/uuidutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/_i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/encodeutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/eventletutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/excutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/fileutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/fixture.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/fnmatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/imageutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/importutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/netutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/reflection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/secretutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/strutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/timeutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/units.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_utils/versionutils.py
#
license oslo.utils.license license="Apache v2.0"
@@ -77,9 +70,19 @@
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 funcsigs; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/funcsigs-$(PYV)
+
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
+# force a dependency on monotonic; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/monotonic-$(PYV)
+
# force a dependency on netaddr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/netaddr-$(PYV)
@@ -93,8 +96,11 @@
depend type=require \
fmri=library/python/oslo.utils@$(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 pytz; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pytz-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(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.utils/oslo.utils.license Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.utils/oslo.utils.license Wed Sep 07 14:48:33 2016 -0700
@@ -8,7 +8,8 @@
See the License for the specific language governing permissions and limitations under the License.
- Apache License
+
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -183,29 +184,22 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
- END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS
- APPENDIX: How to apply the Apache License to your work.
+APPENDIX: How to apply the Apache License to your work.
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
- Copyright [yyyy] [name of copyright owner]
+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
- 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
- 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.
+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.utils/patches/disable-oslo-deprecation.patch Wed Sep 07 14:48:33 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.utils 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.utils-1.2.1/oslo/utils/__init__.py.~1~ 2015-01-08 13:42:18.000000000 -0800
-+++ oslo.utils-1.2.1/oslo/utils/__init__.py 2015-03-02 23:10:23.349348280 -0800
-@@ -21,6 +21,3 @@ def deprecated():
- DeprecationWarning,
- stacklevel=3,
- )
--
--
--deprecated()