From 5cf2cf94840a177a2a4d51336a2e03c38e44a937 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Wed, 17 Jan 2024 06:16:26 +0100 Subject: [PATCH] Changes for CI tests (#25) --- .github/workflows/test_docs.yml | 2 +- .github/workflows/test_tox.yml | 2 +- appveyor.yml | 26 +++++++++++++------------- config/appveyor/install.sh | 2 +- config/appveyor/runtests.sh | 6 +++--- setup.cfg | 1 + 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test_docs.yml b/.github/workflows/test_docs.yml index 2d5f394..9fbbc19 100644 --- a/.github/workflows/test_docs.yml +++ b/.github/workflows/test_docs.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: include: - - python-version: '3.11' + - python-version: '3.12' toxenv: 'docs' container: image: ubuntu:22.04 diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml index 2334f2f..90eee37 100644 --- a/.github/workflows/test_tox.yml +++ b/.github/workflows/test_tox.yml @@ -98,7 +98,7 @@ jobs: strategy: matrix: include: - - python-version: '3.11' + - python-version: '3.12' toxenv: 'lint' container: image: ubuntu:22.04 diff --git a/appveyor.yml b/appveyor.yml index f10b274..fa80fa7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,34 +1,34 @@ environment: matrix: - - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.11" + - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.12" MACHINE_TYPE: "x86" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.11" + - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: tests - - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.11" + - DESCRIPTION: "Build wheel on Windows with 32-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: wheel - - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.11" + - DESCRIPTION: "Build wheel on Windows with 64-bit Python 3.12" MACHINE_TYPE: "amd64" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python311-x64" - PYTHON_VERSION: "3.11" + PYTHON: "C:\\Python312-x64" + PYTHON_VERSION: "3.12" L2TBINARIES_TRACK: "dev" TARGET: wheel - - DESCRIPTION: "Run tests on Mac OS with Python 3.11" + - DESCRIPTION: "Run tests on Mac OS with Python 3.12" APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey HOMEBREW_NO_INSTALL_CLEANUP: 1 TARGET: tests diff --git a/config/appveyor/install.sh b/config/appveyor/install.sh index e36de4c..42c4ab6 100755 --- a/config/appveyor/install.sh +++ b/config/appveyor/install.sh @@ -3,5 +3,5 @@ set -e brew update -q -brew install -q gettext gnu-sed python@3.11 tox || true +brew install -q gettext gnu-sed python@3.12 tox || true diff --git a/config/appveyor/runtests.sh b/config/appveyor/runtests.sh index e3bc8c3..86ba5ce 100755 --- a/config/appveyor/runtests.sh +++ b/config/appveyor/runtests.sh @@ -9,7 +9,7 @@ export LDFLAGS="-L/usr/local/lib -L/usr/local/opt/gettext/lib ${LDFLAGS}"; export CPPFLAGS="-I/usr/local/opt/openssl@1.1/include ${CPPFLAGS}"; export LDFLAGS="-L/usr/local/opt/openssl@1.1/lib ${LDFLAGS}"; -# Set the following environment variables to ensure tox can find Python 3.11. -export PATH="/usr/local/opt/python@3.11/bin:${PATH}"; +# Set the following environment variables to ensure tox can find Python 3.12. +export PATH="/usr/local/opt/python@3.12/bin:${PATH}"; -tox -e py311 +tox -e py312 diff --git a/setup.cfg b/setup.cfg index bf0bc01..81024a2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,6 +25,7 @@ packages = find: python_requires = >=3.7 scripts = tools/check_artifacts.py + tools/export.py [options.package_data] artifactsrc =