diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-12 09:44:20 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-12 17:33:18 +0000 |
commit | 49f7c082d5b3274c1a2670344cc8a227f5ed7ff5 (patch) | |
tree | 2bff325f51816161c91d97c392e05d72cd2e8f32 /strata | |
parent | 005410e90332a13da3df19f7be37ede0d77a321f (diff) | |
download | definitions-49f7c082d5b3274c1a2670344cc8a227f5ed7ff5.tar.gz |
Move six to python-core
six is a python 2 and 3 compatibility library, so move to python-core
should remove dependencies in some strata.
Diffstat (limited to 'strata')
-rw-r--r-- | strata/cross-bootstrap.morph | 9 | ||||
-rw-r--r-- | strata/morph-utils.morph | 8 | ||||
-rw-r--r-- | strata/python-core.morph | 5 |
3 files changed, 8 insertions, 14 deletions
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index b40eaa5c..be4f4db8 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-git @@ -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: 954baf68b9bb7f8bc4fae2447ef16f37928ff01c diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 1645bfed..ad039894 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 ca07449f..409d6f17 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: [] |