From 5be25bf470f02a5a163afadcbd489c51e6c31eda Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:19:51 +0000 Subject: [PATCH 1/8] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c2bb962c..26e15422 100644 --- a/README.md +++ b/README.md @@ -350,3 +350,6 @@ Feedstock Maintainers * [@stuertz](https://github.com/stuertz/) * [@xhochy](https://github.com/xhochy/) + + + From 02865e2dd2eca895528615041dfff59aedddf712 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 05:20:59 -0600 Subject: [PATCH 2/8] fix: add 0001-patch-str-copy.patch --- recipe/0001-patch-str-copy.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipe/0001-patch-str-copy.patch diff --git a/recipe/0001-patch-str-copy.patch b/recipe/0001-patch-str-copy.patch new file mode 100644 index 00000000..77b45f26 --- /dev/null +++ b/recipe/0001-patch-str-copy.patch @@ -0,0 +1,27 @@ +From 0b2e9e3005255e92df4cc1be359edc04fd5c2ff6 Mon Sep 17 00:00:00 2001 +From: Cornelius Roemer +Date: Thu, 18 Jul 2024 23:47:33 +0200 +Subject: [PATCH] fix: use copy(v) which works also on str, instead of v.copy() + which doesn't + +resolves #5416 +resolves #3404 (closed because stale, not because fixed) + +Bug was possibly introduced in #3344 +--- + conda_build/variants.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/conda_build/variants.py b/conda_build/variants.py +index b185a7eb34..fe659067e8 100644 +--- a/conda_build/variants.py ++++ b/conda_build/variants.py +@@ -328,7 +328,7 @@ def _combine_spec_dictionaries( + ) != len(ensure_list(v)): + break + else: +- values[k] = v.copy() ++ values[k] = copy(v) + missing_subvalues = [ + subvalue + for subvalue in ensure_list(v) From d0e5d46297b60d04c6e5e957ebc6418ab02fddf9 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 05:21:32 -0600 Subject: [PATCH 3/8] fix: add patch to metadata --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7cfa7189..a0af635b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,8 @@ package: source: url: https://github.com/conda/{{ name }}/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz sha256: 1fafd20caa758862bb1b51cebf1bd87cf7c01cf41b7eaa5ed9d6de8e08e829c6 + patches: + - 0001-patch-str-copy.patch build: number: 1 From 40ef7892acccfe7ad4f37b21d296779a7ca41053 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 05:21:52 -0600 Subject: [PATCH 4/8] chore: bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a0af635b..580eda4d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - 0001-patch-str-copy.patch build: - number: 1 + number: 2 script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv entry_points: - conda-build = conda_build.cli.main_build:execute From e30528cc4738d79dd21018af733965b8729f22b5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:22:12 +0000 Subject: [PATCH 5/8] MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.7, and conda-forge-pinning 2024.11.26.07.33.56 --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 26e15422..c2bb962c 100644 --- a/README.md +++ b/README.md @@ -350,6 +350,3 @@ Feedstock Maintainers * [@stuertz](https://github.com/stuertz/) * [@xhochy](https://github.com/xhochy/) - - - From 722515581f91adb35a4b95d12cb62bcdd4ee31f2 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 05:24:13 -0600 Subject: [PATCH 6/8] fix: add comment and constraint scope of patch --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 580eda4d..cacc5167 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,9 @@ build: number: 2 script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv entry_points: - - conda-build = conda_build.cli.main_build:execute + # from https://github.com/conda/conda-build/pull/5417 + # can be removed once this PR is shipped + - conda-build = conda_build.cli.main_build:execute # [version == "24.11.1"] - conda-convert = conda_build.cli.main_convert:execute - conda-debug = conda_build.cli.main_debug:execute - conda-develop = conda_build.cli.main_develop:execute From 86d16aeb19318126f2039ace0daff338157a400e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 05:25:03 -0600 Subject: [PATCH 7/8] fix: put comment and selector in the wrong spot --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cacc5167..9f9dd0a5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,15 +9,15 @@ source: url: https://github.com/conda/{{ name }}/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz sha256: 1fafd20caa758862bb1b51cebf1bd87cf7c01cf41b7eaa5ed9d6de8e08e829c6 patches: - - 0001-patch-str-copy.patch + # from https://github.com/conda/conda-build/pull/5417 + # can be removed once this PR is shipped + - 0001-patch-str-copy.patch # [version == "24.11.1"] build: number: 2 script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv entry_points: - # from https://github.com/conda/conda-build/pull/5417 - # can be removed once this PR is shipped - - conda-build = conda_build.cli.main_build:execute # [version == "24.11.1"] + - conda-build = conda_build.cli.main_build:execute - conda-convert = conda_build.cli.main_convert:execute - conda-debug = conda_build.cli.main_debug:execute - conda-develop = conda_build.cli.main_develop:execute From a2ec78ed323e534b9bfc12d4b618c4fed5e9d358 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 26 Nov 2024 11:59:35 -0600 Subject: [PATCH 8/8] fix: try and get patch applied --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f9dd0a5..d230d30a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,10 +8,12 @@ package: source: url: https://github.com/conda/{{ name }}/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz sha256: 1fafd20caa758862bb1b51cebf1bd87cf7c01cf41b7eaa5ed9d6de8e08e829c6 + {% if version == "24.11.1" %} patches: # from https://github.com/conda/conda-build/pull/5417 # can be removed once this PR is shipped - - 0001-patch-str-copy.patch # [version == "24.11.1"] + - 0001-patch-str-copy.patch + {% endif %} build: number: 2