5
2
[alpine-aports] [PATCH 1/2] main/py-werkzeug: clean up APKBUILD
---
main/py-werkzeug/APKBUILD | 31 ++++++++++++++ -----
.../disable-monkeypatched-sleep-test.patch | 10 ++++++
2 files changed, 33 insertions(+), 8 deletions(-)
create mode 100644 main/py-werkzeug/disable-monkeypatched-sleep-test.patch
diff --git a/main/py-werkzeug/APKBUILD b/main/py-werkzeug/APKBUILD
index 5ad869441d..3d5f141340 100644
--- a/main/py-werkzeug/APKBUILD
+++ b/main/py-werkzeug/APKBUILD
@@ -3,34 +3,50 @@
pkgname=py-werkzeug
_pkgname=Werkzeug
pkgver=0.14.1
- pkgrel=0
+ 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"
+ 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"
+ source="
+ https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+ disable-monkeypatched-sleep-test.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
+ prepare() {
+ default_prepare
+ cp -r "$builddir" "$builddir"-py3
+ }
+
build() {
cd "$builddir"
-
python2 setup.py build
+ cd "$builddir"-py3
python3 setup.py build
}
+ check() {
+ cd "$builddir"
+ pytest-2
+ cd "$builddir"-py3
+ pytest-3
+ }
+
package() {
mkdir -p "$pkgdir"
}
_py2() {
- replaces="$pkgname"
+ cd "$builddir"
_py python2
}
_py3() {
+ cd "$builddir"-py3
_py python3
}
@@ -39,9 +55,8 @@ _py() {
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"
+ sha512sums="64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b Werkzeug-0.14.1.tar.gz
+ 797fadb81cc6eee841eb57c481b0349a41950640be2c796679f3d9c9613098113ccacb9a585a3f9fb79f2db019f5264de6d15b59c556c028240d0d1612e5213c disable-monkeypatched-sleep-test.patch"
diff --git a/main/py-werkzeug/disable-monkeypatched-sleep-test.patch b/main/py-werkzeug/disable-monkeypatched-sleep-test.patch
new file mode 100644
index 0000000000..57e36717e9
--- /dev/null
+++ b/main/py-werkzeug/disable-monkeypatched-sleep-test.patch
@@ -0,0 +1,10 @@
+ --- Werkzeug-0.14.1-orig/tests/test_serving.py
+ +++ Werkzeug-0.14.1/tests/test_serving.py
+ @@ -265,6 +265,7 @@
+
+
+ def test_monkeypached_sleep(tmpdir):
+ + return # Broken on Alpine
+ # removing the staticmethod wrapper in the definition of
+ # ReloaderLoop._sleep works most of the time, since `sleep` is a c
+ # function, and unlike python functions which are descriptors, doesn't
--
2.20.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
[alpine-aports] [PATCH 2/2] main/py-flask: clean up APKBUILD
---
main/py-flask/APKBUILD | 23 ++++++++++++++++++ -----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/main/py-flask/APKBUILD b/main/py-flask/APKBUILD
index bbdbc258ef..1ae0cbd425 100644
--- a/main/py-flask/APKBUILD
+++ b/main/py-flask/APKBUILD
@@ -3,36 +3,51 @@
pkgname=py-flask
_pkgname=Flask
pkgver=1.0.2
- pkgrel=1
+ pkgrel=2
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() {
- replaces="$pkgname"
depends="${depends//py-/py2-}"
+ cd "$builddir"
_py python2
}
_py3() {
depends="${depends//py-/py3-}"
+ cd "$builddir"-py3
_py python3
}
@@ -41,8 +56,6 @@ _py() {
pkgdesc="$pkgdesc (for $python)"
depends="$depends $python"
install_if="$pkgname=$pkgver-r$pkgrel $python"
-
- cd "$builddir"
$python setup.py install --prefix=/usr --root="$subpkgdir"
}
--
2.20.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
[alpine-aports] [PATCH v2] main/py-werkzeug: clean up APKBUILD
---
Rebased as requested.
main/py-werkzeug/APKBUILD | 31 ++++++++++++++ -----
.../disable-monkeypatched-sleep-test.patch | 10 ++++++
2 files changed, 33 insertions(+), 8 deletions(-)
create mode 100644 main/py-werkzeug/disable-monkeypatched-sleep-test.patch
diff --git a/main/py-werkzeug/APKBUILD b/main/py-werkzeug/APKBUILD
index 5ad869441d..3d5f141340 100644
--- a/main/py-werkzeug/APKBUILD
+++ b/main/py-werkzeug/APKBUILD
@@ -3,34 +3,50 @@
pkgname=py-werkzeug
_pkgname=Werkzeug
pkgver=0.14.1
- pkgrel=0
+ 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"
+ 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"
+ source="
+ https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+ disable-monkeypatched-sleep-test.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
+ prepare() {
+ default_prepare
+ cp -r "$builddir" "$builddir"-py3
+ }
+
build() {
cd "$builddir"
-
python2 setup.py build
+ cd "$builddir"-py3
python3 setup.py build
}
+ check() {
+ cd "$builddir"
+ pytest-2
+ cd "$builddir"-py3
+ pytest-3
+ }
+
package() {
mkdir -p "$pkgdir"
}
_py2() {
- replaces="$pkgname"
+ cd "$builddir"
_py python2
}
_py3() {
+ cd "$builddir"-py3
_py python3
}
@@ -39,9 +55,8 @@ _py() {
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"
+ sha512sums="64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b Werkzeug-0.14.1.tar.gz
+ 797fadb81cc6eee841eb57c481b0349a41950640be2c796679f3d9c9613098113ccacb9a585a3f9fb79f2db019f5264de6d15b59c556c028240d0d1612e5213c disable-monkeypatched-sleep-test.patch"
diff --git a/main/py-werkzeug/disable-monkeypatched-sleep-test.patch b/main/py-werkzeug/disable-monkeypatched-sleep-test.patch
new file mode 100644
index 0000000000..57e36717e9
--- /dev/null
+++ b/main/py-werkzeug/disable-monkeypatched-sleep-test.patch
@@ -0,0 +1,10 @@
+ --- Werkzeug-0.14.1-orig/tests/test_serving.py
+ +++ Werkzeug-0.14.1/tests/test_serving.py
+ @@ -265,6 +265,7 @@
+
+
+ def test_monkeypached_sleep(tmpdir):
+ + return # Broken on Alpine
+ # removing the staticmethod wrapper in the definition of
+ # ReloaderLoop._sleep works most of the time, since `sleep` is a c
+ # function, and unlike python functions which are descriptors, doesn't
--
2.20.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
Hi,
On Thu, Feb 7, 2019 at 2:26 PM Drew DeVault <sir@cmpwn.com > wrote:
> ---
> main/py-werkzeug/APKBUILD | 31 ++++++++++++++-----
> .../disable-monkeypatched-sleep-test.patch | 10 ++++++
> 2 files changed, 33 insertions(+), 8 deletions(-)
> create mode 100644 main/py-werkzeug/disable-monkeypatched-sleep-test.patch
>
>
it needs rebasing.
Thanks!
/eo
Re: [alpine-aports] [PATCH v2] main/py-werkzeug: clean up APKBUILD
Re: [alpine-aports] [PATCH v2] main/py-werkzeug: clean up APKBUILD
Hi,
On Tue, Feb 12, 2019 at 3:16 PM Drew DeVault <sir@cmpwn.com > wrote:
> ---
> Rebased as requested.
>
>
sorry I believe you have local commits that haven't been upstreamed yet.
Did we miss something? Can you rebase against current HEAD?
Thanks!
/eo