summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-12 09:44:20 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-12 09:53:29 (GMT)
commitab35538e56f0add1475c6c405bbedc9caf4478a4 (patch)
tree2f02d63eb0c3f6cf8085c1e28b0a703262e7d526
parent1319309d3ff4eb85cb0e7e6cb178cb56ff116524 (diff)
downloaddefinitions-baserock/franred/move-six-to-python-core.tar.gz
six is a python 2 and 3 compatibility library, so move to python-core should remove dependencies in some strata.
-rw-r--r--strata/cross-bootstrap.morph9
-rw-r--r--strata/morph-utils.morph8
-rw-r--r--strata/python-core.morph5
-rw-r--r--systems/installer-system-x86_64.morph2
-rw-r--r--systems/xfce-system.morph2
5 files changed, 12 insertions, 14 deletions
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index 9687ac7..8c8ff51 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -3,12 +3,8 @@ kind: stratum
description: The minimal development tools to build a baserock devel system
build-depends:
- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- unpetrify-ref: baserock/morph
- build-depends: []
- name: groff
morph: strata/cross-bootstrap/groff.morph
repo: upstream:groff
@@ -70,8 +66,7 @@ chunks:
repo: upstream:pyfilesystem
ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6
unpetrify-ref: baserock/morph
- build-depends:
- - six
+ build-depends: []
- name: morph
repo: baserock:baserock/morph
ref: 67afd098cd297b769b1341a460d160a2902ba4e4
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 4e28f48..95e3e45 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -21,18 +21,12 @@ chunks:
ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610
unpetrify-ref: baserock/morph
build-depends: []
-- name: six
- repo: upstream:six
- ref: e66d45c46afc42eb89d7d2515b79f0ededa0e0fa
- 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:
- - six
+ build-depends: []
- name: python-coveragepy
morph: strata/morph-utils/python-coveragepy.morph
repo: upstream:python-coveragepy
diff --git a/strata/python-core.morph b/strata/python-core.morph
index ca07449..409d6f1 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -20,3 +20,8 @@ chunks:
ref: b83131779c701720a9ae9efae78996277d416269
unpetrify-ref: v2.5.1
build-depends: []
+- name: six
+ repo: upstream:six
+ ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
+ unpetrify-ref: 1.9.0
+ build-depends: []
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 0b5e470..8798182 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 152bf16..697ea52 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -7,6 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
+- name: python-core
+ morph: strata/python-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic