From 0e8855bde0548323bfddb8c1359ebed9cd5af2ba Mon Sep 17 00:00:00 2001 From: jllllll <3887729+jllllll@users.noreply.github.com> Date: Wed, 20 Sep 2023 14:17:49 -0500 Subject: [PATCH 1/4] Parse CMake version strings containing '-msvc' --- src/scikit_build_core/program_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py index 999ec40e5..116ee30bf 100644 --- a/src/scikit_build_core/program_search.py +++ b/src/scikit_build_core/program_search.py @@ -77,7 +77,7 @@ def get_cmake_programs(*, module: bool = True) -> Generator[Program, None, None] continue try: - version = Version(result.stdout.splitlines()[0].split()[-1]) + version = Version(result.stdout.splitlines()[0].split()[-1].split('-msvc')[0]) except (IndexError, InvalidVersion): logger.warning(f"Could not determine CMake version, got {result.stdout!r}") yield Program(cmake_path, None) From e6fcd6d1d0a85d1dd18848b232b3286a014a3ddb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:26:08 +0000 Subject: [PATCH 2/4] style: pre-commit fixes --- src/scikit_build_core/program_search.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py index 116ee30bf..ad1194abe 100644 --- a/src/scikit_build_core/program_search.py +++ b/src/scikit_build_core/program_search.py @@ -77,7 +77,9 @@ def get_cmake_programs(*, module: bool = True) -> Generator[Program, None, None] continue try: - version = Version(result.stdout.splitlines()[0].split()[-1].split('-msvc')[0]) + version = Version( + result.stdout.splitlines()[0].split()[-1].split("-msvc")[0] + ) except (IndexError, InvalidVersion): logger.warning(f"Could not determine CMake version, got {result.stdout!r}") yield Program(cmake_path, None) From 9d78a3db751936f24e6b51fa4167e9f4abc692e1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 20 Sep 2023 15:34:58 -0400 Subject: [PATCH 3/4] Update src/scikit_build_core/program_search.py --- src/scikit_build_core/program_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py index ad1194abe..d618580fb 100644 --- a/src/scikit_build_core/program_search.py +++ b/src/scikit_build_core/program_search.py @@ -78,7 +78,7 @@ def get_cmake_programs(*, module: bool = True) -> Generator[Program, None, None] try: version = Version( - result.stdout.splitlines()[0].split()[-1].split("-msvc")[0] + result.stdout.splitlines()[0].split()[-1].split("-")[0] ) except (IndexError, InvalidVersion): logger.warning(f"Could not determine CMake version, got {result.stdout!r}") From 97fab516571d60d191815cbfcfea15cc9e3ae802 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:36:45 +0000 Subject: [PATCH 4/4] style: pre-commit fixes --- src/scikit_build_core/program_search.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py index d618580fb..980d2a5b9 100644 --- a/src/scikit_build_core/program_search.py +++ b/src/scikit_build_core/program_search.py @@ -77,9 +77,7 @@ def get_cmake_programs(*, module: bool = True) -> Generator[Program, None, None] continue try: - version = Version( - result.stdout.splitlines()[0].split()[-1].split("-")[0] - ) + version = Version(result.stdout.splitlines()[0].split()[-1].split("-")[0]) except (IndexError, InvalidVersion): logger.warning(f"Could not determine CMake version, got {result.stdout!r}") yield Program(cmake_path, None)