Date: Thursday, December 9, 2021 @ 05:25:51 Author: foutrelis Revision: 1065815
archrelease: copy trunk to community-staging-any Added: scrapy/repos/community-staging-any/PKGBUILD (from rev 1065814, scrapy/trunk/PKGBUILD) scrapy/repos/community-staging-any/python310.patch (from rev 1065814, scrapy/trunk/python310.patch) Deleted: scrapy/repos/community-staging-any/PKGBUILD -----------------+ PKGBUILD | 98 ++++++++++++++++++++++++++++-------------------------- python310.patch | 35 +++++++++++++++++++ 2 files changed, 87 insertions(+), 46 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-09 05:25:45 UTC (rev 1065814) +++ PKGBUILD 2021-12-09 05:25:51 UTC (rev 1065815) @@ -1,46 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: PyroDevil <p dot devil at gmail dot com> -# Contributor: Anibal Pacheco <apacheco...@gmail.com> - -pkgname=scrapy -pkgver=2.5.0 -pkgrel=3 -pkgdesc="A fast high-level scraping and web crawling framework." -arch=('any') -license=('BSD') -url="https://scrapy.org" -depends=('python-twisted' 'python-cryptography' 'python-cssselect' 'python-itemloaders' - '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') -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") -sha512sums=('01a5ab605ba6783567147b7ca8c0dd963266aeb63e8eac19e962ee5d6dda85052c23a4d161ab69f130925b8a6f271ffbc28784a8f7fc0216428b5579eaad47b6') - -prepare() { - cd scrapy-$pkgver - sed -i 's/,<4.0//' setup.py -} - -build() { - cd scrapy-$pkgver - python setup.py build -} - -check() { - cd scrapy-$pkgver - PYTHONPATH="$PWD/build/lib" pytest tests -} - -package() { - cd scrapy-$pkgver - python setup.py install -O1 --root="$pkgdir" - - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -D -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname/README.rst - install -D -m644 docs/intro/install.rst "$pkgdir"/usr/share/doc/$pkgname/INSTALL.rst -} Copied: scrapy/repos/community-staging-any/PKGBUILD (from rev 1065814, scrapy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-09 05:25:51 UTC (rev 1065815) @@ -0,0 +1,52 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: PyroDevil <p dot devil at gmail dot com> +# Contributor: Anibal Pacheco <apacheco...@gmail.com> + +pkgname=scrapy +pkgver=2.5.1 +pkgrel=1 +pkgdesc="A fast high-level scraping and web crawling framework." +arch=('any') +license=('BSD') +url="https://scrapy.org" +depends=('python-twisted' 'python-cryptography' 'python-cssselect' 'python-itemloaders' + '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') +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') + +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 +} + +build() { + cd scrapy-$pkgver + python setup.py build +} + +check() { + cd scrapy-$pkgver + PYTHONPATH="$PWD/build/lib" pytest tests +} + +package() { + cd scrapy-$pkgver + python setup.py install -O1 --root="$pkgdir" + + install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -D -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname/README.rst + install -D -m644 docs/intro/install.rst "$pkgdir"/usr/share/doc/$pkgname/INSTALL.rst +} Copied: scrapy/repos/community-staging-any/python310.patch (from rev 1065814, scrapy/trunk/python310.patch) =================================================================== --- python310.patch (rev 0) +++ python310.patch 2021-12-09 05:25:51 UTC (rev 1065815) @@ -0,0 +1,35 @@ +From dd8bf617c02c58270056b5e0821ccdfa682cc818 Mon Sep 17 00:00:00 2001 +From: Andrey Rakhmatullin <w...@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'" ++ ) + )