[arch-commits] Commit in python-bleach/repos/community-any (4 files)

[Johannes Löthberg]

    Date: Tuesday, March 3, 2020 @ 11:32:05
  Author: demize
Revision: 589613

archrelease: copy trunk to community-any

Added:
  python-bleach/repos/community-any/PKGBUILD
    (from rev 589612, python-bleach/trunk/PKGBUILD)
  python-bleach/repos/community-any/pytest5.patch
    (from rev 589612, python-bleach/trunk/pytest5.patch)
Deleted:
  python-bleach/repos/community-any/PKGBUILD
  python-bleach/repos/community-any/pytest5.patch

---------------+
 PKGBUILD      |  102 ++++++++++++++++++++++----------------------------------
 pytest5.patch |   46 ++++++++++++-------------
 2 files changed, 64 insertions(+), 84 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 11:31:59 UTC (rev 589612)
+++ PKGBUILD	2020-03-03 11:32:05 UTC (rev 589613)
@@ -1,61 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-
-pkgbase=python-bleach
-pkgname=(python-bleach python2-bleach)
-pkgver=3.1.0
-pkgrel=3
-
-pkgdesc="An easy whitelist-based HTML-sanitizing tool"
-url="https://pypi.org/project/bleach/"
-arch=('any')
-license=('Apache')
-makedepends=('python'
-             'python-setuptools'
-             'python-webencodings'
-             'python2'
-             'python2-setuptools'
-              'python2-webencodings')
-checkdepends=('python-pytest'
-              'python2-pytest')
-
-source=(https://pypi.org/packages/source/b/bleach/bleach-$pkgver.tar.gz
-        pytest5.patch)
-
-sha256sums=('3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa'
-            'a1d3dea566e7c56540b83bcd006c730f6c71fe531570fa2c5cccf0a917070bc6')
-
-prepare() {
-	# https://github.com/mozilla/bleach/pull/483
-	patch -Np1 -d bleach-$pkgver <pytest5.patch
-	cp -a bleach-$pkgver{,-python2}
-}
-
-build() {
-	cd "$srcdir"/bleach-$pkgver
-	python setup.py build
-
-	cd "$srcdir"/bleach-$pkgver-python2
-	python2 setup.py build
-}
-
-check() {
-	cd "$srcdir"/bleach-$pkgver
-	python -m pytest
-
-	cd "$srcdir"/bleach-$pkgver-python2
-	python2 -m pytest
-}
-
-package_python-bleach() {
-	depends=('python-webencodings')
-
-	cd "$srcdir"/bleach-$pkgver
-	python setup.py install --root="$pkgdir" --optimize=1
-}
-
-package_python2-bleach() {
-	depends=('python2-webencodings')
-
-	cd "$srcdir"/bleach-$pkgver-python2
-	python2 setup.py install --root="$pkgdir" --optimize=1
-}

Copied: python-bleach/repos/community-any/PKGBUILD (from rev 589612, python-bleach/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-03 11:32:05 UTC (rev 589613)
@@ -0,0 +1,41 @@
+# Maintainer: Johannes Löthberg <johannes at 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
+}

Deleted: pytest5.patch
===================================================================
--- pytest5.patch	2020-03-03 11:31:59 UTC (rev 589612)
+++ pytest5.patch	2020-03-03 11:32:05 UTC (rev 589613)
@@ -1,23 +0,0 @@
-From 9201b4708a90dc1f841285c6ec47814f6ed17495 Mon Sep 17 00:00:00 2001
-From: Emin Mastizada <emin at 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 589612, python-bleach/trunk/pytest5.patch)
===================================================================
--- pytest5.patch	                        (rev 0)
+++ pytest5.patch	2020-03-03 11:32:05 UTC (rev 589613)
@@ -0,0 +1,23 @@
+From 9201b4708a90dc1f841285c6ec47814f6ed17495 Mon Sep 17 00:00:00 2001
+From: Emin Mastizada <emin at 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():