diff options
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/baserock-import.morph | 3 | ||||
| -rw-r--r-- | strata/lorry-controller.morph | 2 | ||||
| -rw-r--r-- | strata/lorry.morph | 6 | ||||
| -rw-r--r-- | strata/morph-utils.morph | 22 | ||||
| -rw-r--r-- | strata/python-cliapp.morph | 24 | ||||
| -rw-r--r-- | strata/python-cliapp/python-coveragepy.morph (renamed from strata/morph-utils/python-coveragepy.morph) | 0 |
6 files changed, 30 insertions, 27 deletions
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index a3a195db..2b18d02d 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -2,7 +2,8 @@ name: baserock-import kind: stratum description: Tools for importing software into Baserock definitions. build-depends: -- morph: strata/morph-utils.morph +- morph: strata/python-common.morph +- morph: strata/python-cliapp.morph chunks: - name: ansicolor repo: upstream:python-packages/ansicolor diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 74ff75af..2d7076f9 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -6,7 +6,7 @@ description: | This is a component of Trove, but can also be used with other Git servers. build-depends: -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph diff --git a/strata/lorry.morph b/strata/lorry.morph index 741bbc34..b3a0c779 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -10,10 +10,8 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. build-depends: -# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at -# build-time to generate its man page. Otherwise we could simply depend on -# the 'foundation' stratum. -- morph: strata/morph-utils.morph +- morph: strata/foundation.morph +- morph: strata/python-cliapp.morph chunks: - name: bzr-tarball repo: upstream:bzr-tarball diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 80fce027..b5ba1df5 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,7 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -23,30 +23,12 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph -- name: python-coveragepy - morph: strata/morph-utils/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner - name: cmdtest morph: strata/morph-utils/cmdtest.morph repo: upstream:cmdtest ref: ac91791842c6e7e6eda3213916af413255999c7b unpetrify-ref: baserock/morph build-depends: - - cliapp - python-ttystatus - python-markdown - name: bottle @@ -66,9 +48,7 @@ chunks: ref: 68395a12c79c22e266b4a06095533e38da6e29d0 unpetrify-ref: master build-depends: - - cliapp - cmdtest - - python-coverage-test-runner - pyfilesystem - bottle - flup diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph new file mode 100644 index 00000000..ff6fda3e --- /dev/null +++ b/strata/python-cliapp.morph @@ -0,0 +1,24 @@ +name: python-cliapp +kind: stratum +description: | + Cliapp command line application framework. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: python-coveragepy + morph: strata/morph-utils/python-coveragepy.morph + repo: upstream:python-coveragepy + ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 + unpetrify-ref: baserock/morph +- name: python-coverage-test-runner + repo: upstream:python-coverage-test-runner + ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 + unpetrify-ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp + repo: upstream:cliapp + ref: cec20cedd062a3aef1b04f997e77b45090c07806 + unpetrify-ref: baserock/morph + build-depends: + - python-coverage-test-runner diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/python-cliapp/python-coveragepy.morph index ed5e3d87..ed5e3d87 100644 --- a/strata/morph-utils/python-coveragepy.morph +++ b/strata/python-cliapp/python-coveragepy.morph |