From cdb0cecf12cfc9c8cec92b7b74c29d88922905f45a129a29f09203687296a9a4 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 16 Jan 2023 20:46:34 +0000 Subject: [PATCH] Accepting request 1058265 from home:bnavigator:branches:devel:languages:python:numeric - Update to 0.12.0 * Raise SystemExit on expected errors * Revise error messages for consistency * Support setuptools-style macOS cross compilation via ARCHFLAGS * Allow to overwrite macOS platform tag via _PYTHON_HOST_PLATFORM * Include (similar) allowed keys in error messages - Refresh test wheels OBS-URL: https://build.opensuse.org/request/show/1058265 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-meson-python?expand=0&rev=10 --- meson_python-0.11.0.tar.gz | 3 --- meson_python-0.12.0.tar.gz | 3 +++ mesonpy-no-wheel-rebuild.patch | 12 ++++++------ mesonpy-trim-deps.patch | 14 +++++++------- packaging-21.3-py3-none-any.whl | 3 --- packaging-23.0-py3-none-any.whl | 3 +++ pyparsing-3.0.9-py3-none-any.whl | 3 --- python-meson-python.changes | 11 +++++++++++ python-meson-python.spec | 23 +++++++++-------------- typing_extensions-4.4.0-py3-none-any.whl | 3 +++ 10 files changed, 42 insertions(+), 36 deletions(-) delete mode 100644 meson_python-0.11.0.tar.gz create mode 100644 meson_python-0.12.0.tar.gz delete mode 100644 packaging-21.3-py3-none-any.whl create mode 100644 packaging-23.0-py3-none-any.whl delete mode 100644 pyparsing-3.0.9-py3-none-any.whl create mode 100644 typing_extensions-4.4.0-py3-none-any.whl diff --git a/meson_python-0.11.0.tar.gz b/meson_python-0.11.0.tar.gz deleted file mode 100644 index a7bfac8..0000000 --- a/meson_python-0.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09 -size 43124 diff --git a/meson_python-0.12.0.tar.gz b/meson_python-0.12.0.tar.gz new file mode 100644 index 0000000..055aa72 --- /dev/null +++ b/meson_python-0.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d +size 44003 diff --git a/mesonpy-no-wheel-rebuild.patch b/mesonpy-no-wheel-rebuild.patch index c98e691..3823bbe 100644 --- a/mesonpy-no-wheel-rebuild.patch +++ b/mesonpy-no-wheel-rebuild.patch @@ -1,14 +1,14 @@ We already have the meson_python wheel, can't built it in isolated mode inside OBS -Index: meson_python-0.11.0/tests/conftest.py +Index: meson_python-0.12.0/tests/conftest.py =================================================================== ---- meson_python-0.11.0.orig/tests/conftest.py -+++ meson_python-0.11.0/tests/conftest.py -@@ -133,17 +133,7 @@ def disable_pip_version_check(): +--- meson_python-0.12.0.orig/tests/conftest.py ++++ meson_python-0.12.0/tests/conftest.py +@@ -142,17 +142,7 @@ def disable_pip_version_check(): @pytest.fixture(scope='session') - def pep518_wheelhouse(tmpdir_factory): -- wheelhouse = tmpdir_factory.mktemp('wheelhouse') + def pep518_wheelhouse(tmp_path_factory): +- wheelhouse = tmp_path_factory.mktemp('wheelhouse') - meson_python = str(package_dir.parent.parent) - # Populate wheelhouse with wheel for the following packages and - # their dependencies. Wheels are downloaded from PyPI or built diff --git a/mesonpy-trim-deps.patch b/mesonpy-trim-deps.patch index e52818a..400c30a 100644 --- a/mesonpy-trim-deps.patch +++ b/mesonpy-trim-deps.patch @@ -1,23 +1,23 @@ The backend does not require a mesonbuild module for every flavor. the `meson` command from the regular RPM package is sufficient. -Index: meson_python-0.11.0/pyproject.toml +Index: meson_python-0.12.0/pyproject.toml =================================================================== ---- meson_python-0.11.0.orig/pyproject.toml -+++ meson_python-0.11.0/pyproject.toml +--- meson_python-0.12.0.orig/pyproject.toml ++++ meson_python-0.12.0/pyproject.toml @@ -2,7 +2,6 @@ build-backend = 'mesonpy' backend-path = ['.'] requires = [ - 'meson>=0.63.3', - 'pyproject-metadata>=0.5.0', + 'pyproject-metadata>=0.6.1', 'tomli>=1.0.0; python_version<"3.11"', - 'typing-extensions>=3.7.4; python_version<"3.8"', + 'typing-extensions>=3.7.4; python_version<"3.10"', @@ -25,7 +24,6 @@ classifiers = [ dependencies = [ 'colorama; os_name == "nt"', - 'meson>=0.63.3', - 'pyproject-metadata>=0.5.0', # not a hard dependency, only needed for projects that use PEP 621 metadata + 'pyproject-metadata>=0.6.1', # not a hard dependency, only needed for projects that use PEP 621 metadata 'tomli>=1.0.0; python_version<"3.11"', - 'typing-extensions>=3.7.4; python_version<"3.8"', + 'typing-extensions>=3.7.4; python_version<"3.10"', diff --git a/packaging-21.3-py3-none-any.whl b/packaging-21.3-py3-none-any.whl deleted file mode 100644 index 23287d0..0000000 --- a/packaging-21.3-py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 -size 40750 diff --git a/packaging-23.0-py3-none-any.whl b/packaging-23.0-py3-none-any.whl new file mode 100644 index 0000000..2a7adf6 --- /dev/null +++ b/packaging-23.0-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2 +size 42678 diff --git a/pyparsing-3.0.9-py3-none-any.whl b/pyparsing-3.0.9-py3-none-any.whl deleted file mode 100644 index 9fd7856..0000000 --- a/pyparsing-3.0.9-py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc -size 98338 diff --git a/python-meson-python.changes b/python-meson-python.changes index bd052b6..f609daf 100644 --- a/python-meson-python.changes +++ b/python-meson-python.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jan 13 14:35:33 UTC 2023 - Ben Greiner + +- Update to 0.12.0 + * Raise SystemExit on expected errors + * Revise error messages for consistency + * Support setuptools-style macOS cross compilation via ARCHFLAGS + * Allow to overwrite macOS platform tag via _PYTHON_HOST_PLATFORM + * Include (similar) allowed keys in error messages +- Refresh test wheels + ------------------------------------------------------------------ Thu Nov 24 11:31:07 UTC 2022 - Ben Greiner diff --git a/python-meson-python.spec b/python-meson-python.spec index 0a46e9a..a285173 100644 --- a/python-meson-python.spec +++ b/python-meson-python.spec @@ -1,7 +1,7 @@ # # spec file for package python-meson-python # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-meson-python -Version: 0.11.0 +Version: 0.12.0 Release: 0 Summary: Meson Python build backend (PEP 517) License: MIT @@ -26,27 +26,27 @@ Source0: https://files.pythonhosted.org/packages/source/m/meson_python/me # for the test suite Source1: https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.1-py3-none-any.whl Source2: https://files.pythonhosted.org/packages/py3/p/pyproject_metadata/pyproject_metadata-0.6.1-py3-none-any.whl -Source3: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-none-any.whl -Source4: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.9-py3-none-any.whl +Source3: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-23.0-py3-none-any.whl +Source4: https://files.pythonhosted.org/packages/py3/t/typing_extensions/typing_extensions-4.4.0-py3-none-any.whl # PATCH-FEATURE-OPENSUSE mesonpy-trim-deps.patch code@bnavigator.de Patch11: mesonpy-trim-deps.patch # PATCH-FEATURE-OPENSUSE mesonpy-no-wheel-rebuild.patch code@bnavigator.de Patch12: mesonpy-no-wheel-rebuild.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} -BuildRequires: %{python_module pyproject-metadata >= 0.5.0} +BuildRequires: %{python_module pyproject-metadata >= 0.6.1} BuildRequires: %{python_module tomli >= 1.0.0 if %python-base < 3.11} -BuildRequires: %{python_module typing-extensions >= 3.7.4 if %python-base < 3.8} +BuildRequires: %{python_module typing-extensions >= 3.7.4 if %python-base < 3.10} BuildRequires: fdupes BuildRequires: meson >= 0.63.3 BuildRequires: ninja BuildRequires: python-rpm-macros Requires: meson >= 0.63.3 -Requires: python-pyproject-metadata >= 0.5.0 +Requires: python-pyproject-metadata >= 0.6.1 %if 0%{python_version_nodots} < 311 Requires: python-tomli >= 1.0.0 %endif -%if 0%{python_version_nodots} < 38 +%if 0%{python_version_nodots} < 310 Requires: python-typing-extensions >= 3.7.4 %endif # SECTION test @@ -54,7 +54,6 @@ BuildRequires: %{python_module GitPython} BuildRequires: %{python_module Cython} BuildRequires: %{python_module build} BuildRequires: %{python_module devel} -BuildRequires: %{python_module pyproject-metadata >= 0.6.1} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wheel} @@ -79,11 +78,7 @@ Python build backend (PEP 517) for Meson projects. %check export MESONPY_FORCE_LOCAL_LIB=1 %python_expand cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} build/ -# can test test_spam only once gh#mesonbuild/meson-python#169 -# this has benn fixed shortly after the release of 0.11 -%python_expand $python_ignore="--ignore tests/docs/examples/test_spam.py" -unset python310_ignore -%pytest ${$python_ignore} +%pytest %files %{python_files} %license LICENSE diff --git a/typing_extensions-4.4.0-py3-none-any.whl b/typing_extensions-4.4.0-py3-none-any.whl new file mode 100644 index 0000000..57045ae --- /dev/null +++ b/typing_extensions-4.4.0-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e +size 26662