components/python/heatclient/heatclient-PYVER.p5m
branchs11-update
changeset 3828 450ae9167756
parent 3704 69ab8eca01c5
child 4072 db0cec748ec0
--- 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)