diff --git a/python-scikit-build.changes b/python-scikit-build.changes index 6731c8c..bedad7f 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Thu Jul 11 09:01:25 UTC 2024 - Ben Greiner + +- Update to 0.18.0 + ## Bug fixes + * Support MSVC 17.10 in #1081 + * CMake 3.5+ requirement in #1095 + * Support CPython 3.13 with windows lib finding fix in #1094 + * Don't die on PermissionError during chmod by @mweinelt in #1073 + * Remove usage of deprecated distutils in cmake files by + @hmaarrfk in #1032 + * Use first available option for vswhere output by @ZzEeKkAa in + #1030 + ## Testing + * Support setuptools 69.3.0 changes in two tests by + @s-t-e-v-e-n-k in #1087 + * Use uv in a few places in #1092 + ## Miscellaneous + * Clean up pylint in #1017 + * Fix mypy type ignores for new setuptools types in #1082 + * Move to Ruff-format in #1035 + * Remove pkg_resources and test command in #1014 + * Ruff moved to astral-sh in #1007 + * Target-version no longer needed by Black or Ruff in #1008 + * Update ruff and fix warnings in #1060 + * Use 2x faster black mirror in #1021 + * Group dependabot updates in #1054 + * macos-latest is changing to macos-14 ARM runners in #1083 + * Skip win PyPy PEP 518 in #1091 +- Drop support-setuptools-69-3.patch + ------------------------------------------------------------------- Mon Jun 3 06:10:14 UTC 2024 - Steve Kowalik diff --git a/python-scikit-build.spec b/python-scikit-build.spec index 6089870..9e5c2d8 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -27,16 +27,14 @@ %{?sle15_python_module_pythons} Name: python-scikit-build%{psuffix} -Version: 0.17.6 +Version: 0.18.0 Release: 0 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions License: MIT URL: https://github.com/scikit-build/scikit-build Source: https://files.pythonhosted.org/packages/source/s/scikit-build/scikit_build-%{version}.tar.gz Source99: sample-setup.cfg -# PATCH-FIX-UPSTREAM gh#scikit-build/scikit-build#1087 -Patch0: support-setuptools-69-3.patch -BuildRequires: %{python_module devel >= 3.7} +BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module hatch-fancy-pypi-readme} BuildRequires: %{python_module hatch-vcs} BuildRequires: %{python_module hatchling} @@ -44,7 +42,7 @@ BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 42.0.0} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: cmake +Requires: cmake >= 3.5 Requires: python-distro Requires: python-packaging Requires: python-setuptools >= 42.0.0 diff --git a/scikit_build-0.17.6.tar.gz b/scikit_build-0.17.6.tar.gz deleted file mode 100644 index 7d7b3b4..0000000 --- a/scikit_build-0.17.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d -size 272208 diff --git a/scikit_build-0.18.0.tar.gz b/scikit_build-0.18.0.tar.gz new file mode 100644 index 0000000..682ebfa --- /dev/null +++ b/scikit_build-0.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71a13af467d1a38510c3494786e2edb73ead53ea922bde6e519dc5372aa65096 +size 273824 diff --git a/support-setuptools-69-3.patch b/support-setuptools-69-3.patch deleted file mode 100644 index 6062d8f..0000000 --- a/support-setuptools-69-3.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d0655bdcb9f27b9d64c582b947a7b56732f76c82 Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -Date: Mon, 3 Jun 2024 15:53:10 +1000 -Subject: [PATCH] Support setuptools 69.3.0 changes in two tests - -setuptools 69.3.0 now canonicalizes package names in filenames, which -means all dashes are now converted to underscores, leading to test -failures due to FileNotFoundErrors. Handle both cases to support older -and newer setuptools. ---- - tests/test_hello_cython.py | 23 ++++++++++++++--------- - tests/test_hello_pure.py | 15 ++++++++++----- - 2 files changed, 24 insertions(+), 14 deletions(-) - -diff --git a/tests/test_hello_cython.py b/tests/test_hello_cython.py -index dc95f697..1d9e944d 100644 ---- a/tests/test_hello_cython.py -+++ b/tests/test_hello_cython.py -@@ -29,20 +29,25 @@ def test_hello_cython_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "hello-cython-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("hello_cython" in x for x in sdists_zip + sdists_tar): -+ dirname = "hello_cython-1.2.3" -+ - expected_content = [ -- "hello-cython-1.2.3/CMakeLists.txt", -- "hello-cython-1.2.3/hello/_hello.pyx", -- "hello-cython-1.2.3/hello/CMakeLists.txt", -- "hello-cython-1.2.3/hello/__init__.py", -- "hello-cython-1.2.3/hello/__main__.py", -- "hello-cython-1.2.3/setup.py", -+ f"{dirname}/CMakeLists.txt", -+ f"{dirname}/hello/_hello.pyx", -+ f"{dirname}/hello/CMakeLists.txt", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/hello/__main__.py", -+ f"{dirname}/setup.py", - ] - -- sdist_archive = "dist/hello-cython-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/hello-cython-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "hello-cython-1.2.3", expected_content, package_dir="hello") -+ check_sdist_content(sdist_archive, dirname, expected_content, package_dir="hello") - - - @project_setup_py_test("hello-cython", ["bdist_wheel"]) -diff --git a/tests/test_hello_pure.py b/tests/test_hello_pure.py -index 21b0840b..cc176854 100644 ---- a/tests/test_hello_pure.py -+++ b/tests/test_hello_pure.py -@@ -27,16 +27,21 @@ def test_hello_pure_sdist(): - sdists_zip = glob.glob("dist/*.zip") - assert sdists_tar or sdists_zip - -+ dirname = "hello-pure-1.2.3" -+ # setuptools 69.3.0 and above now canonicalize the filename as well. -+ if any("hello_pure" in x for x in sdists_zip + sdists_tar): -+ dirname = "hello_pure-1.2.3" -+ - expected_content = [ -- "hello-pure-1.2.3/hello/__init__.py", -- "hello-pure-1.2.3/setup.py", -+ f"{dirname}/hello/__init__.py", -+ f"{dirname}/setup.py", - ] - -- sdist_archive = "dist/hello-pure-1.2.3.zip" -+ sdist_archive = f"dist/{dirname}.zip" - if sdists_tar: -- sdist_archive = "dist/hello-pure-1.2.3.tar.gz" -+ sdist_archive = f"dist/{dirname}.tar.gz" - -- check_sdist_content(sdist_archive, "hello-pure-1.2.3", expected_content) -+ check_sdist_content(sdist_archive, dirname, expected_content) - - - @project_setup_py_test("hello-pure", ["bdist_wheel"], disable_languages_test=True)