From ed97ff8a3d739db5d36b42e74cbf35ec2cbf4c61 Mon Sep 17 00:00:00 2001 From: Gord Thompson Date: Mon, 31 Oct 2022 16:38:57 -0600 Subject: [PATCH 1/2] Build wheel files for Python 3.11 Fixes: #1110 Update .github/workflows/ubuntu_build.yml to use cibuildwheel v2.11.2 Add 3.11 references to appveyor.yml and setup.py --- .github/workflows/ubuntu_build.yml | 4 +++- appveyor.yml | 6 ++++++ setup.py | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 01792b68..7713967a 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -23,6 +23,8 @@ jobs: tests-dir: tests3 - python-version: "3.10" tests-dir: tests3 + - python-version: "3.11" + tests-dir: tests3 services: @@ -220,7 +222,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.8.1 + uses: pypa/cibuildwheel@v2.11.2 # https://cibuildwheel.readthedocs.io/en/stable/options/#options-summary env: # Windows - both 64-bit and 32-bit builds diff --git a/appveyor.yml b/appveyor.yml index e04ed94b..2b91c86a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -92,6 +92,12 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON_HOME: "C:\\Python310-x64" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + PYTHON_HOME: "C:\\Python311" + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + PYTHON_HOME: "C:\\Python311-x64" + cache: - apvyr_cache -> appveyor\install.ps1 diff --git a/setup.py b/setup.py index 260ce7d3..e84fab42 100755 --- a/setup.py +++ b/setup.py @@ -113,6 +113,7 @@ def main(): 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Database', ], From 179189145b4e8c9e3f1d3719f35a517d0dfbc474 Mon Sep 17 00:00:00 2001 From: Gord Thompson Date: Wed, 2 Nov 2022 06:23:02 -0600 Subject: [PATCH 2/2] Tweaks for deprecation messages and AppVeyor failure --- .github/workflows/ubuntu_build.yml | 4 ++-- appveyor.yml | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 7713967a..86190788 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -149,10 +149,10 @@ jobs: echo "*** create database" mysql --user=root --password=root --execute "CREATE DATABASE test" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} diff --git a/appveyor.yml b/appveyor.yml index 2b91c86a..56879ba6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -92,11 +92,12 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PYTHON_HOME: "C:\\Python310-x64" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PYTHON_HOME: "C:\\Python311" - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PYTHON_HOME: "C:\\Python311-x64" +# TODO: enable these once Python 3.11 is supported on Windows +# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 +# PYTHON_HOME: "C:\\Python311" +# +# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 +# PYTHON_HOME: "C:\\Python311-x64" cache: - apvyr_cache -> appveyor\install.ps1