summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-05 15:42:36 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-05 15:42:36 +0000
commit523bdbd893c3503fffcf4ebebc08859234395c45 (patch)
tree5ac18cc642e15e9aea608af018c9c003f6d9723f
parentcefbbe80f79d75c3881b8047fe3d472cdb68cee3 (diff)
parent442186eb29ac8f060885fa64688a2cb83a5df7c8 (diff)
downloaddefinitions-523bdbd893c3503fffcf4ebebc08859234395c45.tar.gz
Merge remote-tracking branch 'origin/danielfirth/pyfilesystem'
-rw-r--r--glanceclient.morph6
-rw-r--r--tools.morph10
2 files changed, 10 insertions, 6 deletions
diff --git a/glanceclient.morph b/glanceclient.morph
index 0ed5edb3..0b0bb679 100644
--- a/glanceclient.morph
+++ b/glanceclient.morph
@@ -10,10 +10,6 @@ build-depends:
repo: baserock:baserock/morphs
chunks:
- build-depends: []
- name: six
- ref: baserock/morph
- repo: upstream:six
-- build-depends: []
name: jsonschema
ref: baserock/morph
repo: upstream:jsonschema
@@ -26,7 +22,6 @@ chunks:
ref: baserock/morph
repo: upstream:python-json-patch
- build-depends:
- - six
- jsonschema
- python-json-pointer
- python-json-patch
@@ -80,7 +75,6 @@ chunks:
- python-prettytable
- python-requests
- simplejson
- - six
- netaddr
- babel
name: python-keystoneclient
diff --git a/tools.morph b/tools.morph
index e0fcc8ef..9f614b0d 100644
--- a/tools.morph
+++ b/tools.morph
@@ -4,6 +4,10 @@ build-depends:
repo: baserock:baserock/morphs
chunks:
- build-depends: []
+ name: six
+ ref: baserock/morph
+ repo: upstream:six
+- build-depends: []
name: patch
ref: baserock/morph
repo: upstream:patch
@@ -70,9 +74,15 @@ chunks:
ref: baserock/morph
repo: upstream:lsof
- build-depends:
+ - six
+ name: pyfilesystem
+ ref: baserock/morph
+ repo: upstream:pyfilesystem
+- build-depends:
- cliapp
- cmdtest
- python-coverage-test-runner
+ - pyfilesystem
name: morph
ref: master
repo: baserock:baserock/morph