From 5c99adf66d761205849b77e7fc010b85a7a60377 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 20 Apr 2023 13:58:00 -0700 Subject: [PATCH 01/12] add warning and return empty string --- conda_build/windows.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conda_build/windows.py b/conda_build/windows.py index ffaad7f5ca..42ad8af748 100644 --- a/conda_build/windows.py +++ b/conda_build/windows.py @@ -108,6 +108,11 @@ def msvc_env_cmd(bits, config, override=None): "If this recipe does not use a compiler, this message is safe to ignore. " "Otherwise, use {{compiler('')}} jinja2 in requirements/build." ) + if bit == "arm64": + log.warn( + "The legacy MSVC compiler setup does not support arm64 builds. " + ) + return "" if override: log.warn( "msvc_compiler key in meta.yaml is deprecated. Use the new" From 9c70251111290812cadb321b38dee5b8a95f783e Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Tue, 25 Apr 2023 12:59:35 -0700 Subject: [PATCH 02/12] Run tests in branch --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index da7637be2a..c681fdc56e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,6 +10,7 @@ on: branches: - main - feature/** + - msvc-env-cmd # NOTE: github.event context is pull_request payload: # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request From 9fdb425c56d28ecbbcbbc1a1a32843b64eaa4a5d Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Tue, 25 Apr 2023 15:25:47 -0700 Subject: [PATCH 03/12] Update windows.py bit -> bits --- conda_build/windows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_build/windows.py b/conda_build/windows.py index 42ad8af748..700f5c28ff 100644 --- a/conda_build/windows.py +++ b/conda_build/windows.py @@ -108,7 +108,7 @@ def msvc_env_cmd(bits, config, override=None): "If this recipe does not use a compiler, this message is safe to ignore. " "Otherwise, use {{compiler('')}} jinja2 in requirements/build." ) - if bit == "arm64": + if bits == "arm64": log.warn( "The legacy MSVC compiler setup does not support arm64 builds. " ) From a68f0ac5a748e2d0a587f06bbacaf048786f1d67 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Wed, 3 May 2023 11:00:08 -0700 Subject: [PATCH 04/12] remove added branch --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7fe6ffc981..19062be01a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,6 @@ on: - main - feature/** - '[0-9].*.x' # e.g., 3.24.x - - msvc-env-cmd # NOTE: github.event context is pull_request payload: # https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request From 176f793f7149ef69ba5f7aa91ebdef8f681442d0 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 4 May 2023 12:32:20 -0700 Subject: [PATCH 05/12] Create news file --- news/made-msvc_env_cmd-no-op-for-arm64 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 news/made-msvc_env_cmd-no-op-for-arm64 diff --git a/news/made-msvc_env_cmd-no-op-for-arm64 b/news/made-msvc_env_cmd-no-op-for-arm64 new file mode 100644 index 0000000000..a20af0a2ff --- /dev/null +++ b/news/made-msvc_env_cmd-no-op-for-arm64 @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* + +### Deprecations + +* + +### Docs + +* + +### Other + +* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd From 3a9f4d5890f2f937e1a3513b2f7b97760439e6e3 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 4 May 2023 12:33:22 -0700 Subject: [PATCH 06/12] Changed news file name --- ..._env_cmd-no-op-for-arm64 => made-msvc-env-cmd-no-op-for-arm64} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{made-msvc_env_cmd-no-op-for-arm64 => made-msvc-env-cmd-no-op-for-arm64} (100%) diff --git a/news/made-msvc_env_cmd-no-op-for-arm64 b/news/made-msvc-env-cmd-no-op-for-arm64 similarity index 100% rename from news/made-msvc_env_cmd-no-op-for-arm64 rename to news/made-msvc-env-cmd-no-op-for-arm64 From 69b231c09ab962d9be1aa4219e0bfdefb84eefce Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 4 May 2023 12:34:16 -0700 Subject: [PATCH 07/12] Rename made-msvc-env-cmd-no-op-for-arm64 to arm64-msvc-env-cmd --- news/{made-msvc-env-cmd-no-op-for-arm64 => arm64-msvc-env-cmd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{made-msvc-env-cmd-no-op-for-arm64 => arm64-msvc-env-cmd} (100%) diff --git a/news/made-msvc-env-cmd-no-op-for-arm64 b/news/arm64-msvc-env-cmd similarity index 100% rename from news/made-msvc-env-cmd-no-op-for-arm64 rename to news/arm64-msvc-env-cmd From 1b46fa62272bc67d53454e78f25bef90f33fc9db Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 4 May 2023 12:34:54 -0700 Subject: [PATCH 08/12] Rename arm64-msvc-env-cmd to arm64-msvc-env-cmd-no-op --- news/{arm64-msvc-env-cmd => arm64-msvc-env-cmd-no-op} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{arm64-msvc-env-cmd => arm64-msvc-env-cmd-no-op} (100%) diff --git a/news/arm64-msvc-env-cmd b/news/arm64-msvc-env-cmd-no-op similarity index 100% rename from news/arm64-msvc-env-cmd rename to news/arm64-msvc-env-cmd-no-op From 37f68ea8367e16e4768520d71ab9ed7dc6989b2d Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Thu, 4 May 2023 13:13:38 -0700 Subject: [PATCH 09/12] Rename arm64-msvc-env-cmd-no-op to 4867-arm64-msvc-env-cmd-no-op --- news/{arm64-msvc-env-cmd-no-op => 4867-arm64-msvc-env-cmd-no-op} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename news/{arm64-msvc-env-cmd-no-op => 4867-arm64-msvc-env-cmd-no-op} (100%) diff --git a/news/arm64-msvc-env-cmd-no-op b/news/4867-arm64-msvc-env-cmd-no-op similarity index 100% rename from news/arm64-msvc-env-cmd-no-op rename to news/4867-arm64-msvc-env-cmd-no-op From b2c65e4bd24630a7a79664f42203782904f0813b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 11:00:52 +0000 Subject: [PATCH 10/12] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conda_build/windows.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conda_build/windows.py b/conda_build/windows.py index 700f5c28ff..c2497580f0 100644 --- a/conda_build/windows.py +++ b/conda_build/windows.py @@ -109,9 +109,7 @@ def msvc_env_cmd(bits, config, override=None): "Otherwise, use {{compiler('')}} jinja2 in requirements/build." ) if bits == "arm64": - log.warn( - "The legacy MSVC compiler setup does not support arm64 builds. " - ) + log.warn("The legacy MSVC compiler setup does not support arm64 builds. ") return "" if override: log.warn( From 8341468f4f8a02b6b950691f80a1e292615a0c71 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Mon, 11 Dec 2023 21:38:16 -0600 Subject: [PATCH 11/12] Update news/4867-arm64-msvc-env-cmd-no-op --- news/4867-arm64-msvc-env-cmd-no-op | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/4867-arm64-msvc-env-cmd-no-op b/news/4867-arm64-msvc-env-cmd-no-op index a20af0a2ff..134dcd14fd 100644 --- a/news/4867-arm64-msvc-env-cmd-no-op +++ b/news/4867-arm64-msvc-env-cmd-no-op @@ -16,4 +16,4 @@ ### Other -* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd +* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd. (#4867) From 3a8eb9bb68d4413c765538d94125411dc788e056 Mon Sep 17 00:00:00 2001 From: Finn Womack Date: Mon, 11 Dec 2023 19:53:56 -0800 Subject: [PATCH 12/12] Update conda_build/windows.py Co-authored-by: Isuru Fernando --- conda_build/windows.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_build/windows.py b/conda_build/windows.py index 1639c554b9..ce470abadc 100644 --- a/conda_build/windows.py +++ b/conda_build/windows.py @@ -110,8 +110,8 @@ def msvc_env_cmd(bits, config, override=None): "If this recipe does not use a compiler, this message is safe to ignore. " "Otherwise, use {{compiler('')}} jinja2 in requirements/build." ) - if bits == "arm64": - log.warn("The legacy MSVC compiler setup does not support arm64 builds. ") + if bits not in ["64", "32"]: + log.warn(f"The legacy MSVC compiler setup does not support {bits} builds. ") return "" if override: log.warn(