Accepting request 810663 from home:bnavigator:branches:devel:languages:python:numeric
- Update to version 0.11.1 - Changelog for version 0.11.0 - Remove obsolete patches * scikit-build-pr450-findf2py.patch gh#scikit-build/scikit-build#450 * python38.patch gh#scikit-build/scikit-build#458 - Skip Python 2 because of unresolvable python2-path.py in Leap - Remove code coverage dependencies - make the previously skipped tests pass by installing the test projects into a temporary directory gh#scikit-build/scikit-build#469 OBS-URL: https://build.opensuse.org/request/show/810663 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-scikit-build?expand=0&rev=7
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
78bda829d9
commit
a5b67af78a
|
|
@ -1,3 +1,57 @@
|
|||
-------------------------------------------------------------------
|
||||
Mon Jun 1 17:33:56 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to version 0.11.1
|
||||
* Support using scikit-build with conan where distro<1.2.0 is required.
|
||||
Thanks @AntoinePrv and @Chrismarsh for reporting issue gh#scikit-build/scikit-build#472
|
||||
and gh#scikit-build/scikit-build#488.
|
||||
* Fix link in `Conda: Step-by-step` release guide available in `/make_a_release` section.
|
||||
- Changelog for version 0.11.0
|
||||
* Add a hook to process the cmake install manifest building the wheel. The hook
|
||||
function can be specified as an argument to the `setup()` function. This can be used e.g.
|
||||
to prevent installing cmake configuration files, headers, or static libraries with the wheel.
|
||||
Thanks @SylvainCorlay for the contribution. See gh#scikit-build/scikit-build#473.
|
||||
* Add support for passing :ref:`CMake configure options <usage_cmake_configure_options>` like `-DFOO:STRING:bar`
|
||||
as global `setuptools` or `pip` options.
|
||||
* Add support for building project using PyPy or PyPy3. See https://pypy.org
|
||||
See gh#scikit-build/scikit-build#407.
|
||||
* Add support for OS/400 (now known as IBM i).
|
||||
Thanks @jwoehr for the contribution. See gh#scikit-build/scikit-build#444.
|
||||
* Display CMake command used to configure the project.
|
||||
Thanks @native-api for the contribution. See gh#scikit-build/scikit-build#443.
|
||||
* Improve CMake module `/cmake-modules/F2PY` adding `add_f2py_target()` CMake function
|
||||
allowing to generate `*-f2pywrappers.f` and `*module.c` files from `*.pyf` files.
|
||||
Thanks @xoviat for the contribution.
|
||||
* Update CMake module `/cmake-modules/PythonExtensions` adding `add_python_library()`
|
||||
and `add_python_extension()`.
|
||||
Thanks @xoviat for the contribution.
|
||||
* Fix python 2.7 installation ensuring setuptools < 45 is required. See gh#scikit-build/scikit-build#478.
|
||||
* Fix unclosed file resource in :meth:`skbuild.cmaker.CMaker.check_for_bad_installs`.
|
||||
Thanks @Nic30 for the suggestion. See gh#scikit-build/scikit-build#429.
|
||||
* Update CMake module `/cmake-modules/PythonExtensions`:
|
||||
* Ensure correct suffix is used for compiled python module on windows. See gh#scikit-build/scikit-build#383.
|
||||
* Fix warning using `EXT_SUFFIX` config variable instead of deprecated `SO` variable. See gh#scikit-build/scikit-build#381.
|
||||
* Honor the `MACOSX_DEPLOYMENT_TARGET` environment variable if it is defined on
|
||||
macOS. Thanks @certik for the contribution. See gh#scikit-build/scikit-build#441.
|
||||
* Fix CMake module `/cmake-modules/F2PY` to ensure the `f2py` executable specific to
|
||||
the python version being used is found. See gh#scikit-build/scikit-build#449. Thanks @bnavigator for
|
||||
the contribution.
|
||||
* Replace `platform.linux_distribution()` which was removed in Python 3.8 by a call to
|
||||
`distro.id()`. This adds the `distro` package as dependency. See gh#scikit-build/scikit-build#458. Thanks
|
||||
@bnavigator for the contribution.
|
||||
* Add `/notes` section to the `For maintainers` top-level category that includes a comparison between
|
||||
`sysconfig` and `distutils.sysconfig` modules.
|
||||
* Remove obsolete comment in `cmaker.py`. See gh#scikit-build/scikit-build#439. Thanks @isuruf
|
||||
* Update `initialize_git_repo_and_commit` to prevent signing message on system with commit signing
|
||||
enabled globally.
|
||||
- Remove obsolete patches
|
||||
* scikit-build-pr450-findf2py.patch gh#scikit-build/scikit-build#450
|
||||
* python38.patch gh#scikit-build/scikit-build#458
|
||||
- Skip Python 2 because of unresolvable python2-path.py in Leap
|
||||
- Remove code coverage dependencies
|
||||
- make the previously skipped tests pass by installing the test projects
|
||||
into a temporary directory gh#scikit-build/scikit-build#469
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 7 12:04:36 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
%define skip_python2 1
|
||||
Name: python-scikit-build
|
||||
Version: 0.10.0
|
||||
Version: 0.11.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
|
||||
Patch0: python38.patch
|
||||
Patch1: scikit-build-pr450-findf2py.patch
|
||||
Source99: sample-setup.cfg
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module setuptools >= 28.0.0}
|
||||
BuildRequires: fdupes
|
||||
|
|
@ -36,16 +36,11 @@ Requires: python-setuptools >= 28.0.0
|
|||
Requires: python-wheel >= 0.29.0
|
||||
# SECTION test requirements
|
||||
BuildRequires: %{python_module Cython >= 0.25.1}
|
||||
BuildRequires: %{python_module codecov >= 2.0.5}
|
||||
BuildRequires: %{python_module coverage >= 4.2}
|
||||
BuildRequires: %{python_module distro}
|
||||
BuildRequires: %{python_module flake8 >= 3.0.4}
|
||||
BuildRequires: %{python_module packaging}
|
||||
BuildRequires: %{python_module path.py >= 11.5.0}
|
||||
BuildRequires: %{python_module pytest >= 3.0.3}
|
||||
BuildRequires: %{python_module pytest-cov >= 2.4.0}
|
||||
BuildRequires: %{python_module pytest-mock >= 1.4.0}
|
||||
BuildRequires: %{python_module pytest-runner >= 2.9}
|
||||
BuildRequires: %{python_module pytest >= 4.5.0}
|
||||
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}
|
||||
|
|
@ -64,8 +59,15 @@ Improved build system generator for Python C/C++/Fortran/Cython extensions
|
|||
|
||||
%prep
|
||||
%setup -q -n scikit-build-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
# 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/issues/469
|
||||
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/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
|
||||
|
||||
%build
|
||||
%python_build
|
||||
|
|
@ -75,9 +77,10 @@ Improved build system generator for Python C/C++/Fortran/Cython extensions
|
|||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
%check
|
||||
# setup.py install, develop, etc default to writing to /usr .
|
||||
# Tests need enhancing upstream or patching.
|
||||
%pytest -k 'not (test_install_command or test_develop_command or test_test_command or test_hello_develop)'
|
||||
%{python_expand export PYTHONDONTWRITEBYTECODE=1
|
||||
export PYTHONPATH=/tmp/fakepythonroot%{$python_sitelib}:%{buildroot}%{$python_sitelib}
|
||||
py.test-%{$python_bin_suffix}
|
||||
}
|
||||
|
||||
%files %{python_files}
|
||||
%doc AUTHORS.rst README.rst CONTRIBUTING.rst HISTORY.rst docs/
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
From faa7284e5bc4c72bc8744987acdf3297b5d2e7e4 Mon Sep 17 00:00:00 2001
|
||||
From: Ben <code@bnavigator.de>
|
||||
Date: Mon, 25 Nov 2019 02:03:58 +0100
|
||||
Subject: [PATCH] platform.linux_distribution() was removed in Python 3.8. Move
|
||||
to distro package (#458)
|
||||
|
||||
---
|
||||
requirements.txt | 3 ++-
|
||||
skbuild/platform_specifics/linux.py | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index 7111c997..66c7b92f 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
wheel>=0.29.0
|
||||
setuptools>=28.0.0
|
||||
-packaging
|
||||
\ No newline at end of file
|
||||
+packaging
|
||||
+distro
|
||||
diff --git a/skbuild/platform_specifics/linux.py b/skbuild/platform_specifics/linux.py
|
||||
index c13666a7..431017f8 100644
|
||||
--- a/skbuild/platform_specifics/linux.py
|
||||
+++ b/skbuild/platform_specifics/linux.py
|
||||
@@ -1,5 +1,6 @@
|
||||
"""This module defines object specific to Linux platform."""
|
||||
|
||||
+import distro
|
||||
import platform
|
||||
import sys
|
||||
import textwrap
|
||||
@@ -24,7 +25,7 @@ def build_essential_install_cmd():
|
||||
"""
|
||||
# gentoo, slackware: Compiler is available by default.
|
||||
|
||||
- distribution_name = platform.linux_distribution()[0]
|
||||
+ distribution_name = distro.id()
|
||||
cmd = ""
|
||||
if distribution_name in [
|
||||
'debian', 'Ubuntu', 'mandrake', 'mandriva']:
|
||||
5
sample-setup.cfg
Normal file
5
sample-setup.cfg
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
[develop]
|
||||
prefix=/tmp/fakepythonroot/usr/
|
||||
|
||||
[install]
|
||||
prefix=/tmp/fakepythonroot/usr/
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526
|
||||
size 132443
|
||||
3
scikit-build-0.11.1.tar.gz
Normal file
3
scikit-build-0.11.1.tar.gz
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da40dfd69b2456fad1349a894b90180b43712152b8a85d2a00f4ae2ce8ac9a5c
|
||||
size 132025
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 3ab8fb174a13df1f7fe4c341518a51e7ed09b46a Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
|
||||
Date: Tue, 24 Sep 2019 14:54:40 -0400
|
||||
Subject: [PATCH] FindF2PY: Ensure python version specific of f2py executable
|
||||
is looked up first
|
||||
|
||||
See #449
|
||||
|
||||
Co-authored-by: Ben <code@bnavigator.de>
|
||||
---
|
||||
(CHANGES.rst | 6 +++++-) removed from package
|
||||
skbuild/resources/cmake/FindF2PY.cmake | 2 +-
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/skbuild/resources/cmake/FindF2PY.cmake b/skbuild/resources/cmake/FindF2PY.cmake
|
||||
index 0ab0fdbe..22d669c2 100644
|
||||
--- a/skbuild/resources/cmake/FindF2PY.cmake
|
||||
+++ b/skbuild/resources/cmake/FindF2PY.cmake
|
||||
@@ -66,7 +66,7 @@
|
||||
# case, CMake is not used to find the compiler and configure the associated build system.
|
||||
#
|
||||
|
||||
-find_program(F2PY_EXECUTABLE NAMES f2py f2py${PYTHON_VERSION_MAJOR})
|
||||
+find_program(F2PY_EXECUTABLE NAMES f2py${PYTHON_VERSION_MAJOR} f2py)
|
||||
|
||||
if(F2PY_EXECUTABLE)
|
||||
# extract the version string
|
||||
Loading…
Reference in New Issue
Block a user