Scrapy, a fast high-level web crawling & scraping framework for Python.
Re-enable uvloop tests on 3.12 (#6098)
Andrey Rakhmatullin991121fa91ae
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.ymlindex 0ceb53848..d6fc0f6c5 100644--- a/.github/workflows/checks.yml+++ b/.github/workflows/checks.yml@@ -12,7 +12,7 @@ jobs:fail-fast: falsematrix:include:- - python-version: "3.11"+ - python-version: "3.12"env:TOXENV: pylint- python-version: 3.8@@ -21,7 +21,7 @@ jobs:- python-version: "3.11" # Keep in sync with .readthedocs.ymlenv:TOXENV: docs- - python-version: "3.11"+ - python-version: "3.12"env:TOXENV: twinecheckdiff --git a/.github/workflows/publish.yml b/.github/workflows/publish.ymlindex dd778fc64..affaa32a5 100644--- a/.github/workflows/publish.yml+++ b/.github/workflows/publish.yml@@ -15,7 +15,7 @@ jobs:- uses: actions/checkout@v4- uses: actions/setup-python@v4with:- python-version: 3.11+ python-version: 3.12- run: |pip install --upgrade build twinepython -m builddiff --git a/.github/workflows/tests-ubuntu.yml b/.github/workflows/tests-ubuntu.ymlindex a307eb337..f50a4d104 100644--- a/.github/workflows/tests-ubuntu.yml+++ b/.github/workflows/tests-ubuntu.yml@@ -58,11 +58,6 @@ jobs:env:TOXENV: botocore- # keep until uvloop supports 3.12- - python-version: "3.11"- env:- TOXENV: asyncio-steps:- uses: actions/checkout@v4diff --git a/scrapy/contracts/__init__.py b/scrapy/contracts/__init__.pyindex 1ec2a0234..2d9ddd89a 100644--- a/scrapy/contracts/__init__.py+++ b/scrapy/contracts/__init__.py@@ -41,7 +41,9 @@ class Contract:cb_result = cb(response, **cb_kwargs)if isinstance(cb_result, (AsyncGenerator, CoroutineType)):raise TypeError("Contracts don't support async callbacks")- return list(iterate_spider_output(cb_result))+ return list( # pylint: disable=return-in-finally+ iterate_spider_output(cb_result)+ )request.callback = wrapper@@ -68,7 +70,7 @@ class Contract:else:results.addSuccess(self.testcase_post)finally:- return output+ return output # pylint: disable=return-in-finallyrequest.callback = wrapperdiff --git a/tests/requirements.txt b/tests/requirements.txtindex d4bfead40..5b75674f5 100644--- a/tests/requirements.txt+++ b/tests/requirements.txt@@ -7,8 +7,7 @@ pytest-cov==4.0.0pytest-xdistsybil >= 1.3.0 # https://github.com/cjw296/sybil/issues/20#issuecomment-605433422testfixtures-# uvloop currently doesn't build on 3.12-uvloop; platform_system != "Windows" and python_version < "3.12"+uvloop; platform_system != "Windows"bpython # optional for shell wrapper testsbrotli; implementation_name != 'pypy' # optional for HTTP compress downloader middleware testsdiff --git a/tox.ini b/tox.iniindex 9c2522a43..381da9773 100644--- a/tox.ini+++ b/tox.ini@@ -57,7 +57,7 @@ commands =basepython = python3deps ={[testenv:extra-deps]deps}- pylint==2.17.5+ pylint==3.0.1commands =pylint conftest.py docs extras scrapy setup.py tests