From e2eedeb4a65a5e9ad07fda61ba3d636e541a91947d9b08d58bd7dc22394681b8 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 6 Sep 2024 03:43:50 +0000 Subject: [PATCH] Accepting request 1199075 from home:bnavigator:branches:devel:languages:python:numeric - Update to 0.10.5 * This version fixes an issue rebuilding if you have a build-dir set and are using isolated build environments. The cache is now correctly cleared if this occurs. An issue with a certain style of gitignore was also fixed. - Version 0.10.4 * This version fixes the logic for handling the sysconfig variables on Windows for the values that used to be only provided on UNIX. This mostly affects targeting the Stable ABI on Python 3.13. Editable install rebuilds now work if you have a wheel.install-dir set, too. - Version 0.10.3 * This release fixes an issue on Windows systems with non-utf-8 default encodings for Python <3.14 when reading gitignores with special characters. - Version 0.10.2 * This release fixes a regression with 0.10 where a manually included file in an sdist would get included twice, affecting some tools (like uv). - Version 0.10.1 * Fix crash when building inside a submodule by @ausbin in #854 * cmake.minimum-version logic issue by @henryiii in #853 - Version 0.10.0 * This version adds auto CMake version discovery, opt-in auto minimum-version, rebuild on failure support, quite a few new override options greatly expanding the static config options for builds, more powerful regexs, and more. ## New features: * Auto CMake version by @henryiii in #804 * Auto minimum-version by @henryiii in #798 OBS-URL: https://build.opensuse.org/request/show/1199075 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build-core?expand=0&rev=11 --- python-scikit-build-core.changes | 82 +++++++++++++++++++++ python-scikit-build-core.spec | 4 +- scikit-build-core-offline-wheelhouse.patch | 11 ++- scikit-build-core-pr764-printversion.patch | 85 ---------------------- scikit_build_core-0.10.5.tar.gz | 3 + scikit_build_core-0.9.5.tar.gz | 3 - 6 files changed, 91 insertions(+), 97 deletions(-) delete mode 100644 scikit-build-core-pr764-printversion.patch create mode 100644 scikit_build_core-0.10.5.tar.gz delete mode 100644 scikit_build_core-0.9.5.tar.gz diff --git a/python-scikit-build-core.changes b/python-scikit-build-core.changes index 9489fc2..afc8415 100644 --- a/python-scikit-build-core.changes +++ b/python-scikit-build-core.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Thu Sep 5 20:51:54 UTC 2024 - Ben Greiner + +- Update to 0.10.5 + * This version fixes an issue rebuilding if you have a build-dir + set and are using isolated build environments. The cache is now + correctly cleared if this occurs. An issue with a certain style + of gitignore was also fixed. +- Version 0.10.4 + * This version fixes the logic for handling the sysconfig + variables on Windows for the values that used to be only + provided on UNIX. This mostly affects targeting the Stable ABI + on Python 3.13. Editable install rebuilds now work if you have + a wheel.install-dir set, too. +- Version 0.10.3 + * This release fixes an issue on Windows systems with non-utf-8 + default encodings for Python <3.14 when reading gitignores with + special characters. +- Version 0.10.2 + * This release fixes a regression with 0.10 where a manually + included file in an sdist would get included twice, affecting + some tools (like uv). +- Version 0.10.1 + * Fix crash when building inside a submodule by @ausbin in #854 + * cmake.minimum-version logic issue by @henryiii in #853 +- Version 0.10.0 + * This version adds auto CMake version discovery, opt-in auto + minimum-version, rebuild on failure support, quite a few new + override options greatly expanding the static config options + for builds, more powerful regexs, and more. + ## New features: + * Auto CMake version by @henryiii in #804 + * Auto minimum-version by @henryiii in #798 + * Add fail setting to instant-fail build by @henryiii in #824 + * Add messages config for failure/success by @henryiii in #825 + * New color system for message config by @henryiii in #842 + * Add if.abi-flags (for free-threaded) by @henryiii in #819 + * Adding if.system-cmake and if.cmake-wheel by @henryiii in #826 + * Add if.from-sdist for overrides by @henryiii in #812 + * Add if.failed (retry) by @henryiii in #820 + * Add if.scikit-build-version by @henryiii in #851 + * Packages can also be specified via a table by @henryiii in #841 + * Move cmake.targets and cmake.verbose to build.targets and + build.verbose by @henryiii in #793 + * Support multipart regex using result= by @henryiii in #818 + * Add remove= postprocess to regex by @henryiii in #828 + ## Fixes: + * Warn if cmake/ninja in build system requirements by @henryiii + in #803 + * Detect manual generator setting for get_requires_* by @henryiii + in #840 + * Support nested and local gitignores by @henryiii in #827 +- Version 0.9.8 + * This version ships a few more small fixes. Multi-target builds + were missing build arguments due to an exhausted generator. And + some packages seem to hard-code ${CMAKE_INSTALL_PREFIX} in the + install() call, which is an anti-pattern, but we can set that + variable too. More tests now run on Python 3.7. + ## Fixes: + * Empty build arguments for some targets in multi-target build by + @junrushao in #784 + * Support packages that hardcode CMAKE_INSTALL_PREFIX in their + install commands by @henryiii in #786 + * Logger shouldn't warn for missing lib on UNIX by @henryiii in + * #787 + ## Tests: + * Use ZipFile instead of zipfile.Path to enable more tests on + Python 3.7 by @henryiii in #785 +- Version 0.9.7 + * Set CC and CXX from sysconfig if not set by @henryiii in #782 + * musllinux tag incorrect by @henryiii in #773 + * Logger unconditionally set to DEBUG in non-PEP 517 usage by + @henryiii in #779 +- Version 0.9.6 + * Improve error message when metadata.version.provider not set by + @thewtex in #762 + * Only inject logic if cmake_* keywords present by @kiwifb in + #768 + * Only replace color tags if the color is defined by @bnavigator + in #764 +- Drop scikit-build-core-pr764-printversion.patch + ------------------------------------------------------------------- Sun Jun 9 18:50:49 UTC 2024 - Ben Greiner diff --git a/python-scikit-build-core.spec b/python-scikit-build-core.spec index af088c6..cee02be 100644 --- a/python-scikit-build-core.spec +++ b/python-scikit-build-core.spec @@ -18,14 +18,12 @@ %{?sle15_python_module_pythons} Name: python-scikit-build-core -Version: 0.9.5 +Version: 0.10.5 Release: 0 Summary: Build backend for CMake based projects License: Apache-2.0 URL: https://github.com/scikit-build/scikit-build-core Source0: https://files.pythonhosted.org/packages/source/s/scikit_build_core/scikit_build_core-%{version}.tar.gz -# PATCH-FIX-UPSTREAM scikit-build-core-pr764-printversion.patch gh#scikit-build/scikit-build-core#764 -Patch0: scikit-build-core-pr764-printversion.patch # PATCH-FEATURE-OPENSUSE scikit-build-core-offline-wheelhouse.patch provide the testing wheels without runtime download code@bnavigator.de Patch1: scikit-build-core-offline-wheelhouse.patch BuildRequires: %{python_module base >= 3.7} diff --git a/scikit-build-core-offline-wheelhouse.patch b/scikit-build-core-offline-wheelhouse.patch index 815b228..8040157 100644 --- a/scikit-build-core-offline-wheelhouse.patch +++ b/scikit-build-core-offline-wheelhouse.patch @@ -1,8 +1,8 @@ -Index: scikit_build_core-0.4.7/tests/conftest.py +Index: scikit_build_core-0.10.5/tests/conftest.py =================================================================== ---- scikit_build_core-0.4.7.orig/tests/conftest.py -+++ scikit_build_core-0.4.7/tests/conftest.py -@@ -34,52 +34,7 @@ BASE = DIR.parent +--- scikit_build_core-0.10.5.orig/tests/conftest.py ++++ scikit_build_core-0.10.5/tests/conftest.py +@@ -35,51 +35,7 @@ BASE = DIR.parent @pytest.fixture(scope="session") def pep518_wheelhouse(tmp_path_factory: pytest.TempPathFactory) -> Path: @@ -24,8 +24,7 @@ Index: scikit_build_core-0.4.7/tests/conftest.py - "build", - "cython", - "hatchling", -- "pip>=23; python_version<'3.13'", -- "pip>=24.1b1; python_version>='3.13'", +- "pip", - "pybind11", - "setuptools", - "virtualenv", diff --git a/scikit-build-core-pr764-printversion.patch b/scikit-build-core-pr764-printversion.patch deleted file mode 100644 index 6493fc0..0000000 --- a/scikit-build-core-pr764-printversion.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bc81cb1250ab4488fef55c081feccf6620e28144 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sun, 9 Jun 2024 22:07:19 +0200 -Subject: [PATCH 1/3] Only replace rich if the color is defined - ---- - src/scikit_build_core/_logging.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/scikit_build_core/_logging.py b/src/scikit_build_core/_logging.py -index c449c74f..ad1433b7 100644 ---- a/src/scikit_build_core/_logging.py -+++ b/src/scikit_build_core/_logging.py -@@ -116,10 +116,16 @@ def colors() -> dict[str, str]: - return _COLORS - return _NO_COLORS - -+def _sub_rich(m: re.Match) -> str: -+ try: -+ r = "".join(colors()[x] for x in m.group(1).split()) -+ except KeyError: -+ r = m.group(0) -+ return r - - def _process_rich(msg: object) -> str: - return ANY_ESCAPE.sub( -- lambda m: "".join(colors()[x] for x in m.group(1).split()), -+ _sub_rich, - str(msg), - ) - - -From aa97911dacb0460f9d6eef27240bee92894aa364 Mon Sep 17 00:00:00 2001 -From: "pre-commit-ci[bot]" - <66853113+pre-commit-ci[bot]@users.noreply.github.com> -Date: Sun, 9 Jun 2024 20:11:51 +0000 -Subject: [PATCH 2/3] style: pre-commit fixes - ---- - src/scikit_build_core/_logging.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/scikit_build_core/_logging.py b/src/scikit_build_core/_logging.py -index ad1433b7..a824ac24 100644 ---- a/src/scikit_build_core/_logging.py -+++ b/src/scikit_build_core/_logging.py -@@ -116,6 +116,7 @@ def colors() -> dict[str, str]: - return _COLORS - return _NO_COLORS - -+ - def _sub_rich(m: re.Match) -> str: - try: - r = "".join(colors()[x] for x in m.group(1).split()) -@@ -123,6 +124,7 @@ def _sub_rich(m: re.Match) -> str: - r = m.group(0) - return r - -+ - def _process_rich(msg: object) -> str: - return ANY_ESCAPE.sub( - _sub_rich, - -From bbbd406e90a7f3e001bf7c7df367e97af5cf32ba Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sun, 9 Jun 2024 22:25:27 +0200 -Subject: [PATCH 3/3] Fix typing annotation - ---- - src/scikit_build_core/_logging.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scikit_build_core/_logging.py b/src/scikit_build_core/_logging.py -index a824ac24..66957d32 100644 ---- a/src/scikit_build_core/_logging.py -+++ b/src/scikit_build_core/_logging.py -@@ -117,7 +117,7 @@ def colors() -> dict[str, str]: - return _NO_COLORS - - --def _sub_rich(m: re.Match) -> str: -+def _sub_rich(m: re.Match[Any]) -> str: - try: - r = "".join(colors()[x] for x in m.group(1).split()) - except KeyError: diff --git a/scikit_build_core-0.10.5.tar.gz b/scikit_build_core-0.10.5.tar.gz new file mode 100644 index 0000000..38f9cde --- /dev/null +++ b/scikit_build_core-0.10.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c3187bbf40fa0445e1c0562c87e9f5c17939a0df6b0141e5951dfebcb92d0e +size 253285 diff --git a/scikit_build_core-0.9.5.tar.gz b/scikit_build_core-0.9.5.tar.gz deleted file mode 100644 index 88db501..0000000 --- a/scikit_build_core-0.9.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a4cb119cc968fe87ae05582979657cc0e7be45655798446eabbe490e61ce072 -size 228404