equal
deleted
inserted
replaced
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 # pyyaml is only delivered for python 2.6 |
|
27 <transform depend type=require fmri=library/python-2/pyyaml-27 -> drop> |
|
28 # argparse is part of python 2.7, but separate in 2.6 |
|
29 <transform depend type=require fmri=library/python/argparse-27 -> drop> |
|
30 set name=pkg.fmri \ |
26 set name=pkg.fmri \ |
31 value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) |
27 value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) |
32 set name=pkg.summary \ |
28 set name=pkg.summary \ |
33 value="Python and command-line clients for the OpenStack Heat API" |
29 value="Python and command-line clients for the OpenStack Heat API" |
34 set name=pkg.description \ |
30 set name=pkg.description \ |
92 |
88 |
93 # force a group dependency on the optional anyjson; pkgdepend work is needed to |
89 # force a group dependency on the optional anyjson; pkgdepend work is needed to |
94 # flush this out. |
90 # flush this out. |
95 depend type=group fmri=library/python/anyjson-$(PYV) |
91 depend type=group fmri=library/python/anyjson-$(PYV) |
96 |
92 |
97 # force a dependency on pyyaml; pkgdepend work is needed to flush this out. |
|
98 depend type=require fmri=library/python-2/pyyaml-$(PYV) |
|
99 |
|
100 # force a dependency on argparse; pkgdepend work is needed to flush this out. |
93 # force a dependency on argparse; pkgdepend work is needed to flush this out. |
101 depend type=require fmri=library/python/argparse-$(PYV) |
94 depend type=require fmri=library/python/argparse-$(PYV) |
102 |
95 |
103 # force a dependency on babel; pkgdepend work is needed to flush this out. |
96 # force a dependency on babel; pkgdepend work is needed to flush this out. |
104 depend type=require fmri=library/python/babel-$(PYV) |
97 depend type=require fmri=library/python/babel-$(PYV) |
117 depend type=require fmri=library/python/pbr-$(PYV) |
110 depend type=require fmri=library/python/pbr-$(PYV) |
118 |
111 |
119 # force a dependency on prettytable; pkgdepend work is needed to flush this out. |
112 # force a dependency on prettytable; pkgdepend work is needed to flush this out. |
120 depend type=require fmri=library/python/prettytable-$(PYV) |
113 depend type=require fmri=library/python/prettytable-$(PYV) |
121 |
114 |
|
115 # force a dependency on pyyaml; pkgdepend work is needed to flush this out. |
|
116 depend type=require fmri=library/python/pyyaml-$(PYV) |
|
117 |
122 # force a dependency on requests; pkgdepend work is needed to flush this out. |
118 # force a dependency on requests; pkgdepend work is needed to flush this out. |
123 depend type=require fmri=library/python/requests-$(PYV) |
119 depend type=require fmri=library/python/requests-$(PYV) |
124 |
120 |
125 # force a dependency on six; pkgdepend work is needed to flush this out. |
121 # force a dependency on six; pkgdepend work is needed to flush this out. |
126 depend type=require fmri=library/python/six-$(PYV) |
122 depend type=require fmri=library/python/six-$(PYV) |