From 470f80295cc27ba09f923d5c71210a2838f60013 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Wed, 19 Feb 2025 10:00:24 -0500 Subject: [PATCH 1/5] stricter pin on ncvis --- recipe/patch_yaml/ncvis-climate.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 recipe/patch_yaml/ncvis-climate.yaml diff --git a/recipe/patch_yaml/ncvis-climate.yaml b/recipe/patch_yaml/ncvis-climate.yaml new file mode 100644 index 000000000..1384c4a28 --- /dev/null +++ b/recipe/patch_yaml/ncvis-climate.yaml @@ -0,0 +1,7 @@ +if: + name: ncvis-climate + timestamp_lt: 1739760494852 # Mon Feb 17 02:48:49 2025 +then: + - tighten_depends: + name: wxwidgets + max_pin: 'x.x.x' From 578b1c43892e2bc9aee655a9e4ea6de2171fb8d5 Mon Sep 17 00:00:00 2001 From: mahf708 Date: Wed, 19 Feb 2025 10:03:01 -0500 Subject: [PATCH 2/5] fix linting in yaml --- recipe/patch_yaml/ncvis-climate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/patch_yaml/ncvis-climate.yaml b/recipe/patch_yaml/ncvis-climate.yaml index 1384c4a28..67e9e9d7f 100644 --- a/recipe/patch_yaml/ncvis-climate.yaml +++ b/recipe/patch_yaml/ncvis-climate.yaml @@ -1,6 +1,6 @@ if: name: ncvis-climate - timestamp_lt: 1739760494852 # Mon Feb 17 02:48:49 2025 + timestamp_lt: 1739760494852 # Mon Feb 17 02:48:49 2025 then: - tighten_depends: name: wxwidgets From 2abb47df27a2e59cb29a7d3f3382e0f00e3eec6b Mon Sep 17 00:00:00 2001 From: mahf708 Date: Wed, 19 Feb 2025 10:20:41 -0500 Subject: [PATCH 3/5] tighten pin on all packages using wxwidgets --- recipe/patch_yaml/ncvis-climate.yaml | 7 ------- recipe/patch_yaml/wxwidgets.yaml | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 recipe/patch_yaml/ncvis-climate.yaml create mode 100644 recipe/patch_yaml/wxwidgets.yaml diff --git a/recipe/patch_yaml/ncvis-climate.yaml b/recipe/patch_yaml/ncvis-climate.yaml deleted file mode 100644 index 67e9e9d7f..000000000 --- a/recipe/patch_yaml/ncvis-climate.yaml +++ /dev/null @@ -1,7 +0,0 @@ -if: - name: ncvis-climate - timestamp_lt: 1739760494852 # Mon Feb 17 02:48:49 2025 -then: - - tighten_depends: - name: wxwidgets - max_pin: 'x.x.x' diff --git a/recipe/patch_yaml/wxwidgets.yaml b/recipe/patch_yaml/wxwidgets.yaml new file mode 100644 index 000000000..9b12c6558 --- /dev/null +++ b/recipe/patch_yaml/wxwidgets.yaml @@ -0,0 +1,9 @@ +# wxwidgets broke abi compatiblity in 3.2.6 +# see issue https://github.com/wxWidgets/wxWidgets/issues/25173 +# so we are tightening the upper bin going forward, starting with 3.2.5 +if: + has_depends: wxwidgets >=3.2.5,<3.3.0a0 +then: + - tighten_depends: + name: wxwidgets + max_pin: 'x.x.x' From 870bf24e1ff0976e404790bd34dacc8836e22eb5 Mon Sep 17 00:00:00 2001 From: Naser Mahfouz Date: Wed, 19 Feb 2025 12:13:17 -0500 Subject: [PATCH 4/5] add a timestamp to conservatively guard against patching --- recipe/patch_yaml/wxwidgets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/patch_yaml/wxwidgets.yaml b/recipe/patch_yaml/wxwidgets.yaml index 9b12c6558..51d10fbd4 100644 --- a/recipe/patch_yaml/wxwidgets.yaml +++ b/recipe/patch_yaml/wxwidgets.yaml @@ -3,6 +3,7 @@ # so we are tightening the upper bin going forward, starting with 3.2.5 if: has_depends: wxwidgets >=3.2.5,<3.3.0a0 + timestamp_lt: 1739974364803 then: - tighten_depends: name: wxwidgets From 76eaaa0162bba40456e6582b52548372f9680f0e Mon Sep 17 00:00:00 2001 From: Naser Mahfouz Date: Wed, 19 Feb 2025 12:14:22 -0500 Subject: [PATCH 5/5] only update the pin for osx platforms Co-authored-by: Mark Harfouche --- recipe/patch_yaml/wxwidgets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/patch_yaml/wxwidgets.yaml b/recipe/patch_yaml/wxwidgets.yaml index 51d10fbd4..df9663283 100644 --- a/recipe/patch_yaml/wxwidgets.yaml +++ b/recipe/patch_yaml/wxwidgets.yaml @@ -2,6 +2,7 @@ # see issue https://github.com/wxWidgets/wxWidgets/issues/25173 # so we are tightening the upper bin going forward, starting with 3.2.5 if: + subdir_in: [osx-64, osx-arm64] has_depends: wxwidgets >=3.2.5,<3.3.0a0 timestamp_lt: 1739974364803 then: