From a22a251cad53a26ac8c92ca027fa0db5518618f3d17df0617dcb49530ed09b53 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 29 Oct 2022 14:23:21 +0000 Subject: [PATCH 1/2] Accepting request 1032211 from home:bnavigator:branches:devel:languages:python:numeric - Update to 0.16.0 * This release adds support for Python 3.11 and removes support for Python 2.7 and 3.5 (#688). Testing and static checking improved, including being fully statically typed internally (though setuptools is not fully typed, so it is of limited use). * All deprecated setuptools/distutils features are also deprecated in scikit-build, like the test command, easy_install, etc. Editable mode is still unsupported. Python 3.6 support is deprecated. Older versions of CMake (<3.15) are not recommended; a future version will remove support for older CMake's (along with providing a better mechanism for ensuring a proper CMake is available). If you need any of these features, please open or find an issue explaining what and why you need something. * Cython module now supports FindPython mode. #743 * PyPy is discovered without extra settings in FindPython mode #744 * FindPython mode uses a new path specification, should help make it usable. #774 * Better flushing and output streams for more consistent output ordering. #781 - Add skbuild-pr785-ignoredeprecation.patch * gh#scikit-build/scikit-build#785 - Update to 0.15.0 * Add support for FindPython (including 2 and 3). Thanks @hameerabbasi for the contribution. See #712. * Add support for Cygwin. Thanks @ax3l and @DWesl and @poikilos for the help! See #485. OBS-URL: https://build.opensuse.org/request/show/1032211 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=23 --- _multibuild | 3 ++ python-scikit-build.changes | 58 +++++++++++++++++++++ python-scikit-build.spec | 72 +++++++++++++++++---------- scikit-build-0.13.1.tar.gz | 3 -- scikit-build-0.16.0.tar.gz | 3 ++ skbuild-pr785-ignoredeprecation.patch | 21 ++++++++ 6 files changed, 131 insertions(+), 29 deletions(-) create mode 100644 _multibuild delete mode 100644 scikit-build-0.13.1.tar.gz create mode 100644 scikit-build-0.16.0.tar.gz create mode 100644 skbuild-pr785-ignoredeprecation.patch diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-scikit-build.changes b/python-scikit-build.changes index 636a6b5..e1ab72e 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Sat Oct 29 12:54:06 UTC 2022 - Ben Greiner + +- Update to 0.16.0 + * This release adds support for Python 3.11 and removes support + for Python 2.7 and 3.5 (#688). Testing and static checking + improved, including being fully statically typed internally + (though setuptools is not fully typed, so it is of limited + use). + * All deprecated setuptools/distutils features are also + deprecated in scikit-build, like the test command, + easy_install, etc. Editable mode is still unsupported. Python + 3.6 support is deprecated. Older versions of CMake (<3.15) are + not recommended; a future version will remove support for older + CMake's (along with providing a better mechanism for ensuring a + proper CMake is available). If you need any of these features, + please open or find an issue explaining what and why you need + something. + * Cython module now supports FindPython mode. #743 + * PyPy is discovered without extra settings in FindPython mode + #744 + * FindPython mode uses a new path specification, should help make + it usable. #774 + * Better flushing and output streams for more consistent output + ordering. #781 +- Add skbuild-pr785-ignoredeprecation.patch + * gh#scikit-build/scikit-build#785 + +------------------------------------------------------------------- +Wed Aug 24 09:44:45 UTC 2022 - Ben Greiner + +- Update to 0.15.0 + * Add support for FindPython (including 2 and 3). Thanks + @hameerabbasi for the contribution. See #712. + * Add support for Cygwin. Thanks @ax3l and @DWesl and @poikilos + for the help! See #485. + * Fixed issue with distutils usage in Python 3.10. Thanks to + @SuperSandro2000 for the contribution in #700. +- Release 0.14.1 + * Fix issue with SKBUILD_CONFIGURE_OPTIONS not being read. + * Reverted manifest install changes. +- Release 0.14.0 + * Add support for --install-target scikit-build command line + option. And cmake_install_target in setup.py. Allows providing + an install target different than the default install. Thanks + @phcerdan for the contribution. See #477. + * The manifest install location computation was fixed. Thanks + @kratsg for the contribution in #682. + * Byte-compilation was skipped due to a missing return. Thanks + @pekkarr in #678. + * Packages can now be computed from the same shared collections, + before this could confuse Scikit-build. Thanks @vyasr in #675. + * Fixed library detection for PyPy 3.9. Thanks @rkaminsk in #673. + * Scikit-build now uses pyproject.toml and setuptools_scm to + build. If you are packaging scikit-build itself, you might need + to update your requirements. See #634. + * The codebase is now formatted with Black. #665 + ------------------------------------------------------------------- Wed Aug 24 09:44:44 UTC 2022 - Ben Greiner diff --git a/python-scikit-build.spec b/python-scikit-build.spec index dcfefab..ac27f13 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -1,5 +1,5 @@ # -# spec file for package python-scikit-build +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -16,84 +16,104 @@ # -%{?!python_module:%define python_module() python3-%{**}} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%bcond_without test +%define psuffix -test +%else +%bcond_with test +%define psuffix %{nil} +%endif + %define skip_python2 1 -Name: python-scikit-build -Version: 0.13.1 +Name: python-scikit-build%{psuffix} +Version: 0.16.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 -BuildRequires: %{python_module devel} -BuildRequires: %{python_module setuptools >= 28.0.0} +# PATCH-FIX-UPSTREAM skbuild-pr785-ignoredeprecation.patch gh#scikit-build/scikit-build#785 +Patch0: skbuild-pr785-ignoredeprecation.patch +BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools >= 42.0.0} +BuildRequires: %{python_module wheel} +%if !%{with test} +# https://github.com/scikit-build/scikit-build/issues/689 +BuildRequires: %{python_module setuptools_scm} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: cmake Requires: python-distro Requires: python-packaging -Requires: python-setuptools >= 28.0.0 -Requires: python-wheel >= 0.29.0 -# SECTION test requirements +Requires: python-setuptools >= 42.0.0 +Requires: python-wheel >= 0.32.0 +%if %python_version_nodots < 38 +Requires: python-typing-extensions >= 3.7 +%endif +%if %{with test} BuildRequires: %{python_module Cython >= 0.25.1} -BuildRequires: %{python_module build} -BuildRequires: %{python_module distro} +BuildRequires: %{python_module build >= 0.7} BuildRequires: %{python_module flake8 >= 3.0.4} BuildRequires: %{python_module path.py >= 11.5.0} -BuildRequires: %{python_module pytest >= 4.5.0} +BuildRequires: %{python_module pytest >= 6.0.0 with %python-pytest < 7.2} BuildRequires: %{python_module pytest-mock >= 1.10.4} BuildRequires: %{python_module pytest-virtualenv >= 1.2.5} BuildRequires: %{python_module requests} -BuildRequires: %{python_module six >= 1.10.0} +BuildRequires: %{python_module scikit-build = %{version}} BuildRequires: %{python_module virtualenv} -BuildRequires: %{python_module wheel >= 0.29.0} -BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: git-core BuildRequires: ninja -# /SECTION +%endif +BuildArch: noarch %python_subpackages %description Improved build system generator for Python C/C++/Fortran/Cython extensions %prep -%setup -q -n scikit-build-%{version} +%autosetup -p1 -n scikit-build-%{version} +%if %{with test} # some tests call setup.py develop|install|test, which by default write to /usr # This is not allowed in OBS # gh#scikit-build/scikit-build#469 %python_expand mkdir -p /tmp/fakepythonroot%{$python_sitelib} cp %{S:99} tests/samples/hello-cpp/setup.cfg -sed -i "/hello-1.2.3\/setup.py/ a \ 'hello-1.2.3/setup.cfg'," tests/test_hello_cpp.py cp %{S:99} tests/samples/cython-flags/setup.cfg cp %{S:99} tests/samples/issue-274-support-default-package-dir/setup.cfg cp %{S:99} tests/samples/issue-274-support-one-package-without-package-dir/setup.cfg cp %{S:99} tests/samples/issue-334-configure-cmakelist-non-cp1252-encoding/setup.cfg -sed -i 's/from mock import/from unittest.mock import/' tests/*.py -# remove coverage flags -sed -i '/addopts/ d' setup.cfg +%endif +%if !%{with test} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%if %{with test} %check -export PYTHONPATH=/tmp/fakepythonroot%{$python_sitelib} # test_pep518 needs a wheelhouse with downloaded wheels including platform dependent cmake donttest="test_pep518" -# setuptools 62+ discovery fails here -donttest="$donttest or (test_script_keyword and pure)" +# https://github.com/scikit-build/scikit-build/issues/784 +donttest="$donttest or (test_hide_listing and True and bdist_wheel)" %pytest -k "not ($donttest)" +%endif +%if !%{with test} %files %{python_files} %doc AUTHORS.rst README.rst CONTRIBUTING.rst HISTORY.rst docs/ %license LICENSE %{python_sitelib}/skbuild %{python_sitelib}/scikit_build-%{version}*-info +%endif %changelog diff --git a/scikit-build-0.13.1.tar.gz b/scikit-build-0.13.1.tar.gz deleted file mode 100644 index d6369ef..0000000 --- a/scikit-build-0.13.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d1774a2eb15988e081c582c254ab4a9752096e6a34f235411cb79bd61660c37 -size 154479 diff --git a/scikit-build-0.16.0.tar.gz b/scikit-build-0.16.0.tar.gz new file mode 100644 index 0000000..c56cc2f --- /dev/null +++ b/scikit-build-0.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff2e64e8900d019d04893a3f70e6dc0f87ad83f4ba196b4d625db22ecf506c7f +size 269432 diff --git a/skbuild-pr785-ignoredeprecation.patch b/skbuild-pr785-ignoredeprecation.patch new file mode 100644 index 0000000..d3d69a0 --- /dev/null +++ b/skbuild-pr785-ignoredeprecation.patch @@ -0,0 +1,21 @@ +From 15ba29983fe24beabc03031369abfd610db7ec89 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Sat, 29 Oct 2022 15:57:01 +0200 +Subject: [PATCH 1/2] Ignore distutils deprecation warning + +--- + pyproject.toml | 1 + + 1 file changed, 1 insertion(+) + +Index: scikit-build-0.16.0/pyproject.toml +=================================================================== +--- scikit-build-0.16.0.orig/pyproject.toml ++++ scikit-build-0.16.0/pyproject.toml +@@ -86,6 +86,7 @@ filterwarnings = [ + "ignore:Config variable 'Py_DEBUG' is unset:RuntimeWarning", + "ignore:Config variable 'WITH_PYMALLOC' is unset, Python ABI tag may be incorrect:RuntimeWarning", + 'ignore:\s*Installing .* as data is deprecated:Warning', ++ "ignore:shell/Perl-style subs.* are deprecated:DeprecationWarning", + ] + log_cli_level = "info" + markers = [ From 149d6d54e035f288492f1cff618c1b03e07565f7ef357b61c67f0f06c3416483 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 29 Oct 2022 15:45:46 +0000 Subject: [PATCH 2/2] Accepting request 1032214 from home:bnavigator:branches:devel:languages:python:numeric - Update to 0.16.1 * Patch release that fixes a missing Python requires setting and some missing files #790, and addresses a warning from setuptools in the tests. - Drop skbuild-pr785-ignoredeprecation.patch fixed upstream OBS-URL: https://build.opensuse.org/request/show/1032214 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=24 --- python-scikit-build.changes | 9 +++++++++ python-scikit-build.spec | 4 +--- scikit-build-0.16.0.tar.gz | 3 --- scikit-build-0.16.1.tar.gz | 3 +++ skbuild-pr785-ignoredeprecation.patch | 21 --------------------- 5 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 scikit-build-0.16.0.tar.gz create mode 100644 scikit-build-0.16.1.tar.gz delete mode 100644 skbuild-pr785-ignoredeprecation.patch diff --git a/python-scikit-build.changes b/python-scikit-build.changes index e1ab72e..cdb9082 100644 --- a/python-scikit-build.changes +++ b/python-scikit-build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Oct 29 15:32:48 UTC 2022 - Ben Greiner + +- Update to 0.16.1 + * Patch release that fixes a missing Python requires setting and + some missing files #790, and addresses a warning from + setuptools in the tests. +- Drop skbuild-pr785-ignoredeprecation.patch fixed upstream + ------------------------------------------------------------------- Sat Oct 29 12:54:06 UTC 2022 - Ben Greiner diff --git a/python-scikit-build.spec b/python-scikit-build.spec index ac27f13..a2677b5 100644 --- a/python-scikit-build.spec +++ b/python-scikit-build.spec @@ -27,15 +27,13 @@ %define skip_python2 1 Name: python-scikit-build%{psuffix} -Version: 0.16.0 +Version: 0.16.1 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 skbuild-pr785-ignoredeprecation.patch gh#scikit-build/scikit-build#785 -Patch0: skbuild-pr785-ignoredeprecation.patch BuildRequires: %{python_module devel >= 3.6} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 42.0.0} diff --git a/scikit-build-0.16.0.tar.gz b/scikit-build-0.16.0.tar.gz deleted file mode 100644 index c56cc2f..0000000 --- a/scikit-build-0.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff2e64e8900d019d04893a3f70e6dc0f87ad83f4ba196b4d625db22ecf506c7f -size 269432 diff --git a/scikit-build-0.16.1.tar.gz b/scikit-build-0.16.1.tar.gz new file mode 100644 index 0000000..aa6a139 --- /dev/null +++ b/scikit-build-0.16.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b87dcac5cfd884ccfe313e66a1feea596075a99d370d20488314ae5d19296db +size 269763 diff --git a/skbuild-pr785-ignoredeprecation.patch b/skbuild-pr785-ignoredeprecation.patch deleted file mode 100644 index d3d69a0..0000000 --- a/skbuild-pr785-ignoredeprecation.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 15ba29983fe24beabc03031369abfd610db7ec89 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sat, 29 Oct 2022 15:57:01 +0200 -Subject: [PATCH 1/2] Ignore distutils deprecation warning - ---- - pyproject.toml | 1 + - 1 file changed, 1 insertion(+) - -Index: scikit-build-0.16.0/pyproject.toml -=================================================================== ---- scikit-build-0.16.0.orig/pyproject.toml -+++ scikit-build-0.16.0/pyproject.toml -@@ -86,6 +86,7 @@ filterwarnings = [ - "ignore:Config variable 'Py_DEBUG' is unset:RuntimeWarning", - "ignore:Config variable 'WITH_PYMALLOC' is unset, Python ABI tag may be incorrect:RuntimeWarning", - 'ignore:\s*Installing .* as data is deprecated:Warning', -+ "ignore:shell/Perl-style subs.* are deprecated:DeprecationWarning", - ] - log_cli_level = "info" - markers = [