Drew DeVault: 2 py3-werkzeug: drop py2, update to 0.15.4 py3-flask: drop py2, upgrade to 1.1.0 4 files changed, 62 insertions(+), 109 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/750/mbox | git am -3Learn more about email & git
--- main/py-werkzeug/APKBUILD | 47 -------------------------------------- main/py3-werkzeug/APKBUILD | 31 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 main/py-werkzeug/APKBUILD create mode 100644 main/py3-werkzeug/APKBUILD diff --git a/main/py-werkzeug/APKBUILD b/main/py-werkzeug/APKBUILD deleted file mode 100644 index b42d223b48..0000000000 --- a/main/py-werkzeug/APKBUILD @@ -1,47 +0,0 @@ -# Contributor: -# Maintainer: prspkt <prspkt@protonmail.com> -pkgname=py-werkzeug -_pkgname=Werkzeug -pkgver=0.14.1 -pkgrel=1 -pkgdesc="The WSGI swiss-army knife" -url="http://werkzeug.pocoo.org/" -arch="noarch" -license="MIT" -depends="" -makedepends="python2-dev python3-dev py-setuptools" -subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" - -build() { - cd "$builddir" - - python2 setup.py build || return 1 - python3 setup.py build -} - -package() { - mkdir -p "$pkgdir" -} - -_py2() { - replaces="$pkgname" - _py python2 -} - -_py3() { - _py python3 -} - -_py() { - local python="$1" - pkgdesc="$pkgdesc (for $python)" - depends="$depends $python" - install_if="$pkgname=$pkgver-r$pkgrel $python" - - cd "$builddir" - $python setup.py install --prefix=/usr --root="$subpkgdir" -} - -sha512sums="64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b Werkzeug-0.14.1.tar.gz" diff --git a/main/py3-werkzeug/APKBUILD b/main/py3-werkzeug/APKBUILD new file mode 100644 index 0000000000..61e31d865d --- /dev/null +++ b/main/py3-werkzeug/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: +# Maintainer: prspkt <prspkt@protonmail.com> +pkgname=py3-werkzeug +_pyname=Werkzeug +pkgver=0.15.4 +pkgrel=0 +pkgdesc="The WSGI swiss-army knife" +url="http://werkzeug.pocoo.org/" +arch="noarch" +license="MIT" +depends="" +makedepends="python3-dev py3-setuptools"
depends="" is empty and can be removed for brevity
+checkdepends="py3-pytest"
Since the package is noarch there is no need to have python3-dev
+_pypiprefix="${_pyname%${_pyname#?}}" +source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" +builddir="$srcdir/$_pyname-$pkgver" +replaces="py2-werkzeug py-werkzeug" +
the proper replaces-provides combo for python packages is replaces="py-werkzeug" provides="py-werkzeug=$pkgver-r$pkgrel" We don't want to replace explicit py2- installations --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
+build() { + python3 setup.py build +} + +check() { + PYTHONPATH="$builddir"/src pytest-3 +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab Werkzeug-0.15.4.tar.gz" -- 2.22.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- main/py-flask/APKBUILD | 62 ----------------------------------------- main/py3-flask/APKBUILD | 31 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 62 deletions(-) delete mode 100644 main/py-flask/APKBUILD create mode 100644 main/py3-flask/APKBUILD diff --git a/main/py-flask/APKBUILD b/main/py-flask/APKBUILD deleted file mode 100644 index 72db251052..0000000000 --- a/main/py-flask/APKBUILD @@ -1,62 +0,0 @@ -# Contributor: -# Maintainer: Drew DeVault <sir@cmpwn.com> -pkgname=py-flask -_pkgname=Flask -pkgver=1.0.3 -pkgrel=0 -pkgdesc="A web development microframework" -url="http://flask.pocoo.org/" -arch="noarch" -license="MIT" -depends="py-click py-itsdangerous py-jinja2 py-werkzeug" -makedepends="python2-dev python3-dev py-setuptools" -checkdepends="pytest" -subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" - -prepare() { - cp -r "$builddir" "$builddir"-py3 -} - -build() { - cd "$builddir" - python2 setup.py build - cd "$builddir"-py3 - python3 setup.py build -} - -check() { - cd "$builddir" - export PYTHONPATH="$builddir" - pytest-2 - cd "$builddir"-py3 - export PYTHONPATH="$builddir"-py3 - pytest-3 -} - -package() { - mkdir -p "$pkgdir" -} - -_py2() { - depends="${depends//py-/py2-}" - cd "$builddir" - _py python2 -} - -_py3() { - depends="${depends//py-/py3-}" - cd "$builddir"-py3 - _py python3 -} - -_py() { - local python="$1" - pkgdesc="$pkgdesc (for $python)" - depends="$depends $python" - install_if="$pkgname=$pkgver-r$pkgrel $python" - $python setup.py install --prefix=/usr --root="$subpkgdir" -} - -sha512sums="4b3fb1d7b9ec229e3ceda721791056e063a3bb0efd14e4ab9e2e49d3634e875608f05505cfd6b7f1c7fa3da3e1474283fdb72e174e52cded80acca7058f2f235 Flask-1.0.3.tar.gz" diff --git a/main/py3-flask/APKBUILD b/main/py3-flask/APKBUILD new file mode 100644 index 0000000000..d7e6e4369e --- /dev/null +++ b/main/py3-flask/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: +# Maintainer: Drew DeVault <sir@cmpwn.com> +pkgname=py3-flask +_pyname=Flask +pkgver=1.1.0 +pkgrel=0 +pkgdesc="A web development microframework" +url="http://flask.pocoo.org/" +arch="noarch" +license="MIT" +depends="py3-click py3-itsdangerous py3-jinja2 py3-werkzeug" +makedepends="python3-dev py-setuptools" +checkdepends="py3-pytest"
Should be py3-setuptools and no need for python3-dev
+_pypiprefix="${_pyname%${_pyname#?}}" +source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz" +builddir="$srcdir/$_pyname-$pkgver" +replaces="py-flask py2-flask" +
Same example as given to the other patch applies here about the replaces-provides combo. --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
+build() { + python3 setup.py build +} + +check() { + PYTHONPATH="$builddir"/src pytest-3 +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="29617030137a7f48a51085c9334b6b829c9253043f49f4eaa2b2e1bd2eff7d2875af5844fcd6e05019982da673013ed8ea76add32ee86fef1219b85c9487b055 Flask-1.1.0.tar.gz" -- 2.22.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---