Skip to content

Commit

Permalink
[3.8] Fix CI (#7143) (#7200)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreamsorcerer authored Feb 11, 2023
1 parent 9cde3b4 commit ba573e2
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 18 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
- name: Run linters
run: |
make mypy
- name: Install libenchant-dev
- name: Install libenchant
run: |
sudo apt install libenchant-dev
sudo apt install libenchant-2-dev
- name: Install spell checker
run: |
pip install -r requirements/doc-spelling.txt -c requirements/constraints.txt
Expand Down Expand Up @@ -119,36 +119,36 @@ jobs:
matrix:
pyver: [3.6, 3.7, 3.8, 3.9, '3.10']
no-extensions: ['', 'Y']
os: [ubuntu, macos, windows]
os: [ubuntu-20.04, macos-latest, windows-latest]
exclude:
- os: macos
- os: macos-latest
no-extensions: 'Y'
- os: macos
- os: macos-latest
pyver: 3.7
- os: macos
- os: macos-latest
pyver: 3.8
- os: windows
- os: windows-latest
no-extensions: 'Y'
experimental: [false]
include:
- pyver: pypy-3.8
no-extensions: 'Y'
os: ubuntu
os: ubuntu-latest
experimental: false
- os: macos
- os: macos-latest
pyver: "3.11.0-alpha - 3.11.0"
experimental: true
no-extensions: 'Y'
- os: ubuntu
- os: ubuntu-latest
pyver: "3.11.0-alpha - 3.11.0"
experimental: false
no-extensions: 'Y'
- os: windows
- os: windows-latest
pyver: "3.11.0-alpha - 3.11.0"
experimental: true
no-extensions: 'Y'
fail-fast: true
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
steps:
- name: Checkout
Expand Down
2 changes: 2 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[mypy]
# Only for 3.8 branch which is already EOL
ignore_errors = True
files = aiohttp, examples
check_untyped_defs = True
follow_imports_for_stubs = True
Expand Down
1 change: 1 addition & 0 deletions aiohttp/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
PY_37 = sys.version_info >= (3, 7)
PY_38 = sys.version_info >= (3, 8)
PY_310 = sys.version_info >= (3, 10)
PY_311 = sys.version_info >= (3, 11)

if sys.version_info < (3, 7):
import idna_ssl
Expand Down
4 changes: 2 additions & 2 deletions tests/test_client_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Fingerprint,
_merge_ssl_params,
)
from aiohttp.helpers import PY_310
from aiohttp.helpers import PY_311
from aiohttp.test_utils import make_mocked_coro


Expand Down Expand Up @@ -276,7 +276,7 @@ def test_host_header_ipv6_with_port(make_request) -> None:


@pytest.mark.xfail(
PY_310,
PY_311,
reason="No idea why ClientRequest() is constructed out of loop but "
"it calls `asyncio.get_event_loop()`",
raises=DeprecationWarning,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from re_assert import Matches

from aiohttp import streams
from aiohttp.helpers import PY_310
from aiohttp.helpers import PY_311

DATA = b"line1\nline2\nline3\n"

Expand Down Expand Up @@ -84,7 +84,7 @@ async def test_create_waiter(self) -> None:
await stream._wait("test")

@pytest.mark.xfail(
PY_310,
PY_311,
reason="No idea why ClientRequest() is constructed out of loop but "
"it calls `asyncio.get_event_loop()`",
raises=DeprecationWarning,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_web_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from aiohttp import log, web
from aiohttp.abc import AbstractAccessLogger, AbstractRouter
from aiohttp.helpers import DEBUG, PY_36, PY_310
from aiohttp.helpers import DEBUG, PY_36, PY_311
from aiohttp.test_utils import make_mocked_coro
from aiohttp.typedefs import Handler

Expand Down Expand Up @@ -40,7 +40,7 @@ async def test_set_loop() -> None:


@pytest.mark.xfail(
PY_310,
PY_311,
reason="No idea why _set_loop() is constructed out of loop "
"but it calls `asyncio.get_event_loop()`",
raises=DeprecationWarning,
Expand Down

0 comments on commit ba573e2

Please sign in to comment.