[arch-commits] Commit in scrapy/trunk (PKGBUILD python310.patch)

[Antonio Rojas]

    Date: Sunday, July 31, 2022 @ 08:28:39
  Author: arojas
Revision: 1259245

upgpkg: scrapy 2.6.2-1: Update to 2.6.2

Modified:
  scrapy/trunk/PKGBUILD
Deleted:
  scrapy/trunk/python310.patch

-----------------+
 PKGBUILD        |   17 ++++++-----------
 python310.patch |   35 -----------------------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-31 00:15:16 UTC (rev 1259244)
+++ PKGBUILD	2022-07-31 08:28:39 UTC (rev 1259245)
@@ -3,7 +3,7 @@
 # Contributor: Anibal Pacheco <apacheco.uy at gmail.com>
 
 pkgname=scrapy
-pkgver=2.5.1
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="A fast high-level scraping and web crawling framework."
 arch=('any')
@@ -13,22 +13,16 @@
          'python-lxml' 'libxml2' 'python-parsel' 'python-pydispatcher' 'python-pyopenssl'
          'python-queuelib' 'python-service-identity' 'python-setuptools' 'python-w3lib'
          'python-zope-interface' 'python-protego' 'python-itemadapter' 'python-h2'
-         'python-priority')
+         'python-priority' 'python-tldextract')
 checkdepends=('python-pytest' 'python-botocore' 'bpython' 'python-brotli' 'python-jmespath'
               'ipython' 'mitmproxy' 'python-pillow' 'python-sybil' 'python-testfixtures'
               'python-pyftpdlib' 'python-uvloop')
 optdepends=('ipython: for enhanced support of the interactive scraping shell')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/scrapy/scrapy/archive/$pkgver.tar.gz"
-        python310.patch
-        $pkgname-add-peek-method-to-queues.patch::https://github.com/scrapy/scrapy/commit/68379197986a.patch)
-sha512sums=('4285272412b4c474707e864ece701990435d206b0a1ef28cb9f99cff87a02e6b0323e744e96f15878a3b433a7efe4be413d24068bb252f00f9ab1b0a980d844a'
-            '5a9e7567e7a62d2c7065ce95179f7f35f86d88947f3ba09d7a377318eb989b7799584389ac9223934b2807ba291454c4e1f5bcaad501590056b0c44d75297561'
-            'defc36c52bc86d990e36a3de4d2e7bafc6c3183670c9dd99d659f41de9d5ce8247c5cbb0aba9a4a8713d0073498441919e8410975a65ccec8243ca4d31c63336')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/scrapy/scrapy/archive/$pkgver.tar.gz")
+sha512sums=('4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5')
 
 prepare() {
   cd scrapy-$pkgver
-  patch -Np1 -i ../python310.patch
-  patch -Np1 -i ../$pkgname-add-peek-method-to-queues.patch
   sed -i 's/,<4.0//' setup.py
 }
 
@@ -39,7 +33,8 @@
 
 check() {
   cd scrapy-$pkgver
-  PYTHONPATH="$PWD/build/lib" pytest tests
+# test_proxy_connect hangs with mitmproxy 8.0 https://github.com/scrapy/scrapy/issues/5454
+  PYTHONPATH="$PWD/build/lib" pytest tests -k 'not test_proxy_connect'
 }
 
 package() {

Deleted: python310.patch
===================================================================
--- python310.patch	2022-07-31 00:15:16 UTC (rev 1259244)
+++ python310.patch	2022-07-31 08:28:39 UTC (rev 1259245)
@@ -1,35 +0,0 @@
-From dd8bf617c02c58270056b5e0821ccdfa682cc818 Mon Sep 17 00:00:00 2001
-From: Andrey Rakhmatullin <wrar at wrar.name>
-Date: Tue, 3 Aug 2021 20:16:29 +0500
-Subject: [PATCH] Fix tests for the 3.10 TypeError message change.
-
-(cherry picked from commit 93bf1ae7e3966d56539411c59d172c2971ee61e0)
----
- tests/test_request_cb_kwargs.py | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_request_cb_kwargs.py b/tests/test_request_cb_kwargs.py
-index 145a4e9b..b68184b8 100644
---- a/tests/test_request_cb_kwargs.py
-+++ b/tests/test_request_cb_kwargs.py
-@@ -158,12 +158,14 @@ class CallbackKeywordArgumentsTestCase(TestCase):
-                 if key in line.getMessage():
-                     exceptions[key] = line
-         self.assertEqual(exceptions['takes_less'].exc_info[0], TypeError)
--        self.assertEqual(
--            str(exceptions['takes_less'].exc_info[1]),
--            "parse_takes_less() got an unexpected keyword argument 'number'"
-+        self.assertTrue(
-+            str(exceptions['takes_less'].exc_info[1]).endswith(
-+                "parse_takes_less() got an unexpected keyword argument 'number'"
-+            )
-         )
-         self.assertEqual(exceptions['takes_more'].exc_info[0], TypeError)
--        self.assertEqual(
--            str(exceptions['takes_more'].exc_info[1]),
--            "parse_takes_more() missing 1 required positional argument: 'other'"
-+        self.assertTrue(
-+            str(exceptions['takes_more'].exc_info[1]).endswith(
-+                "parse_takes_more() missing 1 required positional argument: 'other'"
-+            )
-         )