--- a/components/python/oslo.serialization/Makefile Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.serialization/Makefile Wed Sep 07 14:48:33 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.serialization
-COMPONENT_VERSION= 1.4.0
+COMPONENT_VERSION= 2.4.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:082dca272f0a941e1cdca1dc02849c5ddac65fa7d19604096be54cd41e7b4317
+ sha256:9b95fc07310fd6df8cab064f89fd15327b259dec17a2e2b9a07b9ca4d96be0c6
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/oslo.serialization
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/oslo.serialization/
COMPONENT_BUGDB= python-mod/oslo.serial
-TPNO= 25743
+TPNO= 28354
# Depends on oslo.utils 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.serialization/oslo.serialization-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.serialization/oslo.serialization-PYVER.p5m Wed Sep 07 14:48:33 2016 -0700
@@ -38,18 +38,15 @@
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.serialization-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.serialization-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/serialization/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/serialization/jsonutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_serialization/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_serialization/base64.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_serialization/jsonutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_serialization/msgpackutils.py
#
@@ -59,10 +56,6 @@
# flush this out.
depend type=group fmri=library/python/anyjson-$(PYV)
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(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
@@ -77,9 +70,6 @@
# 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 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)
--- a/components/python/oslo.serialization/oslo.serialization.license Wed Sep 07 14:48:33 2016 -0700
+++ b/components/python/oslo.serialization/oslo.serialization.license Wed Sep 07 14:48:33 2016 -0700
@@ -1,4 +1,3 @@
-
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.")
@@ -9,7 +8,7 @@
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/
@@ -184,29 +183,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.serialization/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.serialization 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.serialization-1.2.0/oslo/serialization/__init__.py.~1~ 2015-01-08 13:32:40.000000000 -0800
-+++ oslo.serialization-1.2.0/oslo/serialization/__init__.py 2015-03-02 23:09:07.429941098 -0800
-@@ -21,6 +21,3 @@ def deprecated():
- DeprecationWarning,
- stacklevel=3,
- )
--
--
--deprecated()