--- a/components/openstack/heat/heat.p5m Tue Feb 17 14:06:40 2015 -0800
+++ b/components/openstack/heat/heat.p5m Tue Feb 17 14:00:01 2015 -0800
@@ -330,9 +330,6 @@
# to flush this out.
depend type=group fmri=library/python/swiftclient-$(PYV)
-# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyyaml-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
@@ -365,6 +362,9 @@
# 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 pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)
+
# force a dependency on requests; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/requests-$(PYV)
--- a/components/python/heatclient/heatclient-PYVER.p5m Tue Feb 17 14:06:40 2015 -0800
+++ b/components/python/heatclient/heatclient-PYVER.p5m Tue Feb 17 14:00:01 2015 -0800
@@ -23,10 +23,6 @@
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
-# pyyaml is only delivered for python 2.6
-<transform depend type=require fmri=library/python-2/pyyaml-27 -> drop>
-# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -94,9 +90,6 @@
# flush this out.
depend type=group fmri=library/python/anyjson-$(PYV)
-# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyyaml-$(PYV)
-
# force a dependency on argparse; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/argparse-$(PYV)
@@ -119,6 +112,9 @@
# force a dependency on prettytable; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/prettytable-$(PYV)
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)
+
# force a dependency on requests; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/requests-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyyaml/Makefile Tue Feb 17 14:00:01 2015 -0800
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= PyYAML
+COMPONENT_VERSION= 3.09
+IPS_COMPONENT_VERSION= 3.9
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:30076d51387cca35d461c8b36408de189d31f17e44d45cd2200bbd2d02f555c1
+COMPONENT_ARCHIVE_URL= http://pyyaml.org/download/pyyaml/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL= http://pyyaml.org/wiki/PyYAML
+COMPONENT_BUGDB= python-mod/pyyaml
+
+TPNO= 9304
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_DIR = $(SOURCE_DIR)
+COMPONENT_TEST_ARGS.2.6 = ./tests/lib/test_all.py
+COMPONENT_TEST_ARGS.2.7 = ./tests/lib/test_all.py
+COMPONENT_TEST_ARGS.3.4 = ./tests/lib3/test_all.py
+COMPONENT_TEST_ARGS = $(COMPONENT_TEST_ARGS.$(PYTHON_VERSION))
+
+# common targets
+build: $(BUILD_NO_ARCH)
+
+install: $(INSTALL_NO_ARCH)
+
+test: $(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyyaml/old-manifest-26.p5m Tue Feb 17 14:00:01 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.18.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/pyyaml type=require
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyyaml/pyyaml-PYVER.p5m Tue Feb 17 14:00:01 2015 -0800
@@ -0,0 +1,63 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri \
+ value=pkg:/library/python/pyyaml-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="a YAML parser and emitter for the Python language"
+set name=pkg.description \
+ value="PyYAML is a complete YAML 1.1 parser. In particular, PyYAML can parse all examples from the specification. The parsing algorithm is simple enough to be a reference for YAML parser implementors. Features include Unicode support including UTF-8/UTF-16 input/output and \u escape sequences, low-level event-based parser and emitter API (like SAX), high-level API for serializing and deserializing native Python objects (like DOM or pickle), support for all types from the YAML types repository (a simple extension API is provided), both pure-Python and fast LibYAML-based parsers and emitters, relatively sensible error messages."
+set name=com.oracle.info.description \
+ value="A YAML parser and emitter for the Python language"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/676
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/PyYAML-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/composer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/constructor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/cyaml.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/dumper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/emitter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/error.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/loader.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/reader.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/representer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/resolver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/scanner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/serializer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/yaml/tokens.py
+#
+license LICENSE license=MIT
+#
+# force the rename with an optional dependency on the old name
+$(PYTHON_2.6_ONLY)depend type=optional \
+ fmri=library/python-2/pyyaml-$(PYV)@3.9,5.11-0.175.3.0.0.18.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyyaml/resolve.deps Tue Feb 17 14:00:01 2015 -0800
@@ -0,0 +1,3 @@
+runtime/python-26
+runtime/python-27
+runtime/python-34