X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vs1-f49.google.com (mail-vs1-f49.google.com [209.85.217.49]) by lists.alpinelinux.org (Postfix) with ESMTP id B0E815C589B for ; Mon, 15 Oct 2018 06:22:33 +0000 (GMT) Received: by mail-vs1-f49.google.com with SMTP id f65-v6so1340991vsd.7 for ; Sun, 14 Oct 2018 23:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8amwGyiG92tZTuFILWcA5V0v/ulvAkW+W+DNXD2pe+Q=; b=YX2ogRAaK66a8Z4QCVzfhtbksg+JVYVegtbxUZ8IRDBPvWi0zDrRuR5/g9gTnZsCkm 1cEBMZFPtzsFeKmSCFRu2/w0uQSGfJ0jCxETugXSOUuvgTB1zZyUk1dWLrl9bktDTXCi dlZ6SrRWKnrmxKjbzhzJPqoWWzzKDr6lpQsR3h3UI6cN59u/Ffg3djnpJhbeoEFpHn45 UtT19cc9b4YStQjfCZRrMdpx9DIJDwKp8jcNBWMQjPIQ/Twvagt4hAou3atrnKA+KyiM 7vkma+vUrBpR/khWArtMmBMwXwCoDImLdQ7DFX07o6YTOLJlHOMT/PEIMpqixf69kZzk 7iWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8amwGyiG92tZTuFILWcA5V0v/ulvAkW+W+DNXD2pe+Q=; b=uXoWNet2rLHQ29ngSOuZbw2vYKIL8dnmror5dirco0wiqgqbFYY6NP4GvgnK0oHZlB hyOanZYeknWVnySdhxRZGFUY7zcWKY1pO1pOQGP/xlk8j6fwQlW1hypUI1aWfJdk3lo9 N2fJaLHqRDi9FIEIcljq4rJk+XJUvr84veRmlPPC0mc8RDR2VGMmaH4t/ynfK4GhLUEn rAspTzvjCjdgUvZoyDqIwJE4s3uxtRf0qUd2hp1p0R5L+7gkGbem6kHCU9XOtj/34TIT CyhRaEmf8BfuJM3wQx4O36I2mlQNuIB6l9jjk49DMRDPjPZRXyb0lif35d8uep5uGJ0c 6aiQ== X-Gm-Message-State: ABuFfohp8jtcVKZZKpjrpRAMCsbEwqN5AJhKzJqzZmxnNM/F+3nTq2aa TODQyTtEo0xYDJP41UnjLH2iDgU+/bLiHDfTMzI= X-Google-Smtp-Source: ACcGV63r+9oPjGJsIfpVAaTZPxRbgPLMr88C7cWPRUvTlP6nQKh5F+JdVqB7BCjAQ1Bv4W2JV+BB6khuaPxSZxJmALU= X-Received: by 2002:a67:f8c5:: with SMTP id c5mr6217495vsp.29.1539584552961; Sun, 14 Oct 2018 23:22:32 -0700 (PDT) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 References: <20180521213329.13734-1-marian.buschsieweke@ovgu.de> In-Reply-To: <20180521213329.13734-1-marian.buschsieweke@ovgu.de> From: Leonardo Arena Date: Mon, 15 Oct 2018 08:22:21 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] testing/py-matplotlib: Update to 2.2.2, py3 support To: Marian Buschsieweke Cc: alpine-aports Content-Type: multipart/alternative; boundary="000000000000618c6005783e7608" --000000000000618c6005783e7608 Content-Type: text/plain; charset="UTF-8" Hi, sorry for the late feedback. Please see some comments below: On Mon, May 21, 2018 at 11:33 PM Marian Buschsieweke < marian.buschsieweke@ovgu.de> wrote: > Added subpackages py2-matplotlib and py3-matplotlib, which provide the > python2 > and python3 version of matplotlib. > --- > testing/py-matplotlib/APKBUILD | 59 ++++++++++++++++++++++------------ > 1 file changed, 39 insertions(+), 20 deletions(-) > > diff --git a/testing/py-matplotlib/APKBUILD > b/testing/py-matplotlib/APKBUILD > index 45e057e3f6..d71994b560 100644 > --- a/testing/py-matplotlib/APKBUILD > +++ b/testing/py-matplotlib/APKBUILD > @@ -2,42 +2,61 @@ > # Maintainer: Isaac Dunham > pkgname=py-matplotlib > _pkgname=matplotlib > -pkgver=1.5.1 > -pkgrel=2 > +pkgver=2.2.2 > +pkgrel=0 > pkgdesc="A Python library for plots" > url="http://matplotlib.org" > arch="all !s390x" > license="custom" > I think the licence needs to be adjusted. > -depends="python2 py-numpy python2-tkinter py-dateutil py-parsing py-tz > py-cycler" > -makedepends="python2-dev gfortran py-numpy-dev freetype-dev libpng-dev > tk-dev > - py-setuptools" > -subpackages="$pkgname-doc $pkgname-tests" > +depends="" > +_depends_py2="python2 py2-numpy python2-tkinter py2-dateutil py2-parsing > py2-tz > + py2-cycler py2-cairo py2-kiwisolver" > +_depends_py3="python3 py3-numpy python3-tkinter py3-dateutil py3-parsing > py3-tz > + py3-cycler py3-cairo py3-kiwisolver" > We use to specify unversioned dependencies in "depends" and then in the respective subpackage we do a variable substitution for each python version: depends="${depends//py-/py2-}" depends="${depends//py-/py3-}" +makedepends="python3-dev python2-dev gfortran py-numpy-dev freetype-dev > + libpng-dev tk-dev py-setuptools ${_depends_py2} ${_depends_py3} > + py2-backports_functools_lru_cache" > +subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3 > + $pkgname-doc" > source="$_pkgname-$pkgver.tar.gz:: > https://github.com/matplotlib/$_pkgname/archive/v$pkgver.tar.gz" > builddir="$srcdir/$_pkgname-$pkgver" > > build() { > cd "$builddir" > python2 setup.py build || return 1 > + python3 setup.py build || return 1 > } > "|| return 1" can be removed nowdays. > > package() { > - cd "$builddir" > + mkdir -p "$pkgdir" > +} > + > +_py2() { > + replaces="$pkgname" > + depends="$depends $_depends_py2" > + _py python2 > +} > > - python2 setup.py install --prefix=/usr --root="$pkgdir" || return 1 > - install -m755 -d "$pkgdir"/usr/share/licenses/custom/$pkgname > - install -m644 LICENSE/* > "$pkgdir"/usr/share/licenses/custom/$pkgname/ > +_py3() { > + depends="$depends $_depends_py3" > + _py python3 > + # Remove documentation, doc-subpkg will use python2 version > + rm -rf "$subpkgdir/usr/share" > } > > -tests() { > - pkgdesc="$pkgdesc (tests)" > - arch="noarch" > - depends="$depends py-nose" > - local sitepath="$(python2 -c 'import site; > print(site.getsitepackages()[0])')/$_pkgname" > +doc() { > + mkdir -p "${subpkgdir}/usr" > + mv "${pkgdir}/../py2-$_pkgname/usr/share" "$subpkgdir/usr/" > +} > + > +_py() { > + local python="$1" > + pkgdesc="$pkgdesc (for $python)" > + cd "$builddir" > > - mkdir -p "$subpkgdir"$sitepath > - mv "$pkgdir"$sitepath/tests "$subpkgdir"$sitepath/ > + $python setup.py install --prefix=/usr --root="$subpkgdir" || > return 1 > + install -m755 -d "$subpkgdir"/usr/share/licenses/custom/$subpkgname > + install -m644 LICENSE/* > "$subpkgdir"/usr/share/licenses/custom/$subpkgname/ > } > > Doesn't look like there are tests enabled nor disabled. Thanks! /eo --000000000000618c6005783e7608 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

sorry f= or the late feedback.

Please see some comments bel= ow:

On Mon, May 21= , 2018 at 11:33 PM Marian Buschsieweke <marian.buschsieweke@ovgu.de> wrote:
Added subpackages py2-matplotlib = and py3-matplotlib, which provide the python2
and python3 version of matplotlib.
---
=C2=A0testing/py-matplotlib/APKBUILD | 59 ++++++++++++++++++++++-----------= -
=C2=A01 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/testing/py-matplotlib/APKBUILD b/testing/py-matplotlib/APKBUIL= D
index 45e057e3f6..d71994b560 100644
--- a/testing/py-matplotlib/APKBUILD
+++ b/testing/py-matplotlib/APKBUILD
@@ -2,42 +2,61 @@
=C2=A0# Maintainer: Isaac Dunham <ibid.ag@gmail.com>
=C2=A0pkgname=3Dpy-matplotlib
=C2=A0_pkgname=3Dmatplotlib
-pkgver=3D1.5.1
-pkgrel=3D2
+pkgver=3D2.2.2
+pkgrel=3D0
=C2=A0pkgdesc=3D"A Python library for plots"
=C2=A0url=3D"http://matplotlib.org"
=C2=A0arch=3D"all !s390x"
=C2=A0license=3D"custom"


=
I think the licence needs to be adjusted.

=C2=A0
-depends=3D"python2 py-numpy python2-tkinter py-dateutil py-parsing py= -tz py-cycler"
-makedepends=3D"python2-dev gfortran py-numpy-dev freetype-dev libpng-= dev tk-dev
-=C2=A0 =C2=A0 =C2=A0 =C2=A0py-setuptools"
-subpackages=3D"$pkgname-doc $pkgname-tests"
+depends=3D""
+_depends_py2=3D"python2 py2-numpy python2-tkinter py2-dateutil py2-pa= rsing py2-tz
+=C2=A0 =C2=A0 =C2=A0 =C2=A0py2-cycler py2-cairo py2-kiwisolver"
+_depends_py3=3D"python3 py3-numpy python3-tkinter py3-dateutil py3-pa= rsing py3-tz
+=C2=A0 =C2=A0 =C2=A0 =C2=A0py3-cycler py3-cairo py3-kiwisolver"

We use to specify unversioned dependencies i= n "depends" and then in the respective subpackage we do a variabl= e substitution for each python version:

depends=3D= "${depends//py-/py2-}"
depends=3D"${depends//py-/p= y3-}"

+makedepends=3D"python3-dev python2-dev gfortran py-numpy-dev freetype= -dev
+=C2=A0 =C2=A0 =C2=A0 =C2=A0libpng-dev tk-dev py-setuptools ${_depends_py2}= ${_depends_py3}
+=C2=A0 =C2=A0 =C2=A0 =C2=A0py2-backports_functools_lru_cache"
+subpackages=3D"py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3
+=C2=A0 =C2=A0 =C2=A0 =C2=A0$pkgname-doc"
=C2=A0source=3D"$_pkgname-$pkgver.tar.gz::https://github.com/matplotlib/$_pkgname/archive/v$pkgver.tar.gz= "
=C2=A0builddir=3D"$srcdir/$_pkgname-$pkgver"

=C2=A0build() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cd "$builddir"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 python2 setup.py build || return 1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0python3 setup.py build || return 1
=C2=A0}

"|| return 1" can be = removed nowdays.

=C2=A0

=C2=A0package() {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$pkgdir"
+}
+
+_py2() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0replaces=3D"$pkgname"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$depends $_depends_py2" +=C2=A0 =C2=A0 =C2=A0 =C2=A0_py python2
+}

-=C2=A0 =C2=A0 =C2=A0 =C2=A0python2 setup.py install --prefix=3D/usr --root= =3D"$pkgdir" || return 1
-=C2=A0 =C2=A0 =C2=A0 =C2=A0install -m755 -d "$pkgdir"/usr/share/= licenses/custom/$pkgname
-=C2=A0 =C2=A0 =C2=A0 =C2=A0install -m644 LICENSE/* "$pkgdir"/usr= /share/licenses/custom/$pkgname/
+_py3() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$depends $_depends_py3" +=C2=A0 =C2=A0 =C2=A0 =C2=A0_py python3
+=C2=A0 =C2=A0 =C2=A0 =C2=A0# Remove documentation, doc-subpkg will use pyt= hon2 version
+=C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf "$subpkgdir/usr/share"
=C2=A0}

-tests() {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (tests)"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0arch=3D"noarch"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"$depends py-nose"
-=C2=A0 =C2=A0 =C2=A0 =C2=A0local sitepath=3D"$(python2 -c 'import= site; print(site.getsitepackages()[0])')/$_pkgname"
+doc() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "${subpkgdir}/usr"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "${pkgdir}/../py2-$_pkgname/usr/share&q= uot; "$subpkgdir/usr/"
+}
+
+_py() {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0local python=3D"$1"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"$pkgdesc (for $python)" +=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"

-=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"$sitepath
-=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"$sitepath/tests "$su= bpkgdir"$sitepath/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0$python setup.py install --prefix=3D/usr --root= =3D"$subpkgdir" || return 1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0install -m755 -d "$subpkgdir"/usr/sha= re/licenses/custom/$subpkgname
+=C2=A0 =C2=A0 =C2=A0 =C2=A0install -m644 LICENSE/* "$subpkgdir"/= usr/share/licenses/custom/$subpkgname/
=C2=A0}


Doesn't look like there are tests = enabled nor disabled.

Thanks!

=
/eo
--000000000000618c6005783e7608-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---