Changes for CI tests

libyal · Dec 22, 2024 · 4b1d800 · 4b1d800
1 parent d954eb3
commit 4b1d800
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -322,7 +322,7 @@ install:
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
     C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P bison -P cygfuse -P flex -P gettext-devel -P libssl-devel -P libuuid-devel -P python3-devel -P wget -P zlib-devel )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc msys/bison msys/flex msys/zlib-devel mingw-w64-x86_64-python3 )
+    C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc msys/bison msys/flex msys/zlib-devel mingw-w64-x86_64-python3 pkg-config )
 - ps: If ( ( "cygwin64-gcc-no-optimization", "mingw-w64-gcc-no-optimization" ).Contains( $env:TARGET ) ) {
     $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile ..\codecov.exe }
 
@@ -351,12 +351,12 @@ build_script:
 - sh: if test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox"; then export PATH="/usr/local/opt/gettext/bin:$PATH"; export SED="/usr/local/bin/gsed"; ./synclibs.sh && ./autogen.sh && ./configure --disable-nls --disable-shared-libs && make sources >/dev/null && tox -e${TOXENV}; fi
 - sh: if test `uname -s` = "Linux" && test ${BUILD_ENVIRONMENT} = "python-tox"; then ./synclibs.sh && ./autogen.sh && ./configure --disable-nls --disable-shared-libs && make sources >/dev/null && tox -e${TOXENV} && tox -eauditwheel -- --plat ${AUDITWHEEL_PLAT} dist/*.whl && rm -f dist/*.whl && mv wheelhouse/*.whl dist/; fi
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    xcopy /i /q /s C:\projects\libewf C:\cygwin64\home\appveyor\libewf &&
-    C:\cygwin64\bin\bash -e -l -c "cd libewf && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' -O './config.guess' && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' -O './config.sub'" &&
-    C:\cygwin64\bin\bash -e -l -c "cd libewf && tests/build.sh ${CONFIGURE_OPTIONS}" )
+    xcopy /i /q /s C:\projects\libewf-legacy C:\cygwin64\home\appveyor\libewf-legacy &&
+    C:\cygwin64\bin\bash -e -l -c "cd libewf-legacy && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' -O './config.guess' && wget -q 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' -O './config.sub'" &&
+    C:\cygwin64\bin\bash -e -l -c "cd libewf-legacy && tests/build.sh ${CONFIGURE_OPTIONS}" )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    xcopy /i /q /s C:\projects\libewf C:\msys64\home\appveyor\libewf &&
-    C:\msys64\usr\bin\bash -e -l -c "cd libewf && tests/build.sh ${CONFIGURE_OPTIONS}" )
+    xcopy /i /q /s C:\projects\libewf-legacy C:\msys64\home\appveyor\libewf-legacy &&
+    C:\msys64\usr\bin\bash -e -l -c "cd libewf-legacy && tests/build.sh ${CONFIGURE_OPTIONS}" )
 
 test_script:
 - cmd: rem Run tests
@@ -365,17 +365,17 @@ test_script:
 - sh: if test ${BUILD_ENVIRONMENT} = "xcode" && test ${TARGET} != "macos-pkgbuild"; then tests/runtests.sh; fi
 - sh: if test ${TARGET} = "macos-pkgbuild"; then tests/pkgbuild.sh; fi
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    C:\cygwin64\bin\bash -l -c "cd libewf && tests/runtests.sh" )
+    C:\cygwin64\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
-    C:\msys64\usr\bin\bash -l -c "cd libewf && tests/runtests.sh" )
+    C:\msys64\usr\bin\bash -l -c "cd libewf-legacy && tests/runtests.sh" )
 
 after_test:
 - cmd: if [%TARGET%]==[cygwin64-gcc-no-optimization] (
-    C:\cygwin64\bin\bash -e -l -c "cd libewf && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
-    C:\projects\codecov.exe -R \cygwin64\home\appveyor\libewf --name %TARGET% )
+    C:\cygwin64\bin\bash -e -l -c "cd libewf-legacy && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
+    C:\projects\codecov.exe -R \cygwin64\home\appveyor\libewf-legacy --name %TARGET% )
 - cmd: if [%TARGET%]==[mingw-w64-gcc-no-optimization] (
-    C:\msys64\usr\bin\bash -e -l -c "cd libewf && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
-    C:\projects\codecov.exe -R \msys64\home\appveyor\libewf --name %TARGET% )
+    C:\msys64\usr\bin\bash -e -l -c "cd libewf-legacy && for DIRECTORY in `find . -maxdepth 1 -type d`; do (cd ${DIRECTORY} && find . -maxdepth 1 -name \*.gcno -type f -exec gcov -pb {} \;) done" &&
+    C:\projects\codecov.exe -R \msys64\home\appveyor\libewf-legacy --name %TARGET% )
 
 artifacts:
 - path: \*.nupkg

diff --git 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