From 5aa42b027e37f58c0b010dc9761a77d54511ac47 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 16:45:22 +0200 Subject: [PATCH 01/12] Use WSCISOFT as builder --- ci/appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index cfbba9a7a..a65d8ebf5 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -6,6 +6,8 @@ version: 2026.3.{build} #shallow_clone: true clone_depth: 1 build: false +build_cloud: WSCISOFT +image: WSCISOFT notifications: - provider: Email From 4dc0feb6f60ec0200525b5ab94ad511624e1be49 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 16:48:23 +0200 Subject: [PATCH 02/12] Update AppVeyor version and image settings --- ci/appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index a65d8ebf5..bd9dee611 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -2,10 +2,11 @@ # Windows # https://ci.appveyor.com/project/ESRF/pyFAI -version: 2026.3.{build} +version: 2026.5.{build} #shallow_clone: true clone_depth: 1 build: false + build_cloud: WSCISOFT image: WSCISOFT @@ -24,7 +25,7 @@ os: cache: - '%LOCALAPPDATA%\pip\Cache' -image: Visual Studio 2019 +#image: Visual Studio 2019 environment: global: From 88dac2ee38bd3bee67f8bdc25c043053b39aaba5 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 16:58:31 +0200 Subject: [PATCH 03/12] Update Visual Studio version in AppVeyor config --- ci/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index bd9dee611..5fd4ab83d 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -20,7 +20,7 @@ notifications: on_build_status_changed: true os: - - Visual Studio 2019 + - Visual Studio 2022 cache: - '%LOCALAPPDATA%\pip\Cache' From e0d9196d5fdcacde95c73045a46af9410c7746c3 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 17:01:28 +0200 Subject: [PATCH 04/12] Change path to MSVC compiler Updated Python directory paths for AppVeyor configuration. --- ci/appveyor.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 5fd4ab83d..b90e33b4b 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -35,12 +35,12 @@ environment: matrix: -# # Python 3.7 -# - PYTHON_DIR: "C:\\Python37-x64" -# PYTHON_ARCH: "64" - # Python 3.10 - - PYTHON_DIR: "C:\\Python310-x64" + - PYTHON_DIR: "C:\\Python\3.10" + PYTHON_ARCH: "64" + + # Python 3.11 + - PYTHON_DIR: "C:\\Python\3.10" PYTHON_ARCH: "64" # Python 3.12 @@ -51,6 +51,11 @@ environment: - PYTHON_DIR: "C:\\Python313-x64" PYTHON_ARCH: "64" + # Python 3.14 + - PYTHON_DIR: "C:\\Python314-x64" + PYTHON_ARCH: "64" + + init: - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) @@ -59,7 +64,7 @@ install: - "SET PATH=%PYTHON_DIR%;%PYTHON_DIR%\\Scripts;%PATH%" # Activate visual studio compiler - - '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat"' + - '"C:\\MSVC\\2022\\VC\\Auxiliary\\Build\\vcvars64.bat"' - 'cl.exe' # Upgrade/install distribution modules From d01483429426108e7ce0335148cfb836a7c58803 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 17:03:35 +0200 Subject: [PATCH 05/12] Typos --- ci/appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index b90e33b4b..1407809b2 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -36,23 +36,23 @@ environment: matrix: # Python 3.10 - - PYTHON_DIR: "C:\\Python\3.10" + - PYTHON_DIR: "C:\\Python\\3.10" PYTHON_ARCH: "64" # Python 3.11 - - PYTHON_DIR: "C:\\Python\3.10" + - PYTHON_DIR: "C:\\Python\\3.11" PYTHON_ARCH: "64" # Python 3.12 - - PYTHON_DIR: "C:\\Python312-x64" + - PYTHON_DIR: "C:\\Python\\3.12" PYTHON_ARCH: "64" # Python 3.13 - - PYTHON_DIR: "C:\\Python313-x64" + - PYTHON_DIR: "C:\\Python\\3.13" PYTHON_ARCH: "64" # Python 3.14 - - PYTHON_DIR: "C:\\Python314-x64" + - PYTHON_DIR: "C:\\Python\\3.14" PYTHON_ARCH: "64" From c7cd56cdeb1da15258edb0cd3c286f731d75d64b Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 17:25:34 +0200 Subject: [PATCH 06/12] Update AppVeyor cache configuration Remove pip cache from AppVeyor configuration and add packages to cache. --- ci/appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 1407809b2..191dab19e 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -23,9 +23,7 @@ os: - Visual Studio 2022 cache: - - '%LOCALAPPDATA%\pip\Cache' - -#image: Visual Studio 2019 + - packages environment: global: From 93676b85556f73a759f8e58ea33db7254447fdc0 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 18:15:12 +0200 Subject: [PATCH 07/12] Add TMPDIR environment variable to AppVeyor config --- ci/appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 191dab19e..72fccd954 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -30,6 +30,7 @@ environment: WIN_SDK_ROOT: "C:\\Program Files\\Microsoft SDKs\\Windows" VENV_BUILD_DIR: "venv_build" VENV_TEST_DIR: "venv_test" + TMPDIR: "F:\\TEMP" matrix: @@ -92,6 +93,7 @@ build_script: - "python ci\\info_platform.py" - "pip list" - "dir" + - 'python -c "import tempfile; print(tempfile.gettempdir())"' # Build - "python run_tests.py -m" From ff40bf88af8627c22ab33850c1ed085973b9abc2 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 5 May 2026 18:29:02 +0200 Subject: [PATCH 08/12] Add command to print silx resources data home --- ci/appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 72fccd954..2125a73b5 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -94,6 +94,7 @@ build_script: - "pip list" - "dir" - 'python -c "import tempfile; print(tempfile.gettempdir())"' + - 'python -c "import silx.resources; r=silx.resources.ExternalResources(\"py\",\"http://\");print(r.data_home)"' # Build - "python run_tests.py -m" From 57f90e4ec54958c6380deba761ed831b21387105 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 6 May 2026 22:37:20 +0200 Subject: [PATCH 09/12] Modify TMPDIR setting and update silx.resources path Updated TMPDIR configuration and modified silx.resources import path. --- ci/appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 2125a73b5..8dc86dae9 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -30,7 +30,7 @@ environment: WIN_SDK_ROOT: "C:\\Program Files\\Microsoft SDKs\\Windows" VENV_BUILD_DIR: "venv_build" VENV_TEST_DIR: "venv_test" - TMPDIR: "F:\\TEMP" + #TMPDIR: "F:\\TEMP" matrix: @@ -88,13 +88,15 @@ build_script: - "pip install silx" - "dir" - "pip install --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/ -r ci/requirements_appveyor.txt --upgrade" + # Print Python info + - "set TMPDIR=%cd%\TMP" - "python ci\\info_platform.py" - "pip list" - "dir" - 'python -c "import tempfile; print(tempfile.gettempdir())"' - - 'python -c "import silx.resources; r=silx.resources.ExternalResources(\"py\",\"http://\");print(r.data_home)"' + - 'python -c "import silx.resources; r=silx.resources.ExternalResources(\"pyFAI\",\"http://www.silx.org/pub/pyFAI/testdata\");print(r.data_home)"' # Build - "python run_tests.py -m" From 816a550032906d064516ae7d3a77a2dc74f15fcf Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Wed, 6 May 2026 22:38:18 +0200 Subject: [PATCH 10/12] Fix escape character in TMPDIR path --- ci/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index 8dc86dae9..b552c40ab 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -91,7 +91,7 @@ build_script: # Print Python info - - "set TMPDIR=%cd%\TMP" + - "set TMPDIR=%cd%\\TMP" - "python ci\\info_platform.py" - "pip list" - "dir" From a89c938899d218781ce6185c96ac04ec82e5a880 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 12 May 2026 13:30:08 +0200 Subject: [PATCH 11/12] install silx from GitHub with locking --- ci/appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index b552c40ab..ba90056f0 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -30,7 +30,7 @@ environment: WIN_SDK_ROOT: "C:\\Program Files\\Microsoft SDKs\\Windows" VENV_BUILD_DIR: "venv_build" VENV_TEST_DIR: "venv_test" - #TMPDIR: "F:\\TEMP" + TMPDIR: "F:\\AppVeyor" matrix: @@ -85,13 +85,12 @@ build_script: - "pip install --upgrade wheel tomli" - "pip install numpy cython --upgrade" - "pip install scipy --upgrade --pre" - - "pip install silx" - "dir" - "pip install --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/ -r ci/requirements_appveyor.txt --upgrade" + - "pip install git+https://github.com/kif/silx.git@4596_lock_json" # Print Python info - - "set TMPDIR=%cd%\\TMP" - "python ci\\info_platform.py" - "pip list" - "dir" From 8a04b2796df773f58d662f9bdee8c7d278956649 Mon Sep 17 00:00:00 2001 From: Jerome Kieffer Date: Tue, 12 May 2026 15:06:04 +0200 Subject: [PATCH 12/12] Modify pip install command for silx repository Updated the AppVeyor configuration to use the upgraded pip install command for the silx repository. --- ci/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor.yml b/ci/appveyor.yml index ba90056f0..cc121029a 100644 --- a/ci/appveyor.yml +++ b/ci/appveyor.yml @@ -85,9 +85,9 @@ build_script: - "pip install --upgrade wheel tomli" - "pip install numpy cython --upgrade" - "pip install scipy --upgrade --pre" + - "pip install --upgrade --pre git+https://github.com/kif/silx.git@4596_lock_json" - "dir" - "pip install --trusted-host www.silx.org --find-links http://www.silx.org/pub/wheelhouse/ -r ci/requirements_appveyor.txt --upgrade" - - "pip install git+https://github.com/kif/silx.git@4596_lock_json" # Print Python info