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

[Evangelos Foutras]

    Date: Thursday, November 12, 2020 @ 08:30:10
  Author: foutrelis
Revision: 751333

archrelease: copy trunk to community-staging-any

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

---------------+
 PKGBUILD      |   76 ++++++++++++++++++++++++++++++--------------------------
 pytest5.patch |   46 ++++++++++++++++-----------------
 2 files changed, 65 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-12 08:30:06 UTC (rev 751332)
+++ PKGBUILD	2020-11-12 08:30:10 UTC (rev 751333)
@@ -1,34 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-
-pkgname=python-bleach
-pkgver=3.2.1
-pkgrel=2
-
-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=('52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080')
-
-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-staging-any/PKGBUILD (from rev 751332, python-bleach/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-12 08:30:10 UTC (rev 751333)
@@ -0,0 +1,42 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+
+pkgname=python-bleach
+pkgver=3.2.1
+pkgrel=3
+
+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
+        $pkgname-py39.patch::https://github.com/mozilla/bleach/commit/9ba905729f17.patch)
+
+sha256sums=('52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080'
+            '5b47567a3d47c8e4464b63d5d50abc38da55f2a67d2fa2f7c65041191ea6c156')
+
+prepare() {
+	cd "$srcdir"/bleach-$pkgver
+	# https://github.com/mozilla/bleach/pull/565
+	patch -Np1 -i ../$pkgname-py39.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-11-12 08:30:06 UTC (rev 751332)
+++ pytest5.patch	2020-11-12 08:30:10 UTC (rev 751333)
@@ -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-staging-any/pytest5.patch (from rev 751332, python-bleach/trunk/pytest5.patch)
===================================================================
--- pytest5.patch	                        (rev 0)
+++ pytest5.patch	2020-11-12 08:30:10 UTC (rev 751333)
@@ -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():