From 4669f8941afc81ba5126831faa92b87e2524b135 Mon Sep 17 00:00:00 2001 From: blnicho Date: Fri, 12 Dec 2025 12:09:11 -0700 Subject: [PATCH 1/2] Add stricter pin on platformdirs in GHA win jobs --- .github/workflows/test_branches.yml | 5 +++-- .github/workflows/test_pr_and_main.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index e5af7e5cbe5..dcbc31cf9c1 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -376,9 +376,10 @@ jobs: echo "*** Install Pyomo dependencies ***" # For windows, cannot use newer setuptools because of APPSI compilation issues # There seems to be some specific problem with platformdirs 4.5.0 - # on win 3.13/3.14 as of 2025-10-23 + # on win 3.13/3.14 as of 2025-10-23 and platformdirs 4.5.1 on win/3.13 + # as of 2025-12-12 if test "${{matrix.TARGET}}" == 'win'; then - CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0" + CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs<4.5.0" fi # Note: this will fail the build if any installation fails (or # possibly if it outputs messages to stderr) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 62814d904fa..675ea7326e0 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -429,9 +429,10 @@ jobs: echo "*** Install Pyomo dependencies ***" # For windows, cannot use newer setuptools because of APPSI compilation issues # There seems to be some specific problem with platformdirs 4.5.0 - # on win 3.13/3.14 as of 2025-10-23 + # on win 3.13/3.14 as of 2025-10-23 and platformdirs 4.5.1 on win/3.13 + # as of 2025-12-12 if test "${{matrix.TARGET}}" == 'win'; then - CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0" + CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs<4.5.0" fi # Note: this will fail the build if any installation fails (or # possibly if it outputs messages to stderr) From 3bc1db9486665293420e729654e27a6ff9b96937 Mon Sep 17 00:00:00 2001 From: blnicho Date: Fri, 12 Dec 2025 14:52:45 -0700 Subject: [PATCH 2/2] Exclude specific platformdirs versions instead of setting upper bound --- .github/workflows/test_branches.yml | 2 +- .github/workflows/test_pr_and_main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index dcbc31cf9c1..d094bcb61bd 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -379,7 +379,7 @@ jobs: # on win 3.13/3.14 as of 2025-10-23 and platformdirs 4.5.1 on win/3.13 # as of 2025-12-12 if test "${{matrix.TARGET}}" == 'win'; then - CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs<4.5.0" + CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0,!=4.5.1" fi # Note: this will fail the build if any installation fails (or # possibly if it outputs messages to stderr) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 675ea7326e0..f25b847758a 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -432,7 +432,7 @@ jobs: # on win 3.13/3.14 as of 2025-10-23 and platformdirs 4.5.1 on win/3.13 # as of 2025-12-12 if test "${{matrix.TARGET}}" == 'win'; then - CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs<4.5.0" + CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0,!=4.5.1" fi # Note: this will fail the build if any installation fails (or # possibly if it outputs messages to stderr)