From 4c462d124de7163a0d4c122bcce5b791b848aa63 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 6 Mar 2015 13:10:21 +0000 Subject: Use latest morph --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 86f41271..05b7c149 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -71,7 +71,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: a2645411b875a5faae17489c5b4bb11670b36259 + ref: 9e105fccb12de23551c93aac6cb2b1056b858700 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From ced4ed5f7aa35b46d161c5efea972699826f09de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 4 Mar 2015 18:35:21 +0000 Subject: Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1) --- strata/morph-utils.morph | 8 -------- 1 file changed, 8 deletions(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 05b7c149..7e3fdb30 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,30 +9,25 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph - build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph - build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -58,17 +53,14 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph - build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph - build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph ref: 9e105fccb12de23551c93aac6cb2b1056b858700 -- cgit v1.2.1 From 0927f7653fdb36f6dea9b8e659d1e8f8a66fb152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 6 Mar 2015 18:40:46 +0000 Subject: Revert "Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1)" Morph should have been updated first This reverts commit ced4ed5f7aa35b46d161c5efea972699826f09de. --- strata/morph-utils.morph | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 7e3fdb30..05b7c149 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,25 +9,30 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph + build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph + build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph + build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph + build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph + build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -53,14 +58,17 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph + build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph + build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master + build-depends: [] - name: morph repo: baserock:baserock/morph ref: 9e105fccb12de23551c93aac6cb2b1056b858700 -- cgit v1.2.1 From c3586f5c01937e19ed1b4a4ea7f195b5045e9201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 6 Mar 2015 18:42:24 +0000 Subject: Update morph to support version 1 definitions format --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 05b7c149..679e86eb 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -71,7 +71,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: 9e105fccb12de23551c93aac6cb2b1056b858700 + ref: be2370b14f08d1d1e147aca382d56a830a1b4094 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 9fa6cb41f584670cf5ca43b963d47ee62a8f6e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 4 Mar 2015 18:35:21 +0000 Subject: Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1) --- strata/morph-utils.morph | 8 -------- 1 file changed, 8 deletions(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 679e86eb..d8af58aa 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,30 +9,25 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph - build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph - build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -58,17 +53,14 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph - build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph - build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph ref: be2370b14f08d1d1e147aca382d56a830a1b4094 -- cgit v1.2.1 From 5e09ce28da6bddfc75661837058743447474f185 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 7 Mar 2015 03:09:59 +0000 Subject: Fix upgrade version of Morph We wanted to upgrade Morph to use latest master, and because of an human error of a Friday evening we used the sha1 of master of definitions.git instead of master of morph.git in the commit c3586f5c01937e19ed1b4a4ea7f195b5045e9201. Given that I gave a +2 for upgrading Morph to latest master, I'm merging this change without sending it for review. --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index d8af58aa..675d1101 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -63,7 +63,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: be2370b14f08d1d1e147aca382d56a830a1b4094 + ref: 11559bbbd24c218d512d503df27157668b37bdc9 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 6e2051516e5b60324138090c93abdea434e30839 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 11 Mar 2015 10:50:43 +0000 Subject: Update Morph for branch sam/distbuild-build-logs --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 675d1101..80fce027 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -63,7 +63,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: 11559bbbd24c218d512d503df27157668b37bdc9 + ref: 68395a12c79c22e266b4a06095533e38da6e29d0 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 2f91b8a0eeeb15469f3c5e1b104e34e88fe7df62 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 10 Mar 2015 13:48:22 +0000 Subject: Move cliapp into its own 'python-cliapp' stratum This allows us to have a system with Lorry and Lorry Controller but without Morph. Change-Id: I5164237601d0ff028834c674274f13b6e1f315c9 --- strata/morph-utils.morph | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'strata/morph-utils.morph') 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 -- cgit v1.2.1 From 2770be545cd20c26b27e28592ed601a59ad613ad Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 10 Mar 2015 17:08:38 +0000 Subject: Move 'bottle' and 'flup' into separate python-wsgi module The lorry-controller webapp uses these, as well as morph-cache-server. In order to use lorry-controller in systems that don't contain Morph, we need them to be in a separate stratum. Change-Id: Ie187c0b506d12ed5e5f8f8ce4a4b91834bf29fe5 --- strata/morph-utils.morph | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'strata/morph-utils.morph') diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index b5ba1df5..62649723 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -3,6 +3,7 @@ kind: stratum build-depends: - morph: strata/core.morph - morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -31,14 +32,6 @@ chunks: build-depends: - python-ttystatus - python-markdown -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 @@ -50,6 +43,4 @@ chunks: build-depends: - cmdtest - pyfilesystem - - bottle - - flup - pylru -- cgit v1.2.1