Skip to content

Commit 9dca187

Browse files
committed
Fix CI with Python 3.12 as the default version
1 parent 650ad2a commit 9dca187

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ jobs:
1414
with:
1515
python-version: 3.x
1616
- name: Install dependencies
17-
run: |
18-
python3 -m pip install nox
17+
run: python3 -m pip install nox
1918
- name: Lint the code
2019
run: nox -s lint
21-
20+
env:
21+
# Workaround for development versions of Python
22+
# https://github.com/aio-libs/aiohttp/issues/7675
23+
AIOHTTP_NO_EXTENSIONS: 1
2224
docs:
2325
runs-on: ubuntu-latest
2426
steps:
@@ -29,28 +31,21 @@ jobs:
2931
with:
3032
python-version: 3.x
3133
- name: Install dependencies
32-
run: |
33-
python3 -m pip install nox
34+
run: python3 -m pip install nox
3435
- name: Build the docs
3536
run: nox -s docs
3637

3738
test-linux:
3839
strategy:
3940
fail-fast: false
4041
matrix:
41-
python-version: ["3.7", "3.8", "3.9", "3.10"]
42-
experimental: [false]
42+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
4343
nox-session: [""]
4444
runs-on: ["ubuntu-latest"]
45-
include:
46-
- python-version: 3.11-dev
47-
experimental: true
48-
nox-session: test-3.11
49-
runs-on: "ubuntu-latest"
5045

5146
runs-on: ${{ matrix.runs-on }}
5247
name: test-${{ matrix.python-version }}
53-
continue-on-error: ${{ matrix.experimental }}
48+
continue-on-error: true
5449
steps:
5550
- name: Checkout Repository
5651
uses: actions/checkout@v3
@@ -59,16 +54,15 @@ jobs:
5954
with:
6055
python-version: ${{ matrix.python-version }}
6156
- name: Install Dependencies
62-
run: |
63-
python -m pip install nox
57+
run: python -m pip install nox
6458
- name: Run Tests
6559
shell: bash
6660
run: .ci/run-nox.sh
6761
env:
6862
PYTHON_VERSION: ${{ matrix.python-version }}
6963
NOX_SESSION: ${{ matrix.nox-session }}
70-
# TEMPORARY for 3.11
71-
# https://github.com/aio-libs/aiohttp/issues/6600
64+
# Workaround for development versions of Python
65+
# https://github.com/aio-libs/aiohttp/issues/7675
7266
AIOHTTP_NO_EXTENSIONS: 1
7367
# https://github.com/aio-libs/frozenlist/issues/285
7468
FROZENLIST_NO_EXTENSIONS: 1

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ version: 2
33
build:
44
os: ubuntu-22.04
55
tools:
6+
# To work around https://github.com/aio-libs/aiohttp/issues/7675, we need
7+
# to set AIOHTTP_NO_EXTENSIONS to 1 but it has to be done in
8+
# https://readthedocs.org/dashboard/elasticsearch-py/environmentvariables/
9+
# because of https://github.com/readthedocs/readthedocs.org/issues/6311
610
python: "3"
711

812
python:

0 commit comments

Comments
 (0)