@@ -21,11 +21,9 @@ Upstream-Status: Inappropriate [oe specific]
src/scikit_build_core/program_search.py | 10 ----------
1 file changed, 10 deletions(-)
-diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py
-index 7995c14..f82cad3 100644
--- a/src/scikit_build_core/program_search.py
+++ b/src/scikit_build_core/program_search.py
-@@ -90,16 +90,6 @@ class Program(NamedTuple):
+@@ -119,16 +119,6 @@
def _get_cmake_path(*, module: bool = True) -> Generator[Path, None, None]:
@@ -39,9 +37,6 @@ index 7995c14..f82cad3 100644
-
- yield Path(CMAKE_BIN_DIR) / "cmake"
-
- candidates = ("cmake3", "cmake")
+ candidates = ("cmake", "cmake3")
for candidate in candidates:
cmake_path = shutil.which(candidate)
-2.51.1
-
@@ -11,22 +11,18 @@ Upstream-Status: Inappropriate [oe specific]
Suggested-by: Stephan Kulow <stephan.kulow@siemens.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
- src/scikit_build_core/builder/builder.py | 2 +-
+ src/scikit_build_core/builder/builder.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/scikit_build_core/builder/builder.py b/src/scikit_build_core/builder/builder.py
-index 4be0cca..0fc54f4 100644
--- a/src/scikit_build_core/builder/builder.py
+++ b/src/scikit_build_core/builder/builder.py
-@@ -395,7 +395,7 @@ class Builder:
- python_sabi_library = get_python_library(self.config.env, abi3t=True)
- elif sabi == _SabiMode.ABI3:
- python_sabi_library = get_python_library(self.config.env, abi3=True)
-- python_include_dir = get_python_include_dir()
-+ python_include_dir = os.getenv("PYTHON_INCLUDE_DIR") or get_python_include_dir()
- numpy_include_dir = get_numpy_include_dir()
+@@ -402,7 +402,7 @@
+ python_sabi_library = get_python_library(self.config.env, abi3t=True)
+ elif sabi == _SabiMode.ABI3:
+ python_sabi_library = get_python_library(self.config.env, abi3=True)
+- python_include_dir = get_python_include_dir()
++ python_include_dir = os.getenv("PYTHON_INCLUDE_DIR") or get_python_include_dir()
+ numpy_include_dir = get_numpy_include_dir()
- # Warning for CPython 3.13.4 Windows bug
-2.47.3
-
+ # Classic Find Python
@@ -13,22 +13,26 @@ Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
- src/scikit_build_core/init/__main__.py | 11 +++++++++--
- .../abi3/src/{${module} => __module__}/_core.c | 0
- .../abi3t/src/{${module} => __module__}/_core.c | 0
- .../templates/c/src/{${module} => __module__}/_core.c | 0
- .../src/{${module} => __module__}/__init__.py.in | 0
- .../cython/src/{${module} => __module__}/_core.pyx | 0
- .../fortran/src/{${module} => __module__}/_core.f | 0
- .../nanobind/src/{${module} => __module__}/_core.cpp | 0
- .../pybind11/src/{${module} => __module__}/_core.cpp | 0
- .../swig/src/{${module} => __module__}/_core.c | 0
- .../swig/src/{${module} => __module__}/_core.i | 0
- 11 files changed, 9 insertions(+), 2 deletions(-)
+ src/scikit_build_core/init/__main__.py | 11 +++++++++--
+ .../templates/abi3/src/{${module} => __module__}/_core.c | 0
+ .../templates/abi3t/src/{${module} => __module__}/_core.c | 0
+ .../templates/c/src/{${module} => __module__}/_core.c | 0
+ .../common/src/{${module} => __module__}/__init__.py.in | 0
+ .../ctypes/src/{${module} => __module__}/__init__.py.in | 0
+ .../templates/ctypes/src/{${module} => __module__}/_core.c | 0
+ .../templates/cython/src/{${module} => __module__}/_core.pyx | 0
+ .../templates/fortran/src/{${module} => __module__}/_core.f | 0
+ .../nanobind/src/{${module} => __module__}/_core.cpp | 0
+ .../pybind11/src/{${module} => __module__}/_core.cpp | 0
+ .../templates/swig/src/{${module} => __module__}/_core.c | 0
+ .../templates/swig/src/{${module} => __module__}/_core.i | 0
+ 13 files changed, 9 insertions(+), 2 deletions(-)
rename src/scikit_build_core/resources/templates/abi3/src/{${module} => __module__}/_core.c (100%)
rename src/scikit_build_core/resources/templates/abi3t/src/{${module} => __module__}/_core.c (100%)
rename src/scikit_build_core/resources/templates/c/src/{${module} => __module__}/_core.c (100%)
rename src/scikit_build_core/resources/templates/common/src/{${module} => __module__}/__init__.py.in (100%)
+ rename src/scikit_build_core/resources/templates/ctypes/src/{${module} => __module__}/__init__.py.in (100%)
+ rename src/scikit_build_core/resources/templates/ctypes/src/{${module} => __module__}/_core.c (100%)
rename src/scikit_build_core/resources/templates/cython/src/{${module} => __module__}/_core.pyx (100%)
rename src/scikit_build_core/resources/templates/fortran/src/{${module} => __module__}/_core.f (100%)
rename src/scikit_build_core/resources/templates/nanobind/src/{${module} => __module__}/_core.cpp (100%)
@@ -37,12 +41,11 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
rename src/scikit_build_core/resources/templates/swig/src/{${module} => __module__}/_core.i (100%)
diff --git a/src/scikit_build_core/init/__main__.py b/src/scikit_build_core/init/__main__.py
-index 1d213fe..36f4db5 100644
--- a/src/scikit_build_core/init/__main__.py
+++ b/src/scikit_build_core/init/__main__.py
-@@ -103,12 +103,19 @@ def _generate(
-
- written: list[Path] = []
+@@ -104,12 +104,19 @@ def _generate(
+ # A backend file replaces a ``common`` file with the same path.
+ written: set[Path] = set()
for root in (resources / "templates" / "common", resources / "templates" / backend):
- # Walk the tree; path components are templated too (e.g. ``${module}``).
+ # Walk the tree and process the templated path components for
@@ -78,6 +81,14 @@ diff --git a/src/scikit_build_core/resources/templates/common/src/${module}/__in
similarity index 100%
rename from src/scikit_build_core/resources/templates/common/src/${module}/__init__.py.in
rename to src/scikit_build_core/resources/templates/common/src/__module__/__init__.py.in
+diff --git a/src/scikit_build_core/resources/templates/ctypes/src/${module}/__init__.py.in b/src/scikit_build_core/resources/templates/ctypes/src/__module__/__init__.py.in
+similarity index 100%
+rename from src/scikit_build_core/resources/templates/ctypes/src/${module}/__init__.py.in
+rename to src/scikit_build_core/resources/templates/ctypes/src/__module__/__init__.py.in
+diff --git a/src/scikit_build_core/resources/templates/ctypes/src/${module}/_core.c b/src/scikit_build_core/resources/templates/ctypes/src/__module__/_core.c
+similarity index 100%
+rename from src/scikit_build_core/resources/templates/ctypes/src/${module}/_core.c
+rename to src/scikit_build_core/resources/templates/ctypes/src/__module__/_core.c
diff --git a/src/scikit_build_core/resources/templates/cython/src/${module}/_core.pyx b/src/scikit_build_core/resources/templates/cython/src/__module__/_core.pyx
similarity index 100%
rename from src/scikit_build_core/resources/templates/cython/src/${module}/_core.pyx
@@ -102,6 +113,3 @@ diff --git a/src/scikit_build_core/resources/templates/swig/src/${module}/_core.
similarity index 100%
rename from src/scikit_build_core/resources/templates/swig/src/${module}/_core.i
rename to src/scikit_build_core/resources/templates/swig/src/__module__/_core.i
-2.43.0
-
similarity index 83%
rename from meta-python/recipes-devtools/python/python3-scikit-build-core_1.0.3.bb
rename to meta-python/recipes-devtools/python/python3-scikit-build-core_1.1.2.bb
@@ -11,6 +11,6 @@ SRC_URI += " \
file://0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch \
file://0001-src-scikit_build_core-Don-t-use-module.patch \
"
-SRC_URI[sha256sum] = "a4d7a05978ee37975c37743510c8991e2debce7ef83afb0a07c0c576fd4f16e8"
+SRC_URI[sha256sum] = "7893709119c5ab1be75cd10442383132c9433b9f104dacef5185949efbea7974"
BBCLASSEXTEND = "native nativesdk"
Refresh patches; also rename the new ctypes template ${module} directory. Changes: - Breaking (1.1.0): drop Python 3.8. - 1.1.0: package-declared config-settings table (tool.scikit-build.config-setting), cmake.fresh, if.not overrides, `scikit-build settings list`, sdist.resolve-symlinks = "error". - Fixes: free-threaded Python_FIND_ABI handling, cmake discovery (prefer cmake over cmake3), sdist ignore rules no longer cross submodule boundaries, deterministic editable __path__ order. - 1.1.1-1.1.2: write sources directly to wheels (faster), ctypes backend for `scikit-build init`, {build_dir} key for editable.rebuild-dir. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- ...e-from-PATH-instead-of-CMAKE_BIN_DIR.patch | 9 +--- ...-builder.py-Check-PYTHON_INCLUDE_DIR.patch | 22 ++++----- ...c-scikit_build_core-Don-t-use-module.patch | 46 +++++++++++-------- ....bb => python3-scikit-build-core_1.1.2.bb} | 2 +- 4 files changed, 39 insertions(+), 40 deletions(-) rename meta-python/recipes-devtools/python/{python3-scikit-build-core_1.0.3.bb => python3-scikit-build-core_1.1.2.bb} (83%)