[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/files/, dev-python/scrapy/

2023-12-30 Thread Lucio Sauer
commit: 8dbc037bbfab1e35bf3b4eb14bce705f11c74c45
Author: Lucio Sauer  posteo  net>
AuthorDate: Sat Dec 30 20:02:09 2023 +
Commit: Lucio Sauer  posteo  net>
CommitDate: Sat Dec 30 20:11:36 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8dbc037b

dev-python/scrapy: backport lift on dependency restriction

dev-python/twisted::gentoo surpassed max. allowed version.
Enable more tests.
Fix DEPEND/BDEPEND confusion.
Update IUSE and RESTRICT to account for the test USE flag.
Remove superfluous ${PYTHON_DEPS}, as it's already inherited.

Signed-off-by: Lucio Sauer  posteo.net>

 .../scrapy-2.11.0-lift-twisted-restriction.patch   | 99 ++
 dev-python/scrapy/scrapy-2.11.0-r1.ebuild  | 61 +
 2 files changed, 160 insertions(+)

diff --git 
a/dev-python/scrapy/files/scrapy-2.11.0-lift-twisted-restriction.patch 
b/dev-python/scrapy/files/scrapy-2.11.0-lift-twisted-restriction.patch
new file mode 100644
index 00..c3ef232870
--- /dev/null
+++ b/dev-python/scrapy/files/scrapy-2.11.0-lift-twisted-restriction.patch
@@ -0,0 +1,99 @@
+Backport commits 
720f351a3eea5e5bfa83a6eaf50210cd1fa43992^..0630e4aaa10c3fb8c79c2542a229f5c0632cddde.
+At the time of writing, ::gentoo no longer has 
+--- a/scrapy/crawler.py
 b/scrapy/crawler.py
+@@ -404,8 +404,8 @@ class CrawlerProcess(CrawlerRunner):
+ :param bool stop_after_crawl: stop or not the reactor when all
+ crawlers have finished
+ 
+-:param bool install_signal_handlers: whether to install the shutdown
+-handlers (default: True)
++:param bool install_signal_handlers: whether to install the OS signal
++handlers from Twisted and Scrapy (default: True)
+ """
+ from twisted.internet import reactor
+ 
+@@ -416,15 +416,17 @@ class CrawlerProcess(CrawlerRunner):
+ return
+ d.addBoth(self._stop_reactor)
+ 
+-if install_signal_handlers:
+-install_shutdown_handlers(self._signal_shutdown)
+ resolver_class = load_object(self.settings["DNS_RESOLVER"])
+ resolver = create_instance(resolver_class, self.settings, self, 
reactor=reactor)
+ resolver.install_on_reactor()
+ tp = reactor.getThreadPool()
+ 
tp.adjustPoolsize(maxthreads=self.settings.getint("REACTOR_THREADPOOL_MAXSIZE"))
+ reactor.addSystemEventTrigger("before", "shutdown", self.stop)
+-reactor.run(installSignalHandlers=False)  # blocking call
++if install_signal_handlers:
++reactor.addSystemEventTrigger(
++"after", "startup", install_shutdown_handlers, 
self._signal_shutdown
++)
++reactor.run(installSignalHandlers=install_signal_handlers)  # 
blocking call
+ 
+ def _graceful_stop_reactor(self) -> Deferred:
+ d = self.stop()
+--- a/scrapy/utils/ossignal.py
 b/scrapy/utils/ossignal.py
+@@ -19,13 +19,10 @@ def install_shutdown_handlers(
+ function: SignalHandlerT, override_sigint: bool = True
+ ) -> None:
+ """Install the given function as a signal handler for all common shutdown
+-signals (such as SIGINT, SIGTERM, etc). If override_sigint is ``False`` 
the
+-SIGINT handler won't be install if there is already a handler in place
+-(e.g.  Pdb)
++signals (such as SIGINT, SIGTERM, etc). If ``override_sigint`` is 
``False`` the
++SIGINT handler won't be installed if there is already a handler in place
++(e.g. Pdb)
+ """
+-from twisted.internet import reactor
+-
+-reactor._handleSignals()
+ signal.signal(signal.SIGTERM, function)
+ if signal.getsignal(signal.SIGINT) == signal.default_int_handler or 
override_sigint:
+ signal.signal(signal.SIGINT, function)
+--- a/scrapy/utils/testproc.py
 b/scrapy/utils/testproc.py
+@@ -2,7 +2,7 @@ from __future__ import annotations
+ 
+ import os
+ import sys
+-from typing import Iterable, Optional, Tuple, cast
++from typing import Iterable, List, Optional, Tuple, cast
+ 
+ from twisted.internet.defer import Deferred
+ from twisted.internet.error import ProcessTerminated
+@@ -26,14 +26,15 @@ class ProcessTest:
+ env = os.environ.copy()
+ if settings is not None:
+ env["SCRAPY_SETTINGS_MODULE"] = settings
++assert self.command
+ cmd = self.prefix + [self.command] + list(args)
+ pp = TestProcessProtocol()
+-pp.deferred.addBoth(self._process_finished, cmd, check_code)
++pp.deferred.addCallback(self._process_finished, cmd, check_code)
+ reactor.spawnProcess(pp, cmd[0], cmd, env=env, path=self.cwd)
+ return pp.deferred
+ 
+ def _process_finished(
+-self, pp: TestProcessProtocol, cmd: str, check_code: bool
++self, pp: TestProcessProtocol, cmd: List[str], check_code: bool
+ ) -> Tuple[int, bytes, bytes]:
+ if pp.exitcode and check_code:
+ msg = f"process {cmd} exit with code {pp.exitcod

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/, dev-python/scrapy/files/

2023-12-30 Thread Lucio Sauer
commit: 173d46253fe0371b30a3afa8f6151e2ad4e02ad2
Author: Lucio Sauer  posteo  net>
AuthorDate: Sat Dec 30 20:14:27 2023 +
Commit: Lucio Sauer  posteo  net>
CommitDate: Sat Dec 30 20:14:27 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=173d4625

dev-python/scrapy: drop 2.8.0-r1, 2.11.0

Signed-off-by: Lucio Sauer  posteo.net>

 dev-python/scrapy/Manifest |  1 -
 .../scrapy/files/scrapy-2.5.1-no-doctest.patch | 12 -
 dev-python/scrapy/scrapy-2.11.0.ebuild | 59 -
 dev-python/scrapy/scrapy-2.8.0-r1.ebuild   | 61 --
 4 files changed, 133 deletions(-)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 2e7219df31..a5485bafa6 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1 @@
 DIST scrapy-2.11.0.tar.gz 1373184 BLAKE2B 
7fc758a729d9e9f88c89e30c503ff8bf4c2e111bc00cbd003d5f8785dc818e5ef69ae3774013c4fe27db623c1246a57d57db097cf5220b257a9632bdd29b7023
 SHA512 
08da9684f4312e4149929f3785cc516207070fdd0eb99d8b7ed3276095378cc71d18534d0535fd1107af442aed42d6c91792ad7749d631b5f54522c3912ce073
-DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/files/scrapy-2.5.1-no-doctest.patch 
b/dev-python/scrapy/files/scrapy-2.5.1-no-doctest.patch
deleted file mode 100644
index 7c1b76d052..00
--- a/dev-python/scrapy/files/scrapy-2.5.1-no-doctest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pytest.ini b/pytest.ini
-index 0aae09f..c1f20ee 100644
 a/pytest.ini
-+++ b/pytest.ini
-@@ -5,7 +5,6 @@ python_files=test_*.py __init__.py
- python_classes=
- addopts =
- --assert=plain
----doctest-modules
- --ignore=docs/_ext
- --ignore=docs/conf.py
- --ignore=docs/news.rst

diff --git a/dev-python/scrapy/scrapy-2.11.0.ebuild 
b/dev-python/scrapy/scrapy-2.11.0.ebuild
deleted file mode 100644
index 9230c83a11..00
--- a/dev-python/scrapy/scrapy-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/";
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cryptography[${PYTHON_USEDEP}]
-   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-   dev-python/pyopenssl[${PYTHON_USEDEP}]
-   dev-python/queuelib[${PYTHON_USEDEP}]
-   dev-python/service-identity[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/tldextract[${PYTHON_USEDEP}]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-   <=dev-python/twisted-22.10.0[${PYTHON_USEDEP}]
-   dev-python/w3lib[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/testfixtures[${PYTHON_USEDEP}]
-   dev-python/uvloop[${PYTHON_USEDEP}]
-   )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-   py.test -vv --ignore=docs \
-   --ignore="tests/test_proxy_connect.py" \
-   --ignore="tests/test_utils_display.py" \
-   --ignore="tests/test_command_check.py" \
-   --ignore="tests/test_feedexport.py" \
-   --ignore="tests/test_pipeline_files.py" \
-   --ignore="tests/test_pipeline_images.py" \
-   --ignore="tests/test_squeues.py" || die
-}

diff --git a/dev-python/scrapy/scrapy-2.8.0-r1.ebuild 
b/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
deleted file mode 100644
index 6d31f0a7d3..00
--- a/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/";
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
-   dev-python/cssselect[${PY

[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-12-28 Thread Aisha Tammy
commit: 84c49d7ed6b9b0e6959dcbb75833960917885986
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Dec 29 02:10:00 2023 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Dec 29 02:11:45 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=84c49d7e

dev-python/scrapy: add 2.11 and cap twisted dependency

Signed-off-by: Aisha Tammy  aisha.cc>

 dev-python/scrapy/Manifest| 1 +
 dev-python/scrapy/{scrapy-2.8.0.ebuild => scrapy-2.11.0.ebuild}   | 5 ++---
 dev-python/scrapy/{scrapy-2.8.0.ebuild => scrapy-2.8.0-r1.ebuild} | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 2584b3dc26..2e7219df31 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1 +1,2 @@
+DIST scrapy-2.11.0.tar.gz 1373184 BLAKE2B 
7fc758a729d9e9f88c89e30c503ff8bf4c2e111bc00cbd003d5f8785dc818e5ef69ae3774013c4fe27db623c1246a57d57db097cf5220b257a9632bdd29b7023
 SHA512 
08da9684f4312e4149929f3785cc516207070fdd0eb99d8b7ed3276095378cc71d18534d0535fd1107af442aed42d6c91792ad7749d631b5f54522c3912ce073
 DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild 
b/dev-python/scrapy/scrapy-2.11.0.ebuild
similarity index 95%
copy from dev-python/scrapy/scrapy-2.8.0.ebuild
copy to dev-python/scrapy/scrapy-2.11.0.ebuild
index 0d95854a00..9230c83a11 100644
--- a/dev-python/scrapy/scrapy-2.8.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
@@ -34,6 +34,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tldextract[${PYTHON_USEDEP}]
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   <=dev-python/twisted-22.10.0[${PYTHON_USEDEP}]
dev-python/w3lib[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
 "
@@ -46,8 +47,6 @@ DEPEND="${RDEPEND}
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
 python_test() {
py.test -vv --ignore=docs \
--ignore="tests/test_proxy_connect.py" \

diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild 
b/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
similarity index 95%
rename from dev-python/scrapy/scrapy-2.8.0.ebuild
rename to dev-python/scrapy/scrapy-2.8.0-r1.ebuild
index 0d95854a00..6d31f0a7d3 100644
--- a/dev-python/scrapy/scrapy-2.8.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
@@ -34,6 +34,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tldextract[${PYTHON_USEDEP}]
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   <=dev-python/twisted-22.10.0[${PYTHON_USEDEP}]
dev-python/w3lib[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
 "



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-07-05 Thread Anna Vyalkova
commit: 14fb0a86a6c21626e99e5be9e4867920fa03b0a7
Author: Anna (cybertailor) Vyalkova  sysrq  in>
AuthorDate: Wed Jul  5 13:33:44 2023 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Wed Jul  5 13:57:35 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14fb0a86

dev-python/scrapy: update upstream metadata

Signed-off-by: Anna (cybertailor) Vyalkova  sysrq.in>

 dev-python/scrapy/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index dd122298c..23af41d36 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -1,4 +1,4 @@
-
+
 https://www.gentoo.org/dtd/metadata.dtd";>
 

@@ -7,5 +7,7 @@


scrapy/scrapy
+   https://docs.scrapy.org/
+   https://github.com/scrapy/scrapy/issues

 



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-06-14 Thread Julien Roy
commit: 406b327409ebaa1c1554c6cde1c5f0276273a866
Author: Julien Roy  jroy  ca>
AuthorDate: Wed Jun 14 16:59:28 2023 +
Commit: Julien Roy  jroy  ca>
CommitDate: Wed Jun 14 16:59:28 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=406b3274

dev-python/scrapy: dev-python/service_identity -> dev-python/service-identity

Signed-off-by: Julien Roy  jroy.ca>

 dev-python/scrapy/scrapy-2.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild 
b/dev-python/scrapy/scrapy-2.8.0.ebuild
index be3dd6fe2..0d95854a0 100644
--- a/dev-python/scrapy/scrapy-2.8.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.8.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/queuelib[${PYTHON_USEDEP}]
-   dev-python/service_identity[${PYTHON_USEDEP}]
+   dev-python/service-identity[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/tldextract[${PYTHON_USEDEP}]
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-03-16 Thread Julien Roy
commit: 9753327f8e055bf15c8c49840dd17046249a939e
Author: Julien Roy  jroy  ca>
AuthorDate: Fri Mar 17 03:28:17 2023 +
Commit: Julien Roy  jroy  ca>
CommitDate: Fri Mar 17 03:28:17 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9753327f

dev-python/scrapy: drop 2.6.3

Signed-off-by: Julien Roy  jroy.ca>

 dev-python/scrapy/Manifest|  1 -
 dev-python/scrapy/scrapy-2.6.3.ebuild | 59 ---
 2 files changed, 60 deletions(-)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 68c309a9c..2584b3dc2 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1 @@
-DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 
48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749
 SHA512 
4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8
 DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/scrapy-2.6.3.ebuild 
b/dev-python/scrapy/scrapy-2.6.3.ebuild
deleted file mode 100644
index 698f73302..0
--- a/dev-python/scrapy/scrapy-2.6.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/";
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cryptography[${PYTHON_USEDEP}]
-   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-   dev-python/pyopenssl[${PYTHON_USEDEP}]
-   dev-python/queuelib[${PYTHON_USEDEP}]
-   dev-python/service_identity[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/tldextract[${PYTHON_USEDEP}]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-   dev-python/w3lib[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/testfixtures[${PYTHON_USEDEP}]
-   dev-python/uvloop[${PYTHON_USEDEP}]
-   )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
-   py.test -vv --ignore=docs \
-   --ignore="tests/test_proxy_connect.py" \
-   --ignore="tests/test_utils_display.py" \
-   --ignore="tests/test_command_check.py" \
-   --ignore="tests/test_feedexport.py" \
-   --ignore="tests/test_pipeline_files.py" \
-   --ignore="tests/test_pipeline_images.py" \
-   --ignore="tests/test_squeues.py" || die
-}



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-03-16 Thread Julien Roy
commit: 8cf3054bf1eb929f5d9f838c070c1011d141fb80
Author: Julien Roy  jroy  ca>
AuthorDate: Fri Mar 17 03:27:53 2023 +
Commit: Julien Roy  jroy  ca>
CommitDate: Fri Mar 17 03:27:53 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8cf3054b

dev-python/scrapy: drop 2.6.2

Signed-off-by: Julien Roy  jroy.ca>

 dev-python/scrapy/Manifest|  1 -
 dev-python/scrapy/scrapy-2.6.2.ebuild | 59 ---
 2 files changed, 60 deletions(-)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index e3eb1a57a..68c309a9c 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,3 +1,2 @@
-DIST scrapy-2.6.2.tar.gz 1312436 BLAKE2B 
4cfa85a624d22145a306abb1ea17b12ba662f7f5bef51572f6a26670dfae059dc8b80a92eec6efb42d31175732e410f126ad4bd1c0904928bfcc284288ce9b5b
 SHA512 
4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5
 DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 
48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749
 SHA512 
4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8
 DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/scrapy-2.6.2.ebuild 
b/dev-python/scrapy/scrapy-2.6.2.ebuild
deleted file mode 100644
index 880034715..0
--- a/dev-python/scrapy/scrapy-2.6.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/";
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cryptography[${PYTHON_USEDEP}]
-   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-   dev-python/pyopenssl[${PYTHON_USEDEP}]
-   dev-python/queuelib[${PYTHON_USEDEP}]
-   dev-python/service_identity[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/tldextract[${PYTHON_USEDEP}]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-   dev-python/w3lib[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/testfixtures[${PYTHON_USEDEP}]
-   dev-python/uvloop[${PYTHON_USEDEP}]
-   )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
-   py.test -vv --ignore=docs \
-   --ignore="tests/test_proxy_connect.py" \
-   --ignore="tests/test_utils_display.py" \
-   --ignore="tests/test_command_check.py" \
-   --ignore="tests/test_feedexport.py" \
-   --ignore="tests/test_pipeline_files.py" \
-   --ignore="tests/test_pipeline_images.py" \
-   --ignore="tests/test_squeues.py" || die
-}



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-03-16 Thread Julien Roy
commit: 13778e0be81c5bb41b1b2c75b9c306b33c5f69f2
Author: Julien Roy  jroy  ca>
AuthorDate: Fri Mar 17 03:27:25 2023 +
Commit: Julien Roy  jroy  ca>
CommitDate: Fri Mar 17 03:27:25 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13778e0b

dev-python/scrapy: drop 2.5.1

Signed-off-by: Julien Roy  jroy.ca>

 dev-python/scrapy/Manifest|  1 -
 dev-python/scrapy/scrapy-2.5.1.ebuild | 58 ---
 2 files changed, 59 deletions(-)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 82662d417..e3eb1a57a 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,4 +1,3 @@
-DIST scrapy-2.5.1.tar.gz 1276985 BLAKE2B 
7e4a43391a8dd4f641d188c7a89d26d52bc51aae3eb8340e02c9de2477bc6458f80b3a8ba16f6a17a9ec1debb85fe558fb7c1c48358fd923e02864758ea75fa5
 SHA512 
4285272412b4c474707e864ece701990435d206b0a1ef28cb9f99cff87a02e6b0323e744e96f15878a3b433a7efe4be413d24068bb252f00f9ab1b0a980d844a
 DIST scrapy-2.6.2.tar.gz 1312436 BLAKE2B 
4cfa85a624d22145a306abb1ea17b12ba662f7f5bef51572f6a26670dfae059dc8b80a92eec6efb42d31175732e410f126ad4bd1c0904928bfcc284288ce9b5b
 SHA512 
4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5
 DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 
48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749
 SHA512 
4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8
 DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/scrapy-2.5.1.ebuild 
b/dev-python/scrapy/scrapy-2.5.1.ebuild
deleted file mode 100644
index 56711c180..0
--- a/dev-python/scrapy/scrapy-2.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
-HOMEPAGE="https://scrapy.org/";
-SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
-# https://bugs.gentoo.org/684734
-RDEPEND="${PYTHON_DEPS}
-   dev-python/cssselect[${PYTHON_USEDEP}]
-   dev-python/cryptography[${PYTHON_USEDEP}]
-   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-   dev-python/pyopenssl[${PYTHON_USEDEP}]
-   dev-python/queuelib[${PYTHON_USEDEP}]
-   dev-python/service_identity[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-   dev-python/w3lib[${PYTHON_USEDEP}]
-   dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/testfixtures[${PYTHON_USEDEP}]
-   dev-python/uvloop[${PYTHON_USEDEP}]
-   )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
-
-python_test() {
-   py.test -vv --ignore=docs \
-   --ignore="tests/test_proxy_connect.py" \
-   --ignore="tests/test_utils_display.py" \
-   --ignore="tests/test_command_check.py" \
-   --ignore="tests/test_feedexport.py" \
-   --ignore="tests/test_pipeline_files.py" \
-   --ignore="tests/test_pipeline_images.py" \
-   --ignore="tests/test_squeues.py" || die
-}



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-03-16 Thread Julien Roy
commit: 9cbd545ab7e96475ff0aed5924430f1b8f2dc954
Author: Julien Roy  jroy  ca>
AuthorDate: Fri Mar 17 03:29:18 2023 +
Commit: Julien Roy  jroy  ca>
CommitDate: Fri Mar 17 03:29:18 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9cbd545a

dev-python/scrapy: remove dev-python/h2 dependency pin to <4
Upstream fixed it since version 2.6.0
https://github.com/scrapy/scrapy/issues/5267

Signed-off-by: Julien Roy  jroy.ca>

 dev-python/scrapy/metadata.xml| 3 +++
 dev-python/scrapy/scrapy-2.8.0.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
index 10a288b0b..dd122298c 100644
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@@ -5,4 +5,7 @@
gen...@aisha.cc
Aisha Tammy

+   
+   scrapy/scrapy
+   
 

diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild 
b/dev-python/scrapy/scrapy-2.8.0.ebuild
index 6be5b6027..7fcf9781a 100644
--- a/dev-python/scrapy/scrapy-2.8.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/cssselect[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]


[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2023-02-24 Thread Aisha Tammy
commit: 4d1069b937fdc1a1a460c8ef8b91e132ba646f48
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Feb 24 14:16:58 2023 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Feb 24 14:17:00 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d1069b9

dev-python/scrapy: add 2.8.0

Signed-off-by: Aisha Tammy  aisha.cc>

 dev-python/scrapy/Manifest|  1 +
 dev-python/scrapy/scrapy-2.8.0.ebuild | 60 +++
 2 files changed, 61 insertions(+)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 0c482c82c..82662d417 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,3 +1,4 @@
 DIST scrapy-2.5.1.tar.gz 1276985 BLAKE2B 
7e4a43391a8dd4f641d188c7a89d26d52bc51aae3eb8340e02c9de2477bc6458f80b3a8ba16f6a17a9ec1debb85fe558fb7c1c48358fd923e02864758ea75fa5
 SHA512 
4285272412b4c474707e864ece701990435d206b0a1ef28cb9f99cff87a02e6b0323e744e96f15878a3b433a7efe4be413d24068bb252f00f9ab1b0a980d844a
 DIST scrapy-2.6.2.tar.gz 1312436 BLAKE2B 
4cfa85a624d22145a306abb1ea17b12ba662f7f5bef51572f6a26670dfae059dc8b80a92eec6efb42d31175732e410f126ad4bd1c0904928bfcc284288ce9b5b
 SHA512 
4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5
 DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 
48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749
 SHA512 
4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8
+DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 
9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102
 SHA512 
c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d

diff --git a/dev-python/scrapy/scrapy-2.8.0.ebuild 
b/dev-python/scrapy/scrapy-2.8.0.ebuild
new file mode 100644
index 0..6be5b6027
--- /dev/null
+++ b/dev-python/scrapy/scrapy-2.8.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
+HOMEPAGE="https://scrapy.org/";
+SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64"
+
+# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
+# https://bugs.gentoo.org/684734
+RDEPEND="${PYTHON_DEPS}
+   dev-python/cssselect[${PYTHON_USEDEP}]
+   dev-python/cryptography[${PYTHON_USEDEP}]
+   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+   dev-python/pyopenssl[${PYTHON_USEDEP}]
+   dev-python/queuelib[${PYTHON_USEDEP}]
+   dev-python/service_identity[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/tldextract[${PYTHON_USEDEP}]
+   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   dev-python/w3lib[${PYTHON_USEDEP}]
+   dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/testfixtures[${PYTHON_USEDEP}]
+   dev-python/uvloop[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
+
+python_test() {
+   py.test -vv --ignore=docs \
+   --ignore="tests/test_proxy_connect.py" \
+   --ignore="tests/test_utils_display.py" \
+   --ignore="tests/test_command_check.py" \
+   --ignore="tests/test_feedexport.py" \
+   --ignore="tests/test_pipeline_files.py" \
+   --ignore="tests/test_pipeline_images.py" \
+   --ignore="tests/test_squeues.py" || die
+}



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/scrapy/

2022-09-30 Thread Aisha Tammy
commit: 9994a133b0651ed8955e74f591d1d016fd56a5ea
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Oct  1 01:40:12 2022 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sat Oct  1 01:40:12 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9994a133

dev-python/scrapy: add 2.6.3

Signed-off-by: Aisha Tammy  aisha.cc>

 dev-python/scrapy/Manifest|  1 +
 dev-python/scrapy/scrapy-2.6.3.ebuild | 59 +++
 2 files changed, 60 insertions(+)

diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index d4914d972..0c482c82c 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1,3 @@
 DIST scrapy-2.5.1.tar.gz 1276985 BLAKE2B 
7e4a43391a8dd4f641d188c7a89d26d52bc51aae3eb8340e02c9de2477bc6458f80b3a8ba16f6a17a9ec1debb85fe558fb7c1c48358fd923e02864758ea75fa5
 SHA512 
4285272412b4c474707e864ece701990435d206b0a1ef28cb9f99cff87a02e6b0323e744e96f15878a3b433a7efe4be413d24068bb252f00f9ab1b0a980d844a
 DIST scrapy-2.6.2.tar.gz 1312436 BLAKE2B 
4cfa85a624d22145a306abb1ea17b12ba662f7f5bef51572f6a26670dfae059dc8b80a92eec6efb42d31175732e410f126ad4bd1c0904928bfcc284288ce9b5b
 SHA512 
4442c26a42df1c2e91ab6f8391568ba4e774b938a915f05492572d7ef196760101fc4c1ae4e17fc79cba574dd5696fee842672ec613d6fdb1167f9965972afd5
+DIST scrapy-2.6.3.tar.gz 1312210 BLAKE2B 
48dd845eda2bf96a2c69f5fb95fd2cdd9203e16d50251a46cedf38e5241de21aa01099b735bb79bdee4cc8687c32bf7724779a01de8eca2f8ff1c1d95d04a749
 SHA512 
4248fdde8e71e8045811ef1ce78bf30939a705d1d0a075025e79f15ceca357391345e24a7990bf63e9c98b5ee099b95535fc134f49175c0275bef5393da2a5c8

diff --git a/dev-python/scrapy/scrapy-2.6.3.ebuild 
b/dev-python/scrapy/scrapy-2.6.3.ebuild
new file mode 100644
index 0..698f73302
--- /dev/null
+++ b/dev-python/scrapy/scrapy-2.6.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit distutils-r1
+
+DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
+HOMEPAGE="https://scrapy.org/";
+SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64"
+
+# The 'PyDispatcher>=2.0.5' distribution was not found and is required by 
Scrapy
+# https://bugs.gentoo.org/684734
+RDEPEND="${PYTHON_DEPS}
+   dev-python/cssselect[${PYTHON_USEDEP}]
+   dev-python/cryptography[${PYTHON_USEDEP}]
+   =dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+   dev-python/pyopenssl[${PYTHON_USEDEP}]
+   dev-python/queuelib[${PYTHON_USEDEP}]
+   dev-python/service_identity[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/tldextract[${PYTHON_USEDEP}]
+   >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+   dev-python/w3lib[${PYTHON_USEDEP}]
+   dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/testfixtures[${PYTHON_USEDEP}]
+   dev-python/uvloop[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${PN}-2.5.1-no-doctest.patch" )
+
+python_test() {
+   py.test -vv --ignore=docs \
+   --ignore="tests/test_proxy_connect.py" \
+   --ignore="tests/test_utils_display.py" \
+   --ignore="tests/test_command_check.py" \
+   --ignore="tests/test_feedexport.py" \
+   --ignore="tests/test_pipeline_files.py" \
+   --ignore="tests/test_pipeline_images.py" \
+   --ignore="tests/test_squeues.py" || die
+}