summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-25 12:06:57 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-25 12:08:49 +0000
commita7cec56a7e2c4d076580c517f88d114ea2be05d0 (patch)
tree407505d3a8f250ab5453ff8f4c11393e5f4410d7
parentffae53a8cbd808aa9f834e197003fe31b18cb9c1 (diff)
parent5f951de61c9ed050381054dd71ea07da37b3f19a (diff)
downloaddefinitions-a7cec56a7e2c4d076580c517f88d114ea2be05d0.tar.gz
Merge branch 'baserock/jjardon/move_python_core'
Reviewed-By: Richard Maw <richard.maw@gmail.com>
-rw-r--r--strata/core.morph14
-rw-r--r--strata/python-core.morph16
-rw-r--r--strata/python-core/pyyaml.morph (renamed from strata/core/pyyaml.morph)0
3 files changed, 15 insertions, 15 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 470e2dfa..a5ec5204 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -270,20 +270,6 @@ chunks:
build-depends:
- flex
- texinfo-tarball
-- name: python-setuptools
- morph: strata/core/python-setuptools.morph
- repo: upstream:python-setuptools-bitbucket
- ref: 0aa6a4de5931d02876428388678802db2371fd37
- unpetrify-ref: baserock/master
- build-depends:
- - cpython
-- name: pyyaml
- morph: strata/core/pyyaml.morph
- repo: upstream:pyyaml
- ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
- unpetrify-ref: baserock/morph
- build-depends:
- - python-setuptools
- name: shadow
morph: strata/core/shadow.morph
repo: upstream:shadow
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 409d6f17..2daf78b0 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -4,11 +4,18 @@ description: Core python packages
build-depends:
- morph: strata/core.morph
chunks:
+- name: python-setuptools
+ morph: strata/core/python-setuptools.morph
+ repo: upstream:python-setuptools-bitbucket
+ ref: 0aa6a4de5931d02876428388678802db2371fd37
+ unpetrify-ref: baserock/master
+ build-depends: []
- name: pip
repo: upstream:pip
ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
unpetrify-ref: baserock/master
- build-depends: []
+ build-depends:
+ - python-setuptools
- name: pbr
repo: upstream:pbr
ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
@@ -25,3 +32,10 @@ chunks:
ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
unpetrify-ref: 1.9.0
build-depends: []
+- name: pyyaml
+ morph: strata/python-core/pyyaml.morph
+ repo: upstream:pyyaml
+ ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - python-setuptools
diff --git a/strata/core/pyyaml.morph b/strata/python-core/pyyaml.morph
index 8ebd7b57..8ebd7b57 100644
--- a/strata/core/pyyaml.morph
+++ b/strata/python-core/pyyaml.morph