gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.scikit-build: 0.18.1 -> 0.19.0

Browse Source 
https://github.com/scikit-build/scikit-build/blob/0.19.0/CHANGES.rst
This commit is contained in:
Martin Weinelt
2026-05-30 03:53:15 +02:00
parent 9518afa893
commit 654d103b12
2 changed files with 2 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/scikit-build/default.nix
+2 -13
View File
@@ -22,26 +22,15 @@
buildPythonPackage rec {
pname = "scikit-build";
version = "0.18.1";
version = "0.19.0";
pyproject = true;
src = fetchPypi {
pname = "scikit_build";
inherit version;
hash = "sha256-pBUqxaCE1JnCineXvgYo2DZsM24vsOGgY+sy5V78uOc=";
hash = "sha256-RuGy1xND0U5MB9fmCQLmc8eN77miwoK3CtgPuFAq3i4=";
};
patches = [
(fetchpatch2 {
name = "setuptools-75.0-compat.patch";
url = "https://github.com/scikit-build/scikit-build/commit/3992485c67331097553ec8f54233c4c295943f70.patch";
hash = "sha256-U34UY+m6RE3c3UN/jGHuR+sRUqTGmG7dT52NWCY7nIE=";
})
# <https://github.com/scikit-build/scikit-build/pull/1160>
./fix-cmake-4.patch
];
# This line in the filterwarnings section of the pytest configuration leads to this error:
# E UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils.
postPatch = ''
pkgs/development/python-modules/scikit-build/fix-cmake-4.patch
-47
View File
@@ -1,47 +0,0 @@
From 9efbf7f9baa846867a9c5586e4cc82a8a19e2e84 Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Wed, 17 Sep 2025 19:00:01 +0100
Subject: [PATCH 1/2] tests: fix `test_issue335_support_cmake_source_dir` with
CMake 4
---
tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
index 7e391c46..18bae2bf 100644
--- a/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
+++ b/tests/samples/issue-335-support-cmake-source-dir/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.2...3.10)
project(hello NONE)
From 491d7494a3ec6cc181d37d02670c65b74c67cbfe Mon Sep 17 00:00:00 2001
From: Emily <hello@emily.moe>
Date: Wed, 17 Sep 2025 19:00:01 +0100
Subject: [PATCH 2/2] tests: fix `test_make_without_configure_fails` with CMake
4
---
tests/test_cmaker.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/test_cmaker.py b/tests/test_cmaker.py
index cf166905..9b6c3758 100644
--- a/tests/test_cmaker.py
+++ b/tests/test_cmaker.py
@@ -82,7 +82,10 @@ def test_make_without_configure_fails(capfd):
CMaker().make()
_, err = capfd.readouterr()
assert "An error occurred while building with CMake." in str(excinfo.value)
- assert "Error: could not load cache" in err
+ # CMake 4 changed the error message.
+ err_message_cmake_3 = "Error: could not load cache"
+ err_message_cmake_4 = "Error: not a CMake build directory (missing CMakeCache.txt)"
+ assert err_message_cmake_3 in err or err_message_cmake_4 in err
@pytest.mark.parametrize("configure_with_cmake_source_dir", [True, False])