diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-01-07 16:44:55 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-01-07 16:44:55 +0000 |
commit | 241c4f2cf9b6840999869e6f67d38e38dfc79711 (patch) | |
tree | 07442ff29de106bec6a37484d8e7b0262d801682 | |
parent | 0e8a69d9cb0ccbb5fa2a2cf01bf7eaa97f60f3d0 (diff) | |
download | definitions-241c4f2cf9b6840999869e6f67d38e38dfc79711.tar.gz |
Move Paramiko into its own stratum from Ansible
For Zuul we need Paramiko with pycrypto and ecdsa, Ansible doesn't
mind. It doesn't make sense for the Zuul stratum to build-depend
on Ansible, so we should put Paramiko into a stratum of its own.
-rw-r--r-- | strata/ansible.morph | 7 | ||||
-rw-r--r-- | strata/python-paramiko.morph | 24 | ||||
-rw-r--r-- | strata/python-paramiko/pycrypto.morph | 3 |
3 files changed, 28 insertions, 6 deletions
diff --git a/strata/ansible.morph b/strata/ansible.morph index e0cb8581..bc7b2b55 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -3,12 +3,8 @@ kind: stratum description: A stratum with ansible and its dependencies build-depends: - morph: strata/core.morph +- morph: strata/python-paramiko.morph chunks: -- name: paramiko - repo: upstream:paramiko - ref: 951faed80b017e553a27c4cb98f210df44341f8f - unpetrify-ref: baserock/morph - build-depends: [] - name: markupsafe repo: upstream:markupsafe ref: 58cde05bdcb0a53d87213b4a5bb605937f178171 @@ -26,5 +22,4 @@ chunks: ref: aa56db7e28d4fe256471043b05120c2f41a840e5 unpetrify-ref: baserock/morph build-depends: - - paramiko - jinja2 diff --git a/strata/python-paramiko.morph b/strata/python-paramiko.morph new file mode 100644 index 00000000..9edc2a35 --- /dev/null +++ b/strata/python-paramiko.morph @@ -0,0 +1,24 @@ +name: python-paramiko +kind: stratum +description: A stratum with Paramiko and its dependencies. +build-depends: +- morph: strata/core.morph +chunks: +- name: ecdsa + repo: upstream:python-packages/ecdsa + ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c + unpetrify-ref: python-ecdsa-0.11 + build-depends: [] +- name: pycrypto + morph: strata/python-paramiko/pycrypto.morph + repo: upstream:python-packages/pycrypto + ref: 7fd528d03b5eae58eef6fd219af5d9ac9c83fa50 + unpetrify-ref: v2.6.1 + build-depends: [] +- name: paramiko + repo: upstream:paramiko + ref: 951faed80b017e553a27c4cb98f210df44341f8f + unpetrify-ref: baserock/morph + build-depends: + - ecdsa + - pycrypto diff --git a/strata/python-paramiko/pycrypto.morph b/strata/python-paramiko/pycrypto.morph new file mode 100644 index 00000000..51cc00f0 --- /dev/null +++ b/strata/python-paramiko/pycrypto.morph @@ -0,0 +1,3 @@ +name: pycrypto +kind: chunk +build-system: python-distutils |