summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-10 17:08:38 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-13 14:50:42 +0000
commit2770be545cd20c26b27e28592ed601a59ad613ad (patch)
treeb75a55a190d202fc1e3c9659f7a08435edb04cae /strata
parentdbdcbf87ad455ce56ce61f901d692b587ba6c065 (diff)
downloaddefinitions-2770be545cd20c26b27e28592ed601a59ad613ad.tar.gz
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
Diffstat (limited to 'strata')
-rw-r--r--strata/morph-utils.morph11
-rw-r--r--strata/python-wsgi.morph15
2 files changed, 16 insertions, 10 deletions
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
diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph
new file mode 100644
index 00000000..289d27ba
--- /dev/null
+++ b/strata/python-wsgi.morph
@@ -0,0 +1,15 @@
+name: python-wsgi
+kind: stratum
+description: |
+ Python modules for web applications using Web Server Gateway Interface.
+build-depends:
+- morph: strata/python-core.morph
+chunks:
+- name: bottle
+ repo: upstream:bottle
+ ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
+ unpetrify-ref: baserock/morph
+- name: flup
+ repo: upstream:flup
+ ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
+ unpetrify-ref: baserock/morph