mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 17:19:23 +00:00
python3-ninja: upgrade 1.11.1.1 -> 1.13.0
Changelog: https://github.com/scikit-build/ninja-python-distributions/releases Upstream commit [1] switched build system from scikit-build to scikit-build-core, which changed pyproject.toml structure and rewrote __init__.py. Update patches accordingly: - no-scikit-build.patch: rewrite for new pyproject.toml structure, replace scikit-build-core with setuptools, and remove 'readme' from dynamic fields as setuptools cannot handle the fancy-pypi-readme plugin. - run-ninja-from-path.patch: drop. Old version imported skbuild modules in __init__.py which caused ImportError in OE since scikit-build is not installed. New version replaced these imports with stdlib sysconfig, so the patch is no longer needed. - CMakeLists.txt: drop. This was a stub file added to prevent scikit-build from failing when it could not find CMakeLists.txt. Since we now use setuptools which does not require it, the file can be removed. [1] https://github.com/scikit-build/ninja-python-distributions/commit/f3b4a786be Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,9 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.15)
|
|
||||||
|
|
||||||
project(NinjaPythonDistributions)
|
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
|
|
||||||
|
|
||||||
install(CODE "
|
|
||||||
message(STATUS \"Install ninja project\")
|
|
||||||
")
|
|
||||||
@@ -1,31 +1,22 @@
|
|||||||
We don't need to build ninja so there's no need to use scikit-build,
|
We don't need to build ninja so there's no need to use scikit-build-core,
|
||||||
as we just need the python module with it's one ninja() function.
|
as we just need the python module with its one ninja() function.
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
Upstream-Status: Inappropriate
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
|
||||||
|
|
||||||
diff --git a/pyproject.toml b/pyproject.toml
|
|
||||||
index b895c20..577b642 100644
|
|
||||||
--- a/pyproject.toml
|
--- a/pyproject.toml
|
||||||
+++ b/pyproject.toml
|
+++ b/pyproject.toml
|
||||||
@@ -2,7 +2,6 @@
|
@@ -1,5 +1,4 @@
|
||||||
requires = [
|
[build-system]
|
||||||
"setuptools >=42",
|
-requires = ["scikit-build-core>=0.10"]
|
||||||
"setuptools-scm[toml]",
|
-build-backend = "backend"
|
||||||
- "scikit-build",
|
-backend-path = ["_build_backend"]
|
||||||
]
|
+requires = ["setuptools", "setuptools-scm"]
|
||||||
build-backend = "setuptools.build_meta"
|
+build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
@@ -7,3 +6,3 @@
|
||||||
index dbe1fbc..3259754 100755
|
name = "ninja"
|
||||||
--- a/setup.py
|
-dynamic = ["version", "readme"]
|
||||||
+++ b/setup.py
|
+dynamic = ["version"]
|
||||||
@@ -5,7 +5,7 @@ import os
|
description = "Ninja is a small build system with a focus on speed"
|
||||||
import sys
|
|
||||||
from distutils.text_file import TextFile
|
|
||||||
|
|
||||||
-from skbuild import setup
|
|
||||||
+from setuptools import setup
|
|
||||||
|
|
||||||
# Add current folder to path
|
|
||||||
# This is required to import versioneer in an isolated pip build
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
There's no need to hunt around source or install trees when we're just running ninja
|
|
||||||
from PATH.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
||||||
|
|
||||||
diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py
|
|
||||||
index f83767e..31bb926 100644
|
|
||||||
--- a/src/ninja/__init__.py
|
|
||||||
+++ b/src/ninja/__init__.py
|
|
||||||
@@ -19,32 +19,9 @@ except ImportError:
|
|
||||||
os.path.dirname(__file__), '../../Ninja-src/misc')))
|
|
||||||
from ninja_syntax import Writer, escape, expand # noqa: F401
|
|
||||||
|
|
||||||
-DATA = os.path.join(os.path.dirname(__file__), 'data')
|
|
||||||
-
|
|
||||||
-# Support running tests from the source tree
|
|
||||||
-if not os.path.exists(DATA):
|
|
||||||
- from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR
|
|
||||||
- from skbuild.constants import set_skbuild_plat_name
|
|
||||||
-
|
|
||||||
- if platform.system().lower() == "darwin":
|
|
||||||
- # Since building the project specifying --plat-name or CMAKE_OSX_* variables
|
|
||||||
- # leads to different SKBUILD_DIR, the code below attempt to guess the most
|
|
||||||
- # likely plat-name.
|
|
||||||
- _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild'))
|
|
||||||
- if _skbuild_dirs:
|
|
||||||
- _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3])
|
|
||||||
- set_skbuild_plat_name(_likely_plat_name)
|
|
||||||
-
|
|
||||||
- _data = os.path.abspath(os.path.join(
|
|
||||||
- os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data'))
|
|
||||||
- if os.path.exists(_data):
|
|
||||||
- DATA = _data
|
|
||||||
-
|
|
||||||
-BIN_DIR = os.path.join(DATA, 'bin')
|
|
||||||
-
|
|
||||||
|
|
||||||
def _program(name, args):
|
|
||||||
- return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False)
|
|
||||||
+ return subprocess.call([name] + args, close_fds=False)
|
|
||||||
|
|
||||||
|
|
||||||
def ninja():
|
|
||||||
+2
-3
@@ -6,10 +6,9 @@ PYPI_PACKAGE = "ninja"
|
|||||||
PYPI_ARCHIVE_NAME_PREFIX = "pypi-"
|
PYPI_ARCHIVE_NAME_PREFIX = "pypi-"
|
||||||
|
|
||||||
inherit pypi python_setuptools_build_meta
|
inherit pypi python_setuptools_build_meta
|
||||||
SRC_URI[sha256sum] = "9d793b08dd857e38d0b6ffe9e6b7145d7c485a42dcfea04905ca0cdb6017cc3c"
|
SRC_URI[sha256sum] = "4a40ce995ded54d9dc24f8ea37ff3bf62ad192b547f6c7126e7e25045e76f978"
|
||||||
|
|
||||||
SRC_URI += "file://no-scikit-build.patch \
|
SRC_URI += "file://no-scikit-build.patch "
|
||||||
file://run-ninja-from-path.patch"
|
|
||||||
|
|
||||||
DEPENDS += "python3-setuptools-scm-native"
|
DEPENDS += "python3-setuptools-scm-native"
|
||||||
|
|
||||||
Reference in New Issue
Block a user