Date: Wednesday, March 25, 2020 @ 19:51:13 Author: jelle Revision: 604377
archrelease: copy trunk to community-any Added: python-bleach/repos/community-any/PKGBUILD (from rev 604376, python-bleach/trunk/PKGBUILD) python-bleach/repos/community-any/pytest5.patch (from rev 604376, python-bleach/trunk/pytest5.patch) Deleted: python-bleach/repos/community-any/PKGBUILD python-bleach/repos/community-any/pytest5.patch ---------------+ PKGBUILD | 75 +++++++++++++++++++++++++------------------------------- pytest5.patch | 46 +++++++++++++++++----------------- 2 files changed, 57 insertions(+), 64 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-25 19:51:05 UTC (rev 604376) +++ PKGBUILD 2020-03-25 19:51:13 UTC (rev 604377) @@ -1,41 +0,0 @@ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> - -pkgname=python-bleach -pkgver=3.1.1 -pkgrel=1 - -pkgdesc="An easy whitelist-based HTML-sanitizing tool" -url="https://pypi.org/project/bleach/" -arch=('any') -license=('Apache') -depends=('python-webencodings') -makedepends=('python' - 'python-setuptools') -checkdepends=('python-pytest') - -source=(https://pypi.org/packages/source/b/bleach/bleach-$pkgver.tar.gz - pytest5.patch) - -sha256sums=('aa8b870d0f46965bac2c073a93444636b0e1ca74e9777e34f03dd494b8a59d48' - 'a1d3dea566e7c56540b83bcd006c730f6c71fe531570fa2c5cccf0a917070bc6') - -prepare() { - # https://github.com/mozilla/bleach/pull/483 - patch -Np1 -d bleach-$pkgver <pytest5.patch -} - -build() { - cd "$srcdir"/bleach-$pkgver - python setup.py build -} - -# Upstream broke the test suite. -#check() { -# cd "$srcdir"/bleach-$pkgver -# python -m pytest -#} - -package() { - cd "$srcdir"/bleach-$pkgver - python setup.py install --root="$pkgdir" --optimize=1 -} Copied: python-bleach/repos/community-any/PKGBUILD (from rev 604376, python-bleach/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-25 19:51:13 UTC (rev 604377) @@ -0,0 +1,34 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> + +pkgname=python-bleach +pkgver=3.1.3 +pkgrel=1 + +pkgdesc="An easy whitelist-based HTML-sanitizing tool" +url="https://pypi.org/project/bleach/" +arch=('any') +license=('Apache') +depends=('python-webencodings') +makedepends=('python' + 'python-setuptools') +checkdepends=('python-pytest') + +source=(https://pypi.org/packages/source/b/bleach/bleach-$pkgver.tar.gz) + +sha256sums=('f8dfd8a7e26443e986c4e44df31870da8e906ea61096af06ba5d5cc2d519842a') + +build() { + cd "$srcdir"/bleach-$pkgver + python setup.py build +} + +# Upstream broke the test suite. +#check() { +# cd "$srcdir"/bleach-$pkgver +# python -m pytest +#} + +package() { + cd "$srcdir"/bleach-$pkgver + python setup.py install --root="$pkgdir" --optimize=1 +} Deleted: pytest5.patch =================================================================== --- pytest5.patch 2020-03-25 19:51:05 UTC (rev 604376) +++ pytest5.patch 2020-03-25 19:51:13 UTC (rev 604377) @@ -1,23 +0,0 @@ -From 9201b4708a90dc1f841285c6ec47814f6ed17495 Mon Sep 17 00:00:00 2001 -From: Emin Mastizada <e...@linux.com> -Date: Wed, 16 Oct 2019 17:47:27 +0300 -Subject: [PATCH] Support pytest5 syntax for tests - -diff --git a/tests/test_clean.py b/tests/test_clean.py -index e306cc5..d041ffa 100644 ---- a/tests/test_clean.py -+++ b/tests/test_clean.py -@@ -24,11 +24,11 @@ def test_only_text_is_cleaned(): - - with pytest.raises(TypeError) as e: - clean(some_type) -- assert "argument cannot be of 'type' type" in str(e) -+ assert "argument cannot be of 'type' type" in str(e.value) - - with pytest.raises(TypeError) as e: - clean(no_type) -- assert "NoneType" in str(e) -+ assert "NoneType" in str(e.value) - - - def test_empty(): Copied: python-bleach/repos/community-any/pytest5.patch (from rev 604376, python-bleach/trunk/pytest5.patch) =================================================================== --- pytest5.patch (rev 0) +++ pytest5.patch 2020-03-25 19:51:13 UTC (rev 604377) @@ -0,0 +1,23 @@ +From 9201b4708a90dc1f841285c6ec47814f6ed17495 Mon Sep 17 00:00:00 2001 +From: Emin Mastizada <e...@linux.com> +Date: Wed, 16 Oct 2019 17:47:27 +0300 +Subject: [PATCH] Support pytest5 syntax for tests + +diff --git a/tests/test_clean.py b/tests/test_clean.py +index e306cc5..d041ffa 100644 +--- a/tests/test_clean.py ++++ b/tests/test_clean.py +@@ -24,11 +24,11 @@ def test_only_text_is_cleaned(): + + with pytest.raises(TypeError) as e: + clean(some_type) +- assert "argument cannot be of 'type' type" in str(e) ++ assert "argument cannot be of 'type' type" in str(e.value) + + with pytest.raises(TypeError) as e: + clean(no_type) +- assert "NoneType" in str(e) ++ assert "NoneType" in str(e.value) + + + def test_empty():