Added Python 3.13 CI test target

.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

appveyor.yml

@@ -89,23 +89,23 @@ 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"
     LDFLAGS: "-L/usr/local/lib"
     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"
     LDFLAGS: "-L/usr/local/lib"
     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/[email protected]/bin/python3"
     PYTHON_CONFIG: "/usr/local/opt/[email protected]/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/[email protected]/bin/python3"
     PYTHON_CONFIG: "/usr/local/opt/[email protected]/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

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"

configure.ac

@@ -1,12 +1,12 @@
 AC_PREREQ([2.71])
 
 AC_INIT(
- [liblnk],
- [20241013],
- [[email protected]])
+  [liblnk],
+  [20241015],
+  [[email protected]])
 
 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])

liblnk.nuspec

@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>liblnk</id>
-    <version>20241013</version>
+    <version>20241015</version>
     <authors>Joachim Metz</authors>
     <owners>joachimmetz</owners>
     <license type="expression">LGPL-3.0-or-later</license>
     <projectUrl>https://github.com/libyal/liblnk</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <title>liblnk</title>
     <description>Library to access the Windows Shortcut File (LNK) format</description>
-    <releaseNotes>Release of liblnk 20241013</releaseNotes>
+    <releaseNotes>Release of liblnk 20241015</releaseNotes>
     <copyright>Copyright (C) 2009-2024</copyright>
     <tags>native</tags>
   </metadata>

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],

setup.cfg.in

@@ -13,4 +13,4 @@ classifiers =
   Programming Language :: Python
 
 [options]
-python_requires = >=3.7
+python_requires = >=3.8

tests/pkgbuild.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 # Script to build a MacOS pkg
 #
-# Version: 20201121
+# Version: 20241015
 
 set -e
 
 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
 

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