diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-09-04 18:21:27 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-10-16 13:00:16 +0000 |
| commit | 893259d724707190f763a980bc055ad9c87f7535 (patch) | |
| tree | 2ab1fff831c2f691cf18d4e27fcc9db31e2aea25 /strata | |
| parent | d282001d128f5e427f09bfe2b5f90af2b35e86bc (diff) | |
| download | definitions-893259d724707190f763a980bc055ad9c87f7535.tar.gz | |
core: Use python3 instead python2
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
Diffstat (limited to 'strata')
28 files changed, 73 insertions, 50 deletions
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 74aa72f5..3e32f7e5 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -4,7 +4,7 @@ description: apache http web server and some utilities related to it build-depends: - morph: strata/tools.morph - morph: strata/pcre-utils.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: apr morph: strata/apache-httpd-server/apr.morph diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index fc7d73ad..4cb15542 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -3,7 +3,7 @@ kind: stratum description: A stratum with cloudinit to fit a system in the OpenStack cloud. build-depends: - morph: strata/build-essential.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-common.morph - morph: strata/foundation.morph chunks: diff --git a/strata/core.morph b/strata/core.morph index 30add442..4d51b763 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 00000000..0d730bc9 --- /dev/null +++ b/strata/core/python3.morph @@ -0,0 +1,13 @@ +name: python3 +kind: chunk +build-system: autotools +configure-commands: +- | + ./configure --prefix="$PREFIX" \ + --sysconfdir=/etc \ + --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/cross-bootstrap.morph b/strata/cross-bootstrap.morph index e0c5991d..9248101a 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -3,7 +3,7 @@ kind: stratum description: The minimal development tools to build a baserock devel system build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: groff morph: strata/cross-bootstrap/groff.morph diff --git a/strata/databases.morph b/strata/databases.morph index 1f8f7b8d..444cca9a 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -4,7 +4,7 @@ description: some popular databases and some utils related to databases build-depends: - morph: strata/tools.morph - morph: strata/nfs.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: postgresql repo: upstream:postgresql diff --git a/strata/devtools.morph b/strata/devtools.morph index 7bc8b581..c48d63ab 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -7,7 +7,7 @@ description: | stratum) build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: nano morph: strata/devtools/nano.morph diff --git a/strata/django.morph b/strata/django.morph index 7da11a9f..27c1c662 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -3,7 +3,7 @@ kind: stratum description: Stratum with Django and its plugins and dependencies. build-depends: - morph: strata/foundation.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: django repo: upstream:python-packages/django diff --git a/strata/docutils.morph b/strata/docutils.morph index 4329bb42..e76cc7a2 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/python2-core.morph chunks: - name: xml-catalog morph: strata/docutils/xml-catalog.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index ff18e4e7..5961dc50 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/python2-core.morph chunks: - name: bash-completion repo: upstream:bash-completion diff --git a/strata/glib-common.morph b/strata/glib-common.morph index 2976e7de..ffdc5b14 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/python2-core.morph chunks: - name: gtk-doc-stub repo: upstream:gtk-doc-stub diff --git a/strata/gnome.morph b/strata/gnome.morph index 0c7dac0f..2dc0a7a5 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -11,7 +11,7 @@ build-depends: - morph: strata/multimedia-gstreamer.morph - morph: strata/network-security.morph - morph: strata/python-pygobject.morph -- morph: strata/python3-core.morph +- morph: strata/python2-core.morph - morph: strata/wayland-generic.morph - morph: strata/x-generic.morph chunks: diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 794a7fc5..d8fdb14a 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/python2-core.morph chunks: - name: llvm morph: strata/llvm-common/llvm.morph diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 50faeaa9..f47fcf0e 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -5,7 +5,7 @@ build-depends: - morph: strata/llvm-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/x-common.morph chunks: - name: mesa diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 83f19d6d..ded1bd3e 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -4,7 +4,7 @@ build-depends: - morph: strata/core.morph - morph: strata/ostree-core.morph - morph: strata/python-cliapp.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-pygobject.morph - morph: strata/python-wsgi.morph chunks: diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph index fa5084e1..d143007d 100644 --- a/strata/python-cliapp.morph +++ b/strata/python-cliapp.morph @@ -3,7 +3,7 @@ kind: stratum description: | Cliapp command line application framework. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: python-coveragepy morph: strata/python-cliapp/python-coveragepy.morph diff --git a/strata/python-common.morph b/strata/python-common.morph index 961a0a19..9d844a49 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -2,7 +2,7 @@ name: python-common kind: stratum description: Common dependencies of some python chunks build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: pycrypto morph: strata/python-common/pycrypto.morph diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph index 53e9fd72..a6667be2 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/python2-core.morph - morph: strata/glib-common.morph chunks: - name: pygobject diff --git a/strata/python-tools.morph b/strata/python-tools.morph index bc466755..d61fe150 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -3,7 +3,7 @@ kind: stratum description: | A stratum for useful python tools that we don't want to include in core. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: virtualenv repo: upstream:python-packages/virtualenv diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph index 1472dc9b..cd72e398 100644 --- a/strata/python-wsgi.morph +++ b/strata/python-wsgi.morph @@ -3,7 +3,7 @@ kind: stratum description: | Python modules for web applications using Web Server Gateway Interface. build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: bottle repo: upstream:bottle diff --git a/strata/python-core.morph b/strata/python2-core.morph index 3cc4a174..ded49141 100644 --- a/strata/python-core.morph +++ b/strata/python2-core.morph @@ -1,20 +1,28 @@ -name: python-core +name: python2-core kind: stratum -description: Core python packages +description: Core python 2 packages 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 repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master build-system: python-distutils + build-depends: + - python2 - name: mako 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 repo: upstream:pbr @@ -22,31 +30,49 @@ chunks: unpetrify-ref: 0.10.7 build-system: python-distutils build-depends: + - python2 - python-setuptools - name: python-requests repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 build-system: python-distutils + build-depends: + - python2 - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 build-system: python-distutils + build-depends: + - python2 - name: pyyaml - morph: strata/python-core/pyyaml.morph + morph: strata/python2-core/pyyaml.morph repo: upstream:pyyaml ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 unpetrify-ref: baserock/morph build-depends: + - python2 - python-setuptools +- name: cython2 + repo: upstream:cython + ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d + unpetrify-ref: 0.22 + build-system: python-distutils + build-depends: + - python2 - name: python-lxml repo: upstream:python-lxml ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb unpetrify-ref: lxml-3.4.0 build-system: python-distutils + build-depends: + - python2 + - cython2 - name: python-markdown repo: upstream:python-markdown ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 unpetrify-ref: 2.5.1-final build-system: python-distutils + build-depends: + - python2 diff --git a/strata/core/cpython.morph b/strata/python2-core/python2.morph index e2f59278..d5f6913a 100644 --- a/strata/core/cpython.morph +++ b/strata/python2-core/python2.morph @@ -1,4 +1,4 @@ -name: cpython +name: python2 kind: chunk build-system: autotools configure-commands: @@ -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-core/pyyaml.morph b/strata/python2-core/pyyaml.morph index 8ebd7b57..8ebd7b57 100644 --- a/strata/python-core/pyyaml.morph +++ b/strata/python2-core/pyyaml.morph diff --git a/strata/python3-core.morph b/strata/python3-core.morph deleted file mode 100644 index f0da65fc..00000000 --- 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 fa7bedc9..00000000 --- a/strata/python3-core/python3.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: python3 -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared -post-install-commands: -- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/trove.morph b/strata/trove.morph index 984050b7..026c6870 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -2,7 +2,7 @@ name: trove kind: stratum description: Trove software build-depends: -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/tools.morph - morph: strata/morph-utils.morph - morph: strata/pcre-utils.morph diff --git a/strata/virtualization.morph b/strata/virtualization.morph index fe02f0f8..f58018b6 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -7,7 +7,7 @@ description: | for example. build-depends: - morph: strata/libsoup-common.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph - morph: strata/python-pygobject.morph - morph: strata/connman-common.morph - morph: strata/lvm.morph diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 64b1fc64..e396003b 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -10,7 +10,7 @@ description: | but it is required right now for the Openstack system to work. build-depends: - morph: strata/foundation.morph -- morph: strata/python-core.morph +- morph: strata/python2-core.morph chunks: - name: xstatic repo: upstream:xstatic |