From 4074129b51049cd92afb1993673fe71081001ed3 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 18 Feb 2016 15:17:44 +0000 Subject: Add python3-core stratum, equivalent of python2-core There have been some important Python components not available for Python 3 users, such as PyYAML. This commit adds a python3-core stratu that contain everything from python2-core, but for use with Python 3. A couple of things are already in core.morph, so python2-core is not quite identical to python3-core. I've added this to Trove system so that can be merged. It can be added to other systems as needed. Change-Id: I9b742b942d64b0bc369596a689f33e6bc4c21935 --- strata/python2-core.morph | 44 +++++++++++++++--------- strata/python2-core/pyyaml-python2.morph | 6 ++++ strata/python2-core/pyyaml.morph | 6 ---- strata/python3-core.morph | 58 ++++++++++++++++++++++++++++++++ strata/python3-core/pyyaml.morph | 6 ++++ systems/trove-system-x86_64.morph | 2 ++ 6 files changed, 101 insertions(+), 21 deletions(-) create mode 100644 strata/python2-core/pyyaml-python2.morph delete mode 100644 strata/python2-core/pyyaml.morph create mode 100644 strata/python3-core.morph create mode 100644 strata/python3-core/pyyaml.morph diff --git a/strata/python2-core.morph b/strata/python2-core.morph index a39063ac..23c4e3c8 100644 --- a/strata/python2-core.morph +++ b/strata/python2-core.morph @@ -1,59 +1,69 @@ name: python2-core kind: stratum -description: Core python 2 packages +description: | + Some "core" Python 2 packages, including the CPython interpreter itself. + build-depends: - morph: strata/core.morph + chunks: - name: python2 morph: strata/python2-core/python2.morph repo: upstream:cpython ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b unpetrify-ref: v2.7.10 -- name: python-setuptools + +- name: python2-setuptools repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master build-system: python-distutils build-depends: - python2 -- name: mako + +- name: mako-python2 repo: upstream:python-packages/mako.git ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 unpetrify-ref: rel_1_0_0 build-system: python-distutils build-depends: - python2 - - python-setuptools -- name: pbr + - python2-setuptools + +- name: pbr-python2 repo: upstream:pbr ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 unpetrify-ref: 0.10.7 build-system: python-distutils build-depends: - python2 - - python-setuptools -- name: python-requests + - python2-setuptools + +- name: python2-requests repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 build-system: python-distutils build-depends: - python2 -- name: six + +- name: six-python2 repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 build-system: python-distutils build-depends: - python2 -- name: pyyaml - morph: strata/python2-core/pyyaml.morph + +- name: pyyaml-python2 + morph: strata/python2-core/pyyaml-python2.morph repo: upstream:pyyaml ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 unpetrify-ref: baserock/morph build-depends: - python2 - - python-setuptools + - python2-setuptools + - name: cython2 repo: upstream:cython ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d @@ -61,7 +71,8 @@ chunks: build-system: python-distutils build-depends: - python2 -- name: python-lxml + +- name: python2-lxml repo: upstream:python-lxml ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb unpetrify-ref: lxml-3.4.0 @@ -69,13 +80,15 @@ chunks: build-depends: - python2 - cython2 -- name: python-markdown + +- name: python2-markdown repo: upstream:python-markdown ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 unpetrify-ref: 2.5.1-final build-system: python-distutils build-depends: - python2 + - name: libxml2-python2 repo: upstream:libxml2 ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7 @@ -83,11 +96,12 @@ chunks: build-system: autotools build-depends: - python2 -- name: jsonschema + +- name: jsonschema-python2 repo: upstream:jsonschema ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 build-system: python-distutils build-depends: - python2 - - python-setuptools + - python2-setuptools diff --git a/strata/python2-core/pyyaml-python2.morph b/strata/python2-core/pyyaml-python2.morph new file mode 100644 index 00000000..54d2b035 --- /dev/null +++ b/strata/python2-core/pyyaml-python2.morph @@ -0,0 +1,6 @@ +name: pyyaml-python2 +kind: chunk +build-commands: +- python2 setup.py --without-libyaml build +install-commands: +- python2 setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/python2-core/pyyaml.morph b/strata/python2-core/pyyaml.morph deleted file mode 100644 index 8ebd7b57..00000000 --- a/strata/python2-core/pyyaml.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: pyyaml -kind: chunk -build-commands: -- python setup.py --without-libyaml build -install-commands: -- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/strata/python3-core.morph b/strata/python3-core.morph new file mode 100644 index 00000000..5bc491dd --- /dev/null +++ b/strata/python3-core.morph @@ -0,0 +1,58 @@ +name: python3-core +kind: stratum +description: | + Some "core" Python packages, for Python 3. + + The CPython interpreter for Python 3 is in core.morph. + +build-depends: +- morph: strata/core.morph + +chunks: +- name: mako + repo: upstream:python-packages/mako.git + ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 + unpetrify-ref: rel_1_0_0 + build-system: python3-distutils + +- name: pbr + repo: upstream:pbr + ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 + unpetrify-ref: 0.10.7 + build-system: python3-distutils + +- name: python-requests + repo: upstream:python-requests + ref: b83131779c701720a9ae9efae78996277d416269 + unpetrify-ref: v2.5.1 + build-system: python3-distutils + +- name: six + repo: upstream:six + ref: 8cfbff6b764af86d825086fa1637aa009e90d75a + unpetrify-ref: 1.9.0 + build-system: python3-distutils + +- name: pyyaml + morph: strata/python3-core/pyyaml.morph + repo: upstream:pyyaml + ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 + unpetrify-ref: baserock/morph + +- name: python-lxml + repo: upstream:python-lxml + ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb + unpetrify-ref: lxml-3.4.0 + build-system: python3-distutils + +- name: python-markdown + repo: upstream:python-markdown + ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 + unpetrify-ref: 2.5.1-final + build-system: python3-distutils + +- name: jsonschema + repo: upstream:jsonschema + ref: 35b60f390098d3306c03eee27ceec8cf8a493579 + unpetrify-ref: v2.3.0 + build-system: python3-distutils diff --git a/strata/python3-core/pyyaml.morph b/strata/python3-core/pyyaml.morph new file mode 100644 index 00000000..001f392c --- /dev/null +++ b/strata/python3-core/pyyaml.morph @@ -0,0 +1,6 @@ +name: pyyaml +kind: chunk +build-commands: +- python3 setup.py --without-libyaml build +install-commands: +- python3 setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR" diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index bd0a0ff4..43fd19fa 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -13,6 +13,8 @@ strata: morph: strata/core.morph - name: python2-core morph: strata/python2-core.morph +- name: python3-core + morph: strata/python3-core.morph - name: tools morph: strata/tools.morph - name: python-cliapp -- cgit v1.2.1