summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-02 12:42:22 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-03-02 17:47:11 (GMT)
commitc4ee9e4e71618bd37c4090adfc97bdad6f44d903 (patch)
tree35742e23e5fb8dcf7ffe55f74e85ef0e4d3fd1a8
parentd62642620424afc44123ebbd157d91f6270adc2c (diff)
downloaddefinitions-c4ee9e4e71618bd37c4090adfc97bdad6f44d903.tar.gz
Move python duplicated chunk to python-common
-rw-r--r--strata/cloudinit-support.morph20
-rw-r--r--strata/cloudinit-support/python-prettytable.morph6
-rw-r--r--strata/openstack-clients.morph19
-rw-r--r--strata/openstack-clients/python-prettytable.morph6
-rw-r--r--strata/python-common.morph16
5 files changed, 20 insertions, 47 deletions
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 535beef..5281b74 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -4,6 +4,7 @@ description: A stratum with cloudinit to fit a system in the OpenStack cloud.
build-depends:
- morph: strata/build-essential.morph
- morph: strata/python-core.morph
+- morph: strata/python-common.morph
- morph: strata/foundation.morph
chunks:
- name: configobj
@@ -11,23 +12,6 @@ chunks:
ref: 935a78736e4eb43b9fafae87f5e9902328673f63
unpetrify-ref: baserock/morph
build-depends: []
-- name: python-prettytable
- morph: strata/cloudinit-support/python-prettytable.morph
- repo: upstream:python-prettytable
- ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-patch
- repo: upstream:python-json-patch
- ref: 27c7032de25923593fa17cc14f535fb7abd52448
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-json-pointer
- repo: upstream:python-json-pointer
- ref: 48dce313141ba5bf0d2f3dd2e590042c05755e53
- unpetrify-ref: baserock/morph
- build-depends:
- - python-json-patch
- name: python-cheetah
repo: upstream:python-cheetah
ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed
@@ -46,6 +30,4 @@ chunks:
build-depends:
- boto
- configobj
- - python-prettytable
- - python-json-pointer
- python-cheetah
diff --git a/strata/cloudinit-support/python-prettytable.morph b/strata/cloudinit-support/python-prettytable.morph
deleted file mode 100644
index cf1ac6e..0000000
--- a/strata/cloudinit-support/python-prettytable.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-prettytable
-kind: chunk
-build-commands:
-- cd src && python setup.py build
-install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index ea6ed01..a4eb0ce 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -21,23 +21,17 @@ chunks:
unpetrify-ref: 1.1.0
build-depends:
- python-json-pointer
-- name: python-prettytable
- repo: upstream:python-prettytable
- ref: 7a48f1e84049577370cf28632a75d2fd01e4142d
- unpetrify-ref: master
build-depends: []
- name: python-keystoneclient
repo: upstream:openstack/python-keystoneclient
ref: 79d1eec35aad874a7c08ff22c39260884a5524ba
unpetrify-ref: 0.11.1
- build-depends:
- - python-prettytable
+ build-depends: []
- name: python-glanceclient
repo: upstream:openstack/python-glanceclient
ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b
unpetrify-ref: 0.14.1
build-depends:
- - python-prettytable
- python-keystoneclient
- warlock
- name: python-novaclient
@@ -45,7 +39,6 @@ chunks:
ref: 5ecfdac6b34769e200ff5c4c7429c20518c5b24f
unpetrify-ref: 2.20.0
build-depends:
- - python-prettytable
- python-keystoneclient
- name: python-swiftclient
repo: upstream:openstack/python-swiftclient
@@ -56,14 +49,12 @@ chunks:
repo: upstream:openstack/python-troveclient
ref: e010a919750f07493afd42a4db867853b925bcbf
unpetrify-ref: 1.0.7
- build-depends:
- - python-prettytable
+ build-depends: []
- name: python-cinderclient
repo: upstream:openstack/python-cinderclient
ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab
unpetrify-ref: 1.1.1
build-depends:
- - python-prettytable
- python-keystoneclient
- name: pyparsing
morph: strata/openstack-clients/pyparsing.morph
@@ -83,7 +74,6 @@ chunks:
unpetrify-ref: 1.7.0
build-depends:
- cmd2
- - python-prettytable
- pyparsing
- name: python-neutronclient
repo: upstream:openstack/python-neutronclient
@@ -97,14 +87,12 @@ chunks:
ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1
unpetrify-ref: 1.0.12
build-depends:
- - python-prettytable
- python-keystoneclient
- name: python-heatclient
repo: upstream:openstack/python-heatclient
ref: 6089d31e302d80910cc15132f99a1bf358bbb64f
unpetrify-ref: 0.2.12
build-depends:
- - python-prettytable
- python-keystoneclient
- name: python-designateclient
repo: upstream:openstack/python-designateclient
@@ -121,9 +109,8 @@ chunks:
- python-keystoneclient
- cliff
- name: python-saharaclient
- repo: github:openstack/python-saharaclient
+ repo: upstream:openstack/python-saharaclient
ref: eadb40ccb62566f02cb93ec03aa232e48835dec3
unpetrify-ref: 0.7.6
build-depends:
- python-keystoneclient
- - python-prettytable
diff --git a/strata/openstack-clients/python-prettytable.morph b/strata/openstack-clients/python-prettytable.morph
deleted file mode 100644
index cf1ac6e..0000000
--- a/strata/openstack-clients/python-prettytable.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-prettytable
-kind: chunk
-build-commands:
-- cd src && python setup.py build
-install-commands:
-- cd src && python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/python-common.morph b/strata/python-common.morph
index e2f4b32..850ad72 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -33,3 +33,19 @@ chunks:
unpetrify-ref: 2.7.3
build-depends:
- markupsafe
+- name: python-json-pointer
+ repo: upstream:python-json-pointer
+ ref: 34073e561261cb413b9bdff5beac31b070d98ea2
+ unpetrify-ref: v1.4
+ build-depends: []
+- name: python-json-patch
+ repo: upstream:python-json-patch
+ ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3
+ unpetrify-ref: v1.8
+ build-depends:
+ - python-json-pointer
+- name: python-prettytable
+ repo: upstream:python-prettytable
+ ref: 7a48f1e84049577370cf28632a75d2fd01e4142d
+ unpetrify-ref: master
+ build-depends: []