From 2ccd68d3be5f716eb45d34a795c94c2673952315 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 2 Oct 2023 15:22:41 +0000 Subject: [PATCH 1/4] ci: test with Python 3.12 and PyPy 3.10 --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33fb07bb78..a27eda396c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,15 +182,15 @@ jobs: include: # Currently used Rust version. - os: ubuntu-latest - python: 3.11 + python: 3.12 - os: macos-latest - python: 3.11 + python: 3.12 # PyPy tests - os: ubuntu-latest - python: pypy3.9 + python: pypy3.10 - os: macos-latest - python: pypy3.9 + python: pypy3.10 # Minimum Supported Python Version = 3.7 # This is the minimum version for which manylinux Python wheels are @@ -232,15 +232,15 @@ jobs: matrix: include: - os: ubuntu-latest - python: 3.11 + python: 3.12 - os: macos-latest - python: 3.11 + python: 3.12 # PyPy tests - os: ubuntu-latest - python: pypy3.9 + python: pypy3.10 - os: macos-latest - python: pypy3.9 + python: pypy3.10 # Minimum Supported Python Version = 3.8 # From 9e053e9d579888613873b0d07554dedd98216587 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 2 Oct 2023 15:22:59 +0000 Subject: [PATCH 2/4] bulid: build wheels for Python 3.12 and PyPy 3.10 --- scripts/run_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_all.sh b/scripts/run_all.sh index 87ce41ea38..42edb094f2 100755 --- a/scripts/run_all.sh +++ b/scripts/run_all.sh @@ -31,7 +31,7 @@ unset DCC_NEW_TMP_EMAIL # Try to build wheels for a range of interpreters, but don't fail if they are not available. # E.g. musllinux_1_1 does not have PyPy interpreters as of 2022-07-10 -tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,pypy37,pypy38,pypy39 --skip-missing-interpreters true +tox --workdir "$TOXWORKDIR" -e py37,py38,py39,py310,py311,py312,pypy37,pypy38,pypy39,pypy310 --skip-missing-interpreters true auditwheel repair "$TOXWORKDIR"/wheelhouse/deltachat* -w "$TOXWORKDIR/wheelhouse" From 32db62ef627dbea7ec5c348df24cffbe80e7e197 Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 4 Oct 2023 18:40:53 +0000 Subject: [PATCH 3/4] ci(mypy): ignore distutils Python 3.12 removed `distutils`. `distutils` from `setuptools` work fine, but have not typing stubs: https://github.com/python/typeshed/issues/10255 --- python/mypy.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/mypy.ini b/python/mypy.ini index 6b7560ab93..3eb9ae8c8d 100644 --- a/python/mypy.ini +++ b/python/mypy.ini @@ -24,3 +24,5 @@ ignore_missing_imports = True [mypy-imap_tools.*] ignore_missing_imports = True +[mypy-distutils.*] +ignore_missing_imports = True From d0695584890afd27b2dcd352aaa3b3eebef35e36 Mon Sep 17 00:00:00 2001 From: link2xt Date: Wed, 4 Oct 2023 18:59:20 +0000 Subject: [PATCH 4/4] ci: test async python bindings with Python 3.11 --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a27eda396c..5228594d7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,10 +231,14 @@ jobs: fail-fast: false matrix: include: + # Async Python bindings do not depend on Python version, + # but are tested on Python 3.11 until Python 3.12 support + # is added to `aiohttp` dependency: + # https://github.com/aio-libs/aiohttp/issues/7646 - os: ubuntu-latest - python: 3.12 + python: 3.11 - os: macos-latest - python: 3.12 + python: 3.11 # PyPy tests - os: ubuntu-latest