summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-09-04 17:21:27 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-09-22 01:53:00 (GMT)
commit50b12ebbedec8dbf823905d60712784b9a5cdb8f (patch)
tree9e4eaaa4ccd24aae365126effc167a009fc0d2cd
parentd36e5611404f5b0c97d5b4d1b3f49431de9581dc (diff)
downloaddefinitions-jjardon/python3_default.tar.gz
core: Use python3 instead python2jjardon/python3_default
From [1]: "Python 2.x is legacy, Python 3.x is the present and future of the language" As a reference, python3 is already the default python version in Arch, and other distros like Ubuntu/Debian [2] or Fedora [3] are planning to switch soon [1] https://wiki.python.org/moin/Python2orPython3 [2] https://wiki.ubuntu.com/Python/3 [3] https://fedoraproject.org/wiki/Changes/Python_3_as_Default Change-Id: I6d4d11844d4424bfa49b37fe7d9a3639547c0139
-rw-r--r--install-files/essential-files/usr/bin/brpaste12
-rw-r--r--strata/core.morph16
-rw-r--r--strata/core/python3.morph12
-rw-r--r--strata/docutils.morph2
-rw-r--r--strata/foundation.morph1
-rw-r--r--strata/glib-common.morph2
-rw-r--r--strata/llvm-common.morph2
-rw-r--r--strata/python-core.morph26
-rw-r--r--strata/python-core/cpython.morph (renamed from strata/core/cpython.morph)1
-rw-r--r--strata/python-pygobject.morph2
-rw-r--r--strata/python3-core.morph11
-rw-r--r--strata/python3-core/python3.morph7
-rw-r--r--systems/build-system-armv5l-openbmc-aspeed.morph2
-rw-r--r--systems/build-system-armv7lhf-highbank.morph2
-rw-r--r--systems/build-system-armv7lhf-jetson.morph2
-rw-r--r--systems/build-system-armv8b64.morph2
-rw-r--r--systems/build-system-armv8l64.morph2
-rw-r--r--systems/build-system-ppc64.morph2
-rw-r--r--systems/build-system-x86_32-chroot.morph2
-rw-r--r--systems/build-system-x86_32.morph2
-rw-r--r--systems/build-system-x86_64-chroot.morph2
-rw-r--r--systems/build-system-x86_64.morph2
-rw-r--r--systems/ceph-service-x86_64-generic.morph2
-rw-r--r--systems/devel-system-armv7-chroot.morph2
-rw-r--r--systems/devel-system-armv7-highbank.morph2
-rw-r--r--systems/devel-system-armv7-versatile.morph2
-rw-r--r--systems/devel-system-armv7-wandboard.morph2
-rw-r--r--systems/devel-system-armv7b-chroot.morph2
-rw-r--r--systems/devel-system-armv7b-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph2
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph2
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph2
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph2
-rw-r--r--systems/devel-system-armv8b64.morph2
-rw-r--r--systems/devel-system-armv8l64.morph2
-rw-r--r--systems/devel-system-ppc64-chroot.morph2
-rw-r--r--systems/devel-system-ppc64-generic.morph2
-rw-r--r--systems/devel-system-x86_32-chroot.morph2
-rw-r--r--systems/devel-system-x86_32-generic.morph2
-rw-r--r--systems/devel-system-x86_64-chroot.morph2
-rw-r--r--systems/devel-system-x86_64-generic.morph2
-rw-r--r--systems/devel-system-x86_64-vagrant.morph2
-rw-r--r--systems/installer-system-armv8b64.morph2
-rw-r--r--systems/installer-system-x86_64.morph2
-rw-r--r--systems/java-build-system-x86_64-generic.morph2
-rw-r--r--systems/openstack-system-x86_64.morph2
-rw-r--r--systems/swift-system-x86_64.morph2
-rw-r--r--systems/trove-system-x86_64.morph2
-rw-r--r--systems/xfce-system-x86_64.morph2
49 files changed, 58 insertions, 110 deletions
diff --git a/install-files/essential-files/usr/bin/brpaste b/install-files/essential-files/usr/bin/brpaste
index 15f976b..d2f9d86 100644
--- a/install-files/essential-files/usr/bin/brpaste
+++ b/install-files/essential-files/usr/bin/brpaste
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
-import urllib2
+import urllib.request
import os
import json
@@ -15,14 +15,14 @@ def run(*args):
extensions = [None]
for i, each in enumerate(content):
- req = urllib2.Request(URL, each)
- response = urllib2.urlopen(req)
- the_page = response.read()
+ req = urllib.request.Request(URL, each.encode('utf-8'))
+ response = urllib.request.urlopen(req)
+ the_page = response.read().decode('utf-8')
key = json.loads(the_page)['key']
url = "http://paste.baserock.org/%s" % key
if extensions[i]:
url += extensions[i]
- print url
+ print(url)
if __name__ == '__main__':
import sys
diff --git a/strata/core.morph b/strata/core.morph
index 5ef86c1..89299f3 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -119,11 +119,11 @@ chunks:
ref: 24adc227bc29cd17e39df097fbca389c7724cd14
unpetrify-ref: sqlite-autoconf-3080801
build-system: autotools
-- name: cpython
- morph: strata/core/cpython.morph
+- name: python3
+ morph: strata/core/python3.morph
repo: upstream:cpython
- ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b
- unpetrify-ref: v2.7.10
+ ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad
+ unpetrify-ref: v3.4.3
build-depends:
- openssl-new
- bzip2
@@ -139,7 +139,7 @@ chunks:
unpetrify-ref: baserock/debian/20140325
build-depends:
- automake
- - cpython
+ - python3
- name: curl
morph: strata/core/curl.morph
repo: upstream:curl
@@ -166,7 +166,7 @@ chunks:
unpetrify-ref: v2.3.0
build-depends:
- autoconf
- - cpython
+ - python3
- curl
- gettext-tarball
- libexpat
@@ -340,7 +340,7 @@ chunks:
- autoconf
- automake
- file
- - cpython
+ - python3
- libtool
- xz
- name: libxslt
@@ -388,7 +388,7 @@ chunks:
unpetrify-ref: 0.22
build-system: python-distutils
build-depends:
- - cpython
+ - python3
- name: gperf
morph: strata/core/gperf.morph
repo: upstream:gperf
diff --git a/strata/core/python3.morph b/strata/core/python3.morph
new file mode 100644
index 0000000..4b3ef29
--- /dev/null
+++ b/strata/core/python3.morph
@@ -0,0 +1,12 @@
+name: python3
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+ ./configure --prefix="$PREFIX" \
+ --enable-shared \
+ --with-system-expat \
+ --with-system-ffi
+post-install-commands:
+- test -x "$DESTDIR"/"$PREFIX"/bin/python || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python
+- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3
diff --git a/strata/docutils.morph b/strata/docutils.morph
index 4329bb4..214e426 100644
--- a/strata/docutils.morph
+++ b/strata/docutils.morph
@@ -2,7 +2,7 @@ name: docutils
kind: stratum
description: Stuff for generating documentation
build-depends:
-- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
- name: xml-catalog
morph: strata/docutils/xml-catalog.morph
diff --git a/strata/foundation.morph b/strata/foundation.morph
index ff18e4e..5559645 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -3,6 +3,7 @@ kind: stratum
description: Basic userland runtime system
build-depends:
- morph: strata/coreutils-common.morph
+- morph: strata/python-core.morph
chunks:
- name: bash-completion
repo: upstream:bash-completion
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
index 09c88df..9f7b5e6 100644
--- a/strata/glib-common.morph
+++ b/strata/glib-common.morph
@@ -2,7 +2,7 @@ name: glib-common
kind: stratum
description: GLib and dependencies
build-depends:
-- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
- name: gtk-doc-stub
repo: upstream:gtk-doc-stub
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
index 794a7fc..ecf7302 100644
--- a/strata/llvm-common.morph
+++ b/strata/llvm-common.morph
@@ -1,7 +1,7 @@
name: llvm-common
kind: stratum
build-depends:
-- morph: strata/core.morph
+- morph: strata/python-core.morph
chunks:
- name: llvm
morph: strata/llvm-common/llvm.morph
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 630a807..43acacd 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -4,17 +4,25 @@ description: Core python packages
build-depends:
- morph: strata/core.morph
chunks:
+- name: cpython
+ morph: strata/python-core/cpython.morph
+ repo: upstream:cpython
+ ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b
+ unpetrify-ref: v2.7.10
- name: python-setuptools
morph: strata/core/python-setuptools.morph
repo: upstream:python-setuptools-bitbucket
ref: 0aa6a4de5931d02876428388678802db2371fd37
unpetrify-ref: baserock/master
+ build-depends:
+ - cpython
- name: mako
repo: upstream:python-packages/mako.git
ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
unpetrify-ref: rel_1_0_0
build-system: python-distutils
build-depends:
+ - cpython
- python-setuptools
- name: pbr
repo: upstream:pbr
@@ -22,31 +30,49 @@ chunks:
unpetrify-ref: 0.10.7
build-system: python-distutils
build-depends:
+ - cpython
- python-setuptools
- name: python-requests
repo: upstream:python-requests
ref: b83131779c701720a9ae9efae78996277d416269
unpetrify-ref: v2.5.1
build-system: python-distutils
+ build-depends:
+ - cpython
- name: six
repo: upstream:six
ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
unpetrify-ref: 1.9.0
build-system: python-distutils
+ build-depends:
+ - cpython
- name: pyyaml
morph: strata/python-core/pyyaml.morph
repo: upstream:pyyaml
ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
unpetrify-ref: baserock/morph
build-depends:
+ - cpython
- python-setuptools
+- name: cython2
+ repo: upstream:cython
+ ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
+ unpetrify-ref: 0.22
+ build-system: python-distutils
+ build-depends:
+ - cpython
- name: python-lxml
repo: upstream:python-lxml
ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
unpetrify-ref: lxml-3.4.0
build-system: python-distutils
+ build-depends:
+ - cpython
+ - cython2
- name: python-markdown
repo: upstream:python-markdown
ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
unpetrify-ref: 2.5.1-final
build-system: python-distutils
+ build-depends:
+ - cpython
diff --git a/strata/core/cpython.morph b/strata/python-core/cpython.morph
index e2f5927..853b063 100644
--- a/strata/core/cpython.morph
+++ b/strata/python-core/cpython.morph
@@ -9,4 +9,5 @@ configure-commands:
--with-system-expat \
--with-system-ffi
post-install-commands:
+- ln -sf python2.7 "$DESTDIR"/"$PREFIX"/bin/python
- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2
diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph
index 53e9fd7..e536ff1 100644
--- a/strata/python-pygobject.morph
+++ b/strata/python-pygobject.morph
@@ -3,7 +3,7 @@ kind: stratum
description: |
Python GObject bindings
build-depends:
-- morph: strata/core.morph
+- morph: strata/python-core.morph
- morph: strata/glib-common.morph
chunks:
- name: pygobject
diff --git a/strata/python3-core.morph b/strata/python3-core.morph
deleted file mode 100644
index f0da65f..0000000
--- a/strata/python3-core.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: python3-core
-kind: stratum
-description: Core python3 packages
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: python3
- morph: strata/python3-core/python3.morph
- repo: upstream:cpython
- ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad
- unpetrify-ref: v3.4.3
diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph
deleted file mode 100644
index f02452d..0000000
--- a/strata/python3-core/python3.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: python3
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --enable-shared
-post-install-commands:
-- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3
diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph
index 922d49f..48545b5 100644
--- a/systems/build-system-armv5l-openbmc-aspeed.morph
+++ b/systems/build-system-armv5l-openbmc-aspeed.morph
@@ -13,8 +13,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-armv5l-openbmc-aspeed
morph: strata/bsp-armv5l-openbmc-aspeed.morph
- name: tools
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index fa96ca0..3feb095 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-armv7-highbank
morph: strata/bsp-armv7-highbank.morph
- name: tools
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 2e180a6..c9400f2 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-jetson
morph: strata/bsp-jetson.morph
- name: tools
diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph
index 2775702..043cee4 100644
--- a/systems/build-system-armv8b64.morph
+++ b/systems/build-system-armv8b64.morph
@@ -15,8 +15,6 @@ strata:
morph: strata/bsp-armv8b64-generic.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: tools
morph: strata/tools.morph
- name: python-cliapp
diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph
index 2f9560c..da17f94 100644
--- a/systems/build-system-armv8l64.morph
+++ b/systems/build-system-armv8l64.morph
@@ -13,8 +13,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-armv8l64-generic
morph: strata/bsp-armv8l64-generic.morph
- name: tools
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 5c2851b..f5d7c95 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-ppc64-generic
morph: strata/bsp-ppc64-generic.morph
- name: tools
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index bfd77b8..a0845f0 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: tools
morph: strata/tools.morph
- name: python-cliapp
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index fe35055..7597f83 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-x86_32-generic
morph: strata/bsp-x86_32-generic.morph
- name: tools
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 3bbdd91..9c3e3a2 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: tools
morph: strata/tools.morph
- name: python-cliapp
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index b5e39f7..63aac41 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -12,8 +12,6 @@ strata:
morph: strata/foundation.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
- name: tools
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 9a36b85..cd78673 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -52,8 +52,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-common
morph: strata/python-common.morph
- name: chef
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 6fe7692..826bd6d 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -37,8 +37,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 9305bd5..85f1cbc 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -38,8 +38,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index fc1ee9c..a38d542 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -38,8 +38,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 4d6eabf..f542e5a 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -38,8 +38,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 0118742..4425fba 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -29,8 +29,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index acd68b5..8a90cd6 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -34,8 +34,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 180779d..8d75181 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -37,8 +37,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 8660e69..31266a1 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -41,8 +41,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index bac4f2a..aa8059a 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -41,8 +41,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index c11bbbb..dd13de7 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -41,8 +41,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index 001de4b..9160c17 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -42,8 +42,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index cde9fe1..2cd14c7 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -40,8 +40,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 59b03bd..9098b37 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -35,8 +35,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 0a07760..f718875 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -38,8 +38,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index b071abf..4be4b21 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -37,8 +37,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 9f792f3..85fbcae 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -42,8 +42,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 5be9910..bf54696 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -39,8 +39,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index ae0c97e..cb1ba7c 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -42,8 +42,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 4a91f84..857b382 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -40,8 +40,6 @@ strata:
morph: strata/baserock-import.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph
index 860a623..8099f53 100644
--- a/systems/installer-system-armv8b64.morph
+++ b/systems/installer-system-armv8b64.morph
@@ -10,8 +10,6 @@ strata:
morph: strata/core.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-armv8b64-generic
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 1e854f3..29ceffc 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -10,8 +10,6 @@ strata:
morph: strata/core.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic
diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph
index f083098..dcb15f9 100644
--- a/systems/java-build-system-x86_64-generic.morph
+++ b/systems/java-build-system-x86_64-generic.morph
@@ -45,8 +45,6 @@ strata:
morph: strata/nfs.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-tools
morph: strata/python-tools.morph
- name: python-common
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 8c191be..93d189d 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -9,8 +9,6 @@ strata:
morph: strata/core.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: python-common
diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph
index 139c002..c959b6f 100644
--- a/systems/swift-system-x86_64.morph
+++ b/systems/swift-system-x86_64.morph
@@ -17,8 +17,6 @@ strata:
morph: strata/ntpd.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: python-common
morph: strata/python-common.morph
- name: ansible
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 3ffb899..4c4ae7b 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -13,8 +13,6 @@ strata:
morph: strata/core.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: tools
morph: strata/tools.morph
- name: python-cliapp
diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph
index da23ecb..c61f3e0 100644
--- a/systems/xfce-system-x86_64.morph
+++ b/systems/xfce-system-x86_64.morph
@@ -11,8 +11,6 @@ strata:
morph: strata/coreutils-common.morph
- name: python-core
morph: strata/python-core.morph
-- name: python3-core
- morph: strata/python3-core.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic