Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-scikit-build for
openSUSE:Factory checked in at 2023-05-12 20:37:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-scikit-build (Old)
and /work/SRC/openSUSE:Factory/.python-scikit-build.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-scikit-build"
Fri May 12 20:37:25 2023 rev:18 rq:1086569 version:0.17.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-scikit-build/python-scikit-build.changes
2023-05-08 17:24:49.488887079 +0200
+++
/work/SRC/openSUSE:Factory/.python-scikit-build.new.1533/python-scikit-build.changes
2023-05-12 20:40:11.414824597 +0200
@@ -1,0 +2,22 @@
+Thu May 11 14:26:58 UTC 2023 - Ben Greiner <[email protected]>
+
+- Update to 0.17.4
+ * Make sure include dir is found even if the lib is not present
+ in #974.
+- Release 0.17.3
+ * A small release related to PYTHON_LIBRARY handling changes in
+ 0.17.2; scikit-build 0.17.3 returns an empty string from
+ get_python_library if no Python library is present (like on
+ manylinux), where 0.17.2 returned None, and previous versions
+ returned a non-existent path. Note that adding REQUIRED to
+ find_package(PythonLibs will fail, but it is incorrect (you
+ must not link to libPython.so) and was really just injecting a
+ non-existent path before.
+ ## Bug fixes
+ * Keep get_python_library return type string if python lib
+ non-existing for now in #959.
+ * Avoid 'not found' warning if libs are not found by
+ FindPythonExtensions in #960.
+ * FindNumPy should not call FindPythonLibs in #958.
+
+-------------------------------------------------------------------
Old:
----
scikit_build-0.17.2.tar.gz
New:
----
scikit_build-0.17.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-scikit-build.spec ++++++
--- /var/tmp/diff_new_pack.nvDSjj/_old 2023-05-12 20:40:11.890827213 +0200
+++ /var/tmp/diff_new_pack.nvDSjj/_new 2023-05-12 20:40:11.910827322 +0200
@@ -27,7 +27,7 @@
%{?sle15_python_module_pythons}
Name: python-scikit-build%{psuffix}
-Version: 0.17.2
+Version: 0.17.4
Release: 0
Summary: Improved build system generator for Python
C/C++/Fortran/Cython extensions
License: MIT
++++++ scikit_build-0.17.2.tar.gz -> scikit_build-0.17.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/.github/workflows/cd.yml
new/scikit_build-0.17.4/.github/workflows/cd.yml
--- old/scikit_build-0.17.2/.github/workflows/cd.yml 2020-02-02
01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/.github/workflows/cd.yml 2020-02-02
01:00:00.000000000 +0100
@@ -27,6 +27,9 @@
publish:
needs: [dist]
+ environment: pypi
+ permissions:
+ id-token: write
runs-on: ubuntu-latest
if: github.event_name == 'release' && github.event.action == 'published'
@@ -36,6 +39,4 @@
name: artifact
path: dist
- - uses: pypa/[email protected]
- with:
- password: ${{ secrets.pypi_password }}
+ - uses: pypa/gh-action-pypi-publish@release/v1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/.github/workflows/ci.yml
new/scikit_build-0.17.4/.github/workflows/ci.yml
--- old/scikit_build-0.17.2/.github/workflows/ci.yml 2020-02-02
01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/.github/workflows/ci.yml 2020-02-02
01:00:00.000000000 +0100
@@ -59,7 +59,7 @@
run: echo "FC=gfortran-11" >> $GITHUB_ENV
- name: Setup nox
- uses: wntrblm/[email protected]
+ uses: wntrblm/[email protected]
with:
python-versions: "3.7,3.8,3.9,3.10,3.11,3.12-dev"
@@ -136,7 +136,7 @@
fetch-depth: 0
- name: Setup nox
- uses: wntrblm/[email protected]
+ uses: wntrblm/[email protected]
- uses: actions/setup-python@v4
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/.pre-commit-config.yaml
new/scikit_build-0.17.4/.pre-commit-config.yaml
--- old/scikit_build-0.17.2/.pre-commit-config.yaml 2020-02-02
01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/.pre-commit-config.yaml 2020-02-02
01:00:00.000000000 +0100
@@ -35,7 +35,7 @@
- black==23.1.0 # keep in sync with black hook
- repo: https://github.com/charliermarsh/ruff-pre-commit
- rev: v0.0.261
+ rev: v0.0.265
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/CHANGES.rst
new/scikit_build-0.17.4/CHANGES.rst
--- old/scikit_build-0.17.2/CHANGES.rst 2020-02-02 01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/CHANGES.rst 2020-02-02 01:00:00.000000000 +0100
@@ -15,6 +15,36 @@
.. START-BRIEF-CHANGELOG
+Scikit-build 0.17.4
+===================
+
+A followup fix to the issue 0.17.3 tried to fix. We now have a method to
+manually test downstream packages, too.
+
+Bug fixes
+---------
+
+* Make sure include dir is found even if the lib is not present in :pr:`974`.
+
+Scikit-build 0.17.3
+===================
+
+A small release related to ``PYTHON_LIBRARY`` handling changes in 0.17.2;
+scikit-build 0.17.3 returns an empty string from ``get_python_library`` if no
+Python library is present (like on manylinux), where 0.17.2 returned None, and
+previous versions returned a non-existent path. Note that adding ``REQUIRED``
+to ``find_package(PythonLibs`` will fail, but it is incorrect (you must not
+link to ``libPython.so``) and was really just injecting a non-existent path
+before.
+
+Bug fixes
+---------
+
+* Keep ``get_python_library`` return type string if python lib non-existing
+ for now in :pr:`959`.
+* Avoid 'not found' warning if libs are not found by FindPythonExtensions in
:pr:`960`.
+* FindNumPy should not call FindPythonLibs in :pr:`958`.
+
Scikit-build 0.17.2
===================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/PKG-INFO
new/scikit_build-0.17.4/PKG-INFO
--- old/scikit_build-0.17.2/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/PKG-INFO 2020-02-02 01:00:00.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: scikit-build
-Version: 0.17.2
+Version: 0.17.4
Summary: Improved build system generator for Python C/C++/Fortran/Cython
extensions
Project-URL: Bug Tracker, https://github.com/scikit-build/scikit-build/issues
Project-URL: Changelog,
https://scikit-build.readthedocs.io/en/latest/changes.html
@@ -101,6 +101,36 @@
+Scikit-build 0.17.4
+===================
+
+A followup fix to the issue 0.17.3 tried to fix. We now have a method to
+manually test downstream packages, too.
+
+Bug fixes
+---------
+
+* Make sure include dir is found even if the lib is not present in `#974
<https://github.com/scikit-build/scikit-build/pull/974>`_.
+
+Scikit-build 0.17.3
+===================
+
+A small release related to ``PYTHON_LIBRARY`` handling changes in 0.17.2;
+scikit-build 0.17.3 returns an empty string from ``get_python_library`` if no
+Python library is present (like on manylinux), where 0.17.2 returned None, and
+previous versions returned a non-existent path. Note that adding ``REQUIRED``
+to ``find_package(PythonLibs`` will fail, but it is incorrect (you must not
+link to ``libPython.so``) and was really just injecting a non-existent path
+before.
+
+Bug fixes
+---------
+
+* Keep ``get_python_library`` return type string if python lib non-existing
+ for now in `#959 <https://github.com/scikit-build/scikit-build/pull/959>`_.
+* Avoid 'not found' warning if libs are not found by FindPythonExtensions in
`#960 <https://github.com/scikit-build/scikit-build/pull/960>`_.
+* FindNumPy should not call FindPythonLibs in `#958
<https://github.com/scikit-build/scikit-build/pull/958>`_.
+
Scikit-build 0.17.2
===================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/noxfile.py
new/scikit_build-0.17.4/noxfile.py
--- old/scikit_build-0.17.2/noxfile.py 2020-02-02 01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/noxfile.py 2020-02-02 01:00:00.000000000 +0100
@@ -2,6 +2,7 @@
import os
import sys
+from pathlib import Path
import nox
@@ -105,3 +106,44 @@
"--module-first",
"../skbuild",
)
+
+
[email protected](reuse_venv=True)
+def downstream(session: nox.Session) -> None:
+ """
+ Build a downstream project.
+ """
+
+ # If running in manylinux:
+ # docker run --rm -v $PWD:/sk -w /sk -t
quay.io/pypa/manylinux2014_x86_64:latest \
+ # pipx run --system-site-packages nox -s downstream --
https://github.com/...
+ # (requires tomli, so allowing access to system-site-packages)
+
+ if sys.version_info < (3, 11):
+ import tomli as tomllib
+ else:
+ import tomllib
+
+ assert session.posargs, "Must pass the downstream project to build"
+
+ tmp_dir = Path(session.create_tmp())
+ proj_dir = tmp_dir / "git"
+
+ session.install("build", "hatch-fancy-pypi-readme", "hatch-vcs",
"hatchling")
+ session.install(".", "--no-build-isolation")
+
+ if proj_dir.is_dir():
+ session.chdir(proj_dir)
+ session.run("git", "pull", external=True)
+ else:
+ session.run("git", "clone", *session.posargs, proj_dir,
"--recurse-submodules", external=True)
+ session.chdir(proj_dir)
+
+ # Read and strip requirements
+ pyproject_toml = Path("pyproject.toml")
+ with pyproject_toml.open("rb") as f:
+ pyproject = tomllib.load(f)
+ requires = (x for x in pyproject["build-system"]["requires"] if
"scikit-build" not in x.replace("_", "-"))
+ session.install(*requires)
+
+ session.run("python", "-m", "build", "--no-isolation",
"--skip-dependency-check", "--wheel", ".")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/skbuild/_version.py
new/scikit_build-0.17.4/skbuild/_version.py
--- old/scikit_build-0.17.2/skbuild/_version.py 2020-02-02 01:00:00.000000000
+0100
+++ new/scikit_build-0.17.4/skbuild/_version.py 2020-02-02 01:00:00.000000000
+0100
@@ -1,4 +1,4 @@
# file generated by setuptools_scm
# don't change, don't track in version control
-__version__ = version = '0.17.2'
-__version_tuple__ = version_tuple = (0, 17, 2)
+__version__ = version = '0.17.4'
+__version_tuple__ = version_tuple = (0, 17, 4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scikit_build-0.17.2/skbuild/cmaker.py
new/scikit_build-0.17.4/skbuild/cmaker.py
--- old/scikit_build-0.17.2/skbuild/cmaker.py 2020-02-02 01:00:00.000000000
+0100
+++ new/scikit_build-0.17.4/skbuild/cmaker.py 2020-02-02 01:00:00.000000000
+0100
@@ -600,7 +600,12 @@
python_library = candidate
break
- return python_library if python_library and
os.path.exists(python_library) else None
+ # Temporary workaround for some libraries (opencv) processing the
+ # string output. Will return None instead of empty string in future
+ # versions if the library does not exist.
+ if python_library is None:
+ return None
+ return python_library if python_library and
os.path.exists(python_library) else ""
@staticmethod
def check_for_bad_installs() -> None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scikit_build-0.17.2/skbuild/resources/cmake/FindNumPy.cmake
new/scikit_build-0.17.4/skbuild/resources/cmake/FindNumPy.cmake
--- old/scikit_build-0.17.2/skbuild/resources/cmake/FindNumPy.cmake
2020-02-02 01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/skbuild/resources/cmake/FindNumPy.cmake
2020-02-02 01:00:00.000000000 +0100
@@ -40,8 +40,6 @@
if(NumPy_FIND_QUIET)
list(APPEND _find_extra_args QUIET)
endif()
- find_package(PythonInterp ${_find_extra_args})
- find_package(PythonLibs ${_find_extra_args})
find_program(NumPy_CONV_TEMPLATE_EXECUTABLE NAMES conv-template)
find_program(NumPy_FROM_TEMPLATE_EXECUTABLE NAMES from-template)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scikit_build-0.17.2/skbuild/resources/cmake/FindPythonExtensions.cmake
new/scikit_build-0.17.4/skbuild/resources/cmake/FindPythonExtensions.cmake
--- old/scikit_build-0.17.2/skbuild/resources/cmake/FindPythonExtensions.cmake
2020-02-02 01:00:00.000000000 +0100
+++ new/scikit_build-0.17.4/skbuild/resources/cmake/FindPythonExtensions.cmake
2020-02-02 01:00:00.000000000 +0100
@@ -168,8 +168,6 @@
#
# .. code-block:: cmake
#
-# find_package(PythonInterp)
-# find_package(PythonLibs)
# find_package(PythonExtensions)
# find_package(Cython)
# find_package(Boost COMPONENTS python)
@@ -245,7 +243,14 @@
#=============================================================================
find_package(PythonInterp REQUIRED)
-find_package(PythonLibs)
+if(SKBUILD AND NOT PYTHON_LIBRARY)
+ set(PYTHON_LIBRARY "no-library-required")
+ find_package(PythonLibs)
+ unset(PYTHON_LIBRARY)
+ unset(PYTHON_LIBRARIES)
+else()
+ find_package(PythonLibs)
+endif()
include(targetLinkLibrariesWithDynamicLookup)
set(_command "
