Accepting request 1009750 from home:bnavigator:branches:devel:languages:python:numeric

- Update to 0.10.0
  * Ignore the macOS minor version on >=11, to match the behavior
    with pypa/packaging
  * More fixes on ABI tag detection
  * Fix incorrect tag on 32-bit Python running on a x86_64 host
  * Fix sdist permissions
  * Fix incorrect PyPy tags
  * Fix ``install_subdirs`` not being included in wheels
  * Take ``MACOSX_DEPLOYMENT_TARGET`` into account for the platform
    tag
  * Don't set the rpath on binaries if unneeded
- Drop patches
  * mesonpy-force-flavor.patch
  * mesonpy-no-rpath.patch

OBS-URL: https://build.opensuse.org/request/show/1009750
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-meson-python?expand=0&rev=3
This commit is contained in:
Dirk Mueller 2022-10-11 12:40:52 +00:00 committed by Git OBS Bridge
parent 54f1941077
commit d6fae54113
6 changed files with 30 additions and 55 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08dd122c1074dbd5c55b53993a719cca73dd8216372c91217f7a550260f9e7e1
size 37944

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:442f1fa4cf5db50eea61170a6059c10fafd70977f5dbdf3441c106cd23b05e4c
size 30133

View File

@ -1,26 +0,0 @@
From 0a5308014f7226e4e303e2779a8177acea70c49c Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Sun, 11 Sep 2022 22:11:10 -0400
Subject: [PATCH] BUG: fix native file override
This attempted to override "python3", which Meson never used for
find_installation. So the native file did nothing.
Override the correct name.
---
mesonpy/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: meson_python-0.8.1/mesonpy/__init__.py
===================================================================
--- meson_python-0.8.1.orig/mesonpy/__init__.py
+++ meson_python-0.8.1/mesonpy/__init__.py
@@ -443,7 +443,7 @@ class Project():
# write the native file
native_file_data = textwrap.dedent(f'''
[binaries]
- python3 = '{sys.executable}'
+ python = '{sys.executable}'
''')
native_file_mismatch = (
not self._meson_native_file.exists()

View File

@ -1,15 +0,0 @@
Index: meson_python-0.8.1/mesonpy/__init__.py
===================================================================
--- meson_python-0.8.1.orig/mesonpy/__init__.py
+++ meson_python-0.8.1/mesonpy/__init__.py
@@ -327,7 +327,9 @@ class _WheelBuilder():
counter.update(location)
# fix file
- if platform.system() == 'Linux':
+ # disable rpath addition for rpmbuilds -- https://github.com/FFY00/meson-python/issues/125
+ if (platform.system() == 'Linux' and (os.environ.get("RPM_BUILD_ROOT", None) is None or
+ os.environ.get("MESONPY_FORCE_LOCAL_LIB", None))):
# add .mesonpy.libs to the RPATH of ELF files
if self._is_elf(os.fspath(origin)):
# copy ELF to our working directory to avoid Meson having to regenerate the file

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Oct 11 09:01:00 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Update to 0.10.0
* Ignore the macOS minor version on >=11, to match the behavior
with pypa/packaging
* More fixes on ABI tag detection
* Fix incorrect tag on 32-bit Python running on a x86_64 host
* Fix sdist permissions
* Fix incorrect PyPy tags
* Fix ``install_subdirs`` not being included in wheels
* Take ``MACOSX_DEPLOYMENT_TARGET`` into account for the platform
tag
* Don't set the rpath on binaries if unneeded
- Drop patches
* mesonpy-force-flavor.patch
* mesonpy-no-rpath.patch
-------------------------------------------------------------------
Tue Sep 13 01:16:30 UTC 2022 - Ben Greiner <code@bnavigator.de>

View File

@ -17,29 +17,25 @@
Name: python-meson-python
Version: 0.8.1
Version: 0.10.0
Release: 0
Summary: Meson Python build backend (PEP 517)
License: MIT
URL: https://github.com/FFY00/meson-python
Source: https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-%{version}.tar.gz
# PATCH-FIX-UPSTREAM mesonpy-force-flavor.patch gh#FY00/meson-python#51, gh#FY00/meson-python#127
Patch0: mesonpy-force-flavor.patch
# PATCH-FEATURE-OPENSUSE mesonpy-trim-deps.patch code@bnavigator.de
Patch1: mesonpy-trim-deps.patch
# PATCH-FIX-OPENSUSE mesonpy-no-rpath.patch code@bnavigator.de -- https://github.com/FFY00/meson-python/issues/125#issuecomment-1243388061
Patch2: mesonpy-no-rpath.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pyproject-metadata >= 0.5}
BuildRequires: %{python_module pyproject-metadata >= 0.6.1}
BuildRequires: %{python_module tomli >= 1.0.0}
BuildRequires: %{python_module typing-extensions >= 3.7.4 if %python-base < 3.8}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: meson
BuildRequires: meson >= 0.63.0
BuildRequires: ninja
BuildRequires: python-rpm-macros
Requires: meson
Requires: meson >= 0.62.0
Requires: ninja
Requires: python-pyproject-metadata >= 0.5.0
Requires: python-tomli >= 1.0.0
@ -49,6 +45,7 @@ Requires: python-typing-extensions >= 3.7.4
%endif
# SECTION test
BuildRequires: %{python_module GitPython}
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module pytest}
@ -63,8 +60,6 @@ Python build backend (PEP 517) for Meson projects.
%autosetup -p1 -n meson_python-%{version}
%build
# until we have https://github.com/openSUSE/python-rpm-macros/pull/139, this will build
# a pure wheel three times.
%pyproject_wheel
%install
@ -73,7 +68,10 @@ Python build backend (PEP 517) for Meson projects.
%check
export MESONPY_FORCE_LOCAL_LIB=1
%pytest
# can test test_spam only once gh#FFY00/meson-python#169
%python_expand $python_ignore="--ignore tests/docs/examples/test_spam.py"
unset python310_ignore
%pytest ${$python_ignore}
%files %{python_files}
%license LICENSE