From 00e03ad49fd9610d2941388ebab08ff2dc8affde Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Tue, 15 Oct 2024 06:26:49 +0200 Subject: [PATCH] Added Python 3.13 CI test target --- .github/workflows/build_wheel.yml | 4 ++-- appveyor.yml | 38 ++++++++++++++++++++----------- autogen.ps1 | 6 ++--- configure.ac | 26 ++++++++++----------- liblnk.nuspec | 4 ++-- m4/common.m4 | 4 ++-- setup.cfg.in | 2 +- tests/pkgbuild.sh | 4 ++-- tox.ini | 2 +- 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index d98d681..d2937bd 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -8,8 +8,6 @@ jobs: strategy: matrix: include: - - python-version: '3.7' - toxenv: 'py37' - python-version: '3.8' toxenv: 'py38' - python-version: '3.9' @@ -20,6 +18,8 @@ jobs: toxenv: 'py311' - python-version: '3.12' toxenv: 'py312' + - python-version: '3.13' + toxenv: 'py313' steps: - uses: actions/checkout@v4 - name: Install build dependencies diff --git a/appveyor.yml b/appveyor.yml index c7ccea9..2562092 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -89,7 +89,7 @@ environment: PYTHON_PATH: "C:\\Python311" - TARGET: macos-x64-clang BUILD_ENVIRONMENT: xcode - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 CC: clang CFLAGS: "-I/usr/local/include" @@ -97,7 +97,7 @@ environment: CONFIGURE_OPTIONS: "" - TARGET: macos-x64-gcc BUILD_ENVIRONMENT: xcode - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 CC: gcc CFLAGS: "-I/usr/local/include" @@ -105,7 +105,7 @@ environment: CONFIGURE_OPTIONS: "" - TARGET: macos-x64-gcc-python BUILD_ENVIRONMENT: xcode - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma PYTHON: "/usr/local/opt/python@3.11/bin/python3" PYTHON_CONFIG: "/usr/local/opt/python@3.11/bin/python3-config" HOMEBREW_NO_INSTALL_CLEANUP: 1 @@ -115,7 +115,7 @@ environment: CONFIGURE_OPTIONS: "--enable-python" - TARGET: macos-pkgbuild BUILD_ENVIRONMENT: xcode - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma PYTHON: "/usr/local/opt/python@3.11/bin/python3" PYTHON_CONFIG: "/usr/local/opt/python@3.11/bin/python3-config" HOMEBREW_NO_INSTALL_CLEANUP: 1 @@ -183,36 +183,48 @@ environment: PYTHON: "C:\\Python312-x64\\python.exe" PYTHON_VERSION: 3.12 TOXENV: py312 - - TARGET: macos-tox-py38 + - TARGET: windows-tox-py313-32bit BUILD_ENVIRONMENT: python-tox - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey - HOMEBREW_NO_INSTALL_CLEANUP: 1 - PYTHON_VERSION: 3.8 - TOXENV: py38 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + PYTHON: "C:\\Python313\\python.exe" + PYTHON_VERSION: 3.13 + TOXENV: py313 + - TARGET: windows-tox-py313-64bit + BUILD_ENVIRONMENT: python-tox + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + PYTHON: "C:\\Python313-x64\\python.exe" + PYTHON_VERSION: 3.13 + TOXENV: py313 - TARGET: macos-tox-py39 BUILD_ENVIRONMENT: python-tox - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHON_VERSION: 3.9 TOXENV: py39 - TARGET: macos-tox-py310 BUILD_ENVIRONMENT: python-tox - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHON_VERSION: 3.10 TOXENV: py310 - TARGET: macos-tox-py311 BUILD_ENVIRONMENT: python-tox - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHON_VERSION: 3.11 TOXENV: py311 - TARGET: macos-tox-py312 BUILD_ENVIRONMENT: python-tox - APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma HOMEBREW_NO_INSTALL_CLEANUP: 1 PYTHON_VERSION: 3.12 TOXENV: py312 + - TARGET: macos-tox-py313 + BUILD_ENVIRONMENT: python-tox + APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma + HOMEBREW_NO_INSTALL_CLEANUP: 1 + PYTHON_VERSION: 3.13 + TOXENV: py313 - TARGET: linux-tox-py310 BUILD_ENVIRONMENT: python-tox APPVEYOR_BUILD_WORKER_IMAGE: ubuntu2204 diff --git a/autogen.ps1 b/autogen.ps1 index fd3f68b..f39c5f1 100644 --- a/autogen.ps1 +++ b/autogen.ps1 @@ -1,12 +1,12 @@ # Script to generate the necessary files for a msvscpp build # -# Version: 20240306 +# Version: 20241014 $WinFlex = "..\win_flex_bison\win_flex.exe" $WinBison = "..\win_flex_bison\win_bison.exe" -$Library = Get-Content -Path configure.ac | select -skip 3 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" } -$Version = Get-Content -Path configure.ac | select -skip 4 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" } +$Library = Get-Content -Path configure.ac | select -skip 3 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" } +$Version = Get-Content -Path configure.ac | select -skip 4 -first 1 | % { $_ -Replace " \[","" } | % { $_ -Replace "\],","" } $Prefix = ${Library}.Substring(3) Get-Content -Path "include\${Library}.h.in" | Out-File -Encoding ascii "include\${Library}.h" diff --git a/configure.ac b/configure.ac index 861b67f..efeca2a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ AC_PREREQ([2.71]) AC_INIT( - [liblnk], - [20241013], - [joachim.metz@gmail.com]) + [liblnk], + [20241015], + [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( - [include/liblnk.h.in]) + [include/liblnk.h.in]) AM_INIT_AUTOMAKE([gnu 1.6 tar-ustar]) AM_EXTRA_RECURSIVE_TARGETS([sources splint]) @@ -146,21 +146,21 @@ CFLAGS="$CFLAGS -Wall"; dnl Check if requires and build requires should be set in spec file AS_IF( - [test "x$ac_cv_libcerror" = xyes || test "x$ac_cv_libcthreads" = xyes || test "x$ac_cv_libcdata" = xyes || test "x$ac_cv_libclocale" = xyes || test "x$ac_cv_libcnotify" = xyes || test "x$ac_cv_libcsplit" = xyes || test "x$ac_cv_libuna" = xyes || test "x$ac_cv_libcfile" = xyes || test "x$ac_cv_libcpath" = xyes || test "x$ac_cv_libbfio" = xyes || test "x$ac_cv_libfdatetime" = xyes || test "x$ac_cv_libfguid" = xyes || test "x$ac_cv_libfole" = xyes || test "x$ac_cv_libfwps" = xyes || test "x$ac_cv_libfwsi" = xyes], - [AC_SUBST( - [liblnk_spec_requires], - [Requires:]) - ]) + [test "x$ac_cv_libcerror" = xyes || test "x$ac_cv_libcthreads" = xyes || test "x$ac_cv_libcdata" = xyes || test "x$ac_cv_libclocale" = xyes || test "x$ac_cv_libcnotify" = xyes || test "x$ac_cv_libcsplit" = xyes || test "x$ac_cv_libuna" = xyes || test "x$ac_cv_libcfile" = xyes || test "x$ac_cv_libcpath" = xyes || test "x$ac_cv_libbfio" = xyes || test "x$ac_cv_libfdatetime" = xyes || test "x$ac_cv_libfguid" = xyes || test "x$ac_cv_libfole" = xyes || test "x$ac_cv_libfwps" = xyes || test "x$ac_cv_libfwsi" = xyes], + [AC_SUBST( + [liblnk_spec_requires], + [Requires:]) + ]) dnl Set the date for the dpkg files AC_SUBST( - [DPKG_DATE], - [`date -R 2> /dev/null`]) + [DPKG_DATE], + [`date -R 2> /dev/null`]) dnl Set the date for the spec file AC_SUBST( - [SPEC_DATE], - [`date +"%a %b %e %Y" 2> /dev/null`]) + [SPEC_DATE], + [`date +"%a %b %e %Y" 2> /dev/null`]) dnl Generate Makefiles AC_CONFIG_FILES([Makefile]) diff --git a/liblnk.nuspec b/liblnk.nuspec index 7b50ce8..7041674 100644 --- a/liblnk.nuspec +++ b/liblnk.nuspec @@ -2,7 +2,7 @@ liblnk - 20241013 + 20241015 Joachim Metz joachimmetz LGPL-3.0-or-later @@ -10,7 +10,7 @@ false liblnk Library to access the Windows Shortcut File (LNK) format - Release of liblnk 20241013 + Release of liblnk 20241015 Copyright (C) 2009-2024 native diff --git a/m4/common.m4 b/m4/common.m4 index c2ea816..c229b79 100644 --- a/m4/common.m4 +++ b/m4/common.m4 @@ -1,6 +1,6 @@ dnl Checks for common headers and functions dnl -dnl Version: 20240513 +dnl Version: 20241013 dnl Function to test if a certain feature was disabled AC_DEFUN([AX_COMMON_ARG_DISABLE], @@ -113,7 +113,7 @@ AC_DEFUN([AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT], ac_cv_enable_verbose_output=yes]) ]) -dnl Function to detect whether static executables support should be enabled +dnl Function to detect whether wide character type support should be enabled AC_DEFUN([AX_COMMON_CHECK_ENABLE_WIDE_CHARACTER_TYPE], [AX_COMMON_ARG_ENABLE( [wide-character-type], diff --git a/setup.cfg.in b/setup.cfg.in index 31d3357..948e33b 100644 --- a/setup.cfg.in +++ b/setup.cfg.in @@ -13,4 +13,4 @@ classifiers = Programming Language :: Python [options] -python_requires = >=3.7 +python_requires = >=3.8 diff --git a/tests/pkgbuild.sh b/tests/pkgbuild.sh index a8d5eaf..a392a8c 100755 --- a/tests/pkgbuild.sh +++ b/tests/pkgbuild.sh @@ -1,7 +1,7 @@ #!/bin/sh # Script to build a MacOS pkg # -# Version: 20201121 +# Version: 20241015 set -e @@ -9,6 +9,6 @@ make install DESTDIR=${PWD}/osx-pkg mkdir -p ${PWD}/osx-pkg/usr/share/doc/liblnk cp AUTHORS COPYING COPYING.LESSER NEWS README ${PWD}/osx-pkg/usr/share/doc/liblnk -VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` +VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` pkgbuild --root osx-pkg --identifier com.github.libyal.liblnk --version ${VERSION} --ownership recommended ../liblnk-${VERSION}.pkg diff --git a/tox.ini b/tox.ini index b572079..a49c80b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = auditwheel,py3{7,8,9,10,11,12} +envlist = auditwheel,py3{8,9,10,11,12,13} [testenv] usedevelop = True