From b2d0b774b111d5b79b0980de5140ac9b2e615116 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 16:38:19 +0200 Subject: [PATCH 1/7] Changes for CI tests --- .github/test_windows.yml | 24 ++++++++++++++++++++++++ appveyor.yml | 28 ---------------------------- 2 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 .github/test_windows.yml delete mode 100644 appveyor.yml diff --git a/.github/test_windows.yml b/.github/test_windows.yml new file mode 100644 index 0000000..b733088 --- /dev/null +++ b/.github/test_windows.yml @@ -0,0 +1,24 @@ +# Run tests on Windows. +name: test_windows +on: [push, pull_request] +permissions: read-all +jobs: + test_windows: + runs-on: ${{ matrix.os }} + strategy: + matrix: + include: + - os: windows-2025 + python-version: '3.14' + steps: + - uses: actions/checkout@v6 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + uv pip install -r pyproject.toml + - name: Run tests + run: | + python run_tests.py diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 8fd32db..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,28 +0,0 @@ -environment: - matrix: - - DESCRIPTION: "Run tests on Windows with 32-bit Python 3.14" - MACHINE_TYPE: "x86" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python314" - PYTHON_VERSION: "3.14" - L2TBINARIES_TRACK: "dev" - TARGET: tests - - DESCRIPTION: "Run tests on Windows with 64-bit Python 3.14" - MACHINE_TYPE: "amd64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: "C:\\Python314-x64" - PYTHON_VERSION: "3.14" - L2TBINARIES_TRACK: "dev" - TARGET: tests - -install: -- ps: .\config\appveyor\install.ps1 - -build: off - -test_script: -- cmd: IF [%TARGET%]==[tests] ( - "%PYTHON%\\python.exe" run_tests.py && - IF EXIST "tests\\end-to-end.py" ( - set PYTHONPATH=. && - "%PYTHON%\\python.exe" "tests\\end-to-end.py" --debug -c "config\\end-to-end.ini" ) ) From 31084a1306832ae25db17cebd8d0810343d3d6f9 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 16:51:15 +0200 Subject: [PATCH 2/7] Changes for CI tests --- .github/test_windows.yml | 8 ++++++-- config/appveyor/install.ps1 | 27 --------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 config/appveyor/install.ps1 diff --git a/.github/test_windows.yml b/.github/test_windows.yml index b733088..ef4ed2b 100644 --- a/.github/test_windows.yml +++ b/.github/test_windows.yml @@ -16,9 +16,13 @@ jobs: uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + - name: Set up uv + uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b + with: + enable-cache: true - name: Install dependencies run: | - uv pip install -r pyproject.toml + uv sync - name: Run tests run: | - python run_tests.py + uv run run_tests.py diff --git a/config/appveyor/install.ps1 b/config/appveyor/install.ps1 deleted file mode 100644 index 2ef3266..0000000 --- a/config/appveyor/install.ps1 +++ /dev/null @@ -1,27 +0,0 @@ -# Script to set up tests on AppVeyor Windows. - -$Dependencies = "PyYAML dfdatetime dtfabric libcreg libregf" - -If ($Dependencies.Length -gt 0) -{ - $Dependencies = ${Dependencies} -split " " - - $Output = Invoke-Expression -Command "git clone https://github.com/log2timeline/l2tdevtools.git ..\l2tdevtools 2>&1" | %{ "$_" } - Write-Host (${Output} | Out-String) - - If ($env:APPVEYOR_REPO_BRANCH -eq "main") - { - $Track = "stable" - } - Else - { - $Track = $env:APPVEYOR_REPO_BRANCH - } - New-Item -ItemType "directory" -Name "dependencies" - - $env:PYTHONPATH = "..\l2tdevtools" - - $Output = Invoke-Expression -Command "& '${env:PYTHON}\python.exe' ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type ${env:MACHINE_TYPE} --track ${env:L2TBINARIES_TRACK} ${Dependencies} 2>&1" | %{ "$_" } - Write-Host (${Output} | Out-String) -} - From 76f7f13e54dd20539af55f0568fa638259c2f492 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 16:53:04 +0200 Subject: [PATCH 3/7] Changes for CI tests --- .github/{ => workflows}/test_windows.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/test_windows.yml (100%) diff --git a/.github/test_windows.yml b/.github/workflows/test_windows.yml similarity index 100% rename from .github/test_windows.yml rename to .github/workflows/test_windows.yml From 00e180f9a5281b1fd4ccf2aa9397d0068b97bf5f Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 16:59:21 +0200 Subject: [PATCH 4/7] Changes for CI tests --- .github/workflows/test_windows.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index ef4ed2b..db4ad7f 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -16,13 +16,10 @@ jobs: uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - - name: Set up uv - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b - with: - enable-cache: true - - name: Install dependencies + - name: Install tox run: | - uv sync + python -m pip install --upgrade pip + python -m pip install tox tox-gh-actions - name: Run tests run: | - uv run run_tests.py + tox -epy314 From 544f66fbedde59ef6fe889ac929913a940864501 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 17:02:15 +0200 Subject: [PATCH 5/7] Changes for CI tests --- .github/workflows/test_windows.yml | 1 + tox.ini | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index db4ad7f..be643d7 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -16,6 +16,7 @@ jobs: uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - name: Install tox run: | python -m pip install --upgrade pip diff --git a/tox.ini b/tox.ini index c79e60b..d12b761 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,6 @@ envlist = py3{10,11,12,13,14},black,coverage,docformatter,docs,pylint,wheel,yamllint [testenv] -allowlist_externals = ./run_tests.py pip_pre = True passenv = CFLAGS @@ -17,7 +16,7 @@ deps = setuptools >= 65 wheel commands = - py3{10,11,12,13,14}: ./run_tests.py + py3{10,11,12,13,14}: python run_tests.py coverage: coverage erase coverage: coverage run --source=dfwinreg --omit="*_test*,*__init__*,*test_lib*" run_tests.py coverage: coverage xml From 3e4ed2f9b15278b093112b087237b9d2902c68e0 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 17:11:32 +0200 Subject: [PATCH 6/7] Changes for CI tests --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..8881570 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,2 @@ +build: off +test: off From 27ca8238a8669efaa769892c9d3ed83c63197bfc Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Thu, 2 Jul 2026 17:20:18 +0200 Subject: [PATCH 7/7] Changes for CI tests --- .github/workflows/test_windows.yml | 3 ++- appveyor.yml | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index be643d7..c3a0080 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -10,6 +10,7 @@ jobs: include: - os: windows-2025 python-version: '3.14' + toxenv: 'py314' steps: - uses: actions/checkout@v6 - name: Set up Python ${{ matrix.python-version }} @@ -23,4 +24,4 @@ jobs: python -m pip install tox tox-gh-actions - name: Run tests run: | - tox -epy314 + tox -e ${{ matrix.toxenv }} diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 8881570..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,2 +0,0 @@ -build: off -test: off