From 40b8a493cd87ae48a84f1a5419976a8872225dc0 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:29:03 +0000 Subject: [PATCH] import RHEL 10 Beta pyproject-rpm-macros-1.12.0-2.el10 --- SOURCES/LICENSE => LICENSE | 0 SOURCES/README.md => README.md | 0 .../compare_mandata.py => compare_mandata.py | 0 ...yproject-srpm => macros.aaa-pyproject-srpm | 0 SOURCES/macros.pyproject => macros.pyproject | 0 ...m-macros.spec => pyproject-rpm-macros.spec | 79 ++++++++++--------- ...drequires.py => pyproject_buildrequires.py | 0 ... => pyproject_buildrequires_testcases.yaml | 0 ...toxenv.py => pyproject_construct_toxenv.py | 0 ...project_convert.py => pyproject_convert.py | 0 ...ecord.py => pyproject_preprocess_record.py | 0 ...ts_txt.py => pyproject_requirements_txt.py | 0 ...t_save_files.py => pyproject_save_files.py | 0 ...aml => pyproject_save_files_test_data.yaml | 0 .../pyproject_wheel.py => pyproject_wheel.py | 0 SOURCES/test_RECORD => test_RECORD | 0 ...ires.py => test_pyproject_buildrequires.py | 0 ...t.py => test_pyproject_requirements_txt.py | 0 ...e_files.py => test_pyproject_save_files.py | 0 19 files changed, 43 insertions(+), 36 deletions(-) rename SOURCES/LICENSE => LICENSE (100%) rename SOURCES/README.md => README.md (100%) rename SOURCES/compare_mandata.py => compare_mandata.py (100%) rename SOURCES/macros.aaa-pyproject-srpm => macros.aaa-pyproject-srpm (100%) rename SOURCES/macros.pyproject => macros.pyproject (100%) rename SPECS/pyproject-rpm-macros.spec => pyproject-rpm-macros.spec (93%) rename SOURCES/pyproject_buildrequires.py => pyproject_buildrequires.py (100%) rename SOURCES/pyproject_buildrequires_testcases.yaml => pyproject_buildrequires_testcases.yaml (100%) rename SOURCES/pyproject_construct_toxenv.py => pyproject_construct_toxenv.py (100%) rename SOURCES/pyproject_convert.py => pyproject_convert.py (100%) rename SOURCES/pyproject_preprocess_record.py => pyproject_preprocess_record.py (100%) rename SOURCES/pyproject_requirements_txt.py => pyproject_requirements_txt.py (100%) rename SOURCES/pyproject_save_files.py => pyproject_save_files.py (100%) rename SOURCES/pyproject_save_files_test_data.yaml => pyproject_save_files_test_data.yaml (100%) rename SOURCES/pyproject_wheel.py => pyproject_wheel.py (100%) rename SOURCES/test_RECORD => test_RECORD (100%) rename SOURCES/test_pyproject_buildrequires.py => test_pyproject_buildrequires.py (100%) rename SOURCES/test_pyproject_requirements_txt.py => test_pyproject_requirements_txt.py (100%) rename SOURCES/test_pyproject_save_files.py => test_pyproject_save_files.py (100%) diff --git a/SOURCES/LICENSE b/LICENSE similarity index 100% rename from SOURCES/LICENSE rename to LICENSE diff --git a/SOURCES/README.md b/README.md similarity index 100% rename from SOURCES/README.md rename to README.md diff --git a/SOURCES/compare_mandata.py b/compare_mandata.py similarity index 100% rename from SOURCES/compare_mandata.py rename to compare_mandata.py diff --git a/SOURCES/macros.aaa-pyproject-srpm b/macros.aaa-pyproject-srpm similarity index 100% rename from SOURCES/macros.aaa-pyproject-srpm rename to macros.aaa-pyproject-srpm diff --git a/SOURCES/macros.pyproject b/macros.pyproject similarity index 100% rename from SOURCES/macros.pyproject rename to macros.pyproject diff --git a/SPECS/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec similarity index 93% rename from SPECS/pyproject-rpm-macros.spec rename to pyproject-rpm-macros.spec index 9f2247b..a3c27b9 100644 --- a/SPECS/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -14,7 +14,7 @@ License: MIT # Increment Z when this is a bugfix or a cosmetic change # Dropping support for EOL Fedoras is *not* considered a breaking change Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} # Macro files Source001: macros.pyproject @@ -62,21 +62,6 @@ BuildRequires: python3dist(tox-current-env) >= 0.0.6 %endif BuildRequires: python3dist(wheel) BuildRequires: (python3dist(tomli) if python3 < 3.11) - -# RHEL 9: We also run pytest with Python 3.11 and 3.12 -BuildRequires: python3.11dist(pytest) -BuildRequires: python3.11dist(pyyaml) -BuildRequires: python3.11dist(packaging) -BuildRequires: python3.11dist(pip) -BuildRequires: python3.11dist(setuptools) -BuildRequires: python3.11dist(wheel) - -BuildRequires: python3.12dist(pytest) -BuildRequires: python3.12dist(pyyaml) -BuildRequires: python3.12dist(packaging) -BuildRequires: python3.12dist(pip) -BuildRequires: python3.12dist(setuptools) -BuildRequires: python3.12dist(wheel) %endif # We build on top of those: @@ -162,14 +147,6 @@ test "$signature1" != "" export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856356 %pytest -vv --doctest-modules %{?with_pytest_xdist:-n auto} %{!?with_tox_tests:-k "not tox"} -# RHEL 9 only: -%global __pytest pytest-3.11 -%pytest -vv --doctest-modules -k "not tox" - -# RHEL 9 only: -%global __pytest pytest-3.12 -%pytest -vv --doctest-modules -k "not tox" - # brp-compress is provided as an argument to get the right directory macro expansion %{python3} compare_mandata.py -f %{_rpmconfigdir}/brp-compress %endif @@ -194,11 +171,20 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %changelog +* Mon Jun 24 2024 Troy Dawson - 1.12.0-2 +- Bump release for June 2024 mass rebuild + * Fri Jan 26 2024 Miro Hrončok - 1.12.0-1 - Namespace pyproject-rpm-macros generated text files with %%{python3_pkgversion} - That way, a single-spec can be used to build packages for multiple Python versions - Fixes: rhbz#2209055 +* Fri Jan 26 2024 Fedora Release Engineering - 1.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 27 2023 Miro Hrončok - 1.11.0-1 - Add the -l/-L flag to %%pyproject_save_files - The -l flag can be used to assert at least 1 License-File was detected @@ -215,8 +201,12 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 - Fix handling of tox 4 provision without an explicit tox minversion - Fixes: rhbz#2240590 +* Fri Jul 21 2023 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 31 2023 Maxwell G - 1.9.0-1 - Allow passing config_settings to the build backend. +- Resolves: rhbz#2192581 * Wed May 31 2023 Miro Hrončok - 1.8.1-1 - On Python older than 3.11, use tomli instead of deprecated toml @@ -227,12 +217,14 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Thu Apr 27 2023 Miro Hrončok - 1.8.0-1 - %%pyproject_buildrequires: Add support for self-referential extras requirements + Fixes: rhbz#2171343 - Deprecate the provisional %%{pyproject_build_lib} macro See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/HMLOPAU3RZLXD4BOJHTIPKI3I4U6U7OE/ * Fri Mar 31 2023 Miro Hrončok - 1.7.0-1 - %%pyproject_buildrequires: Redirect stdout to stderr via Shell - Dependencies are recorded to a text file that is catted at the end +- Fixes: rhbz#2183519 * Mon Feb 13 2023 Lumír Balhar - 1.6.3-1 - Remove .dist-info directory at the end of %%pyproject_buildrequires @@ -240,24 +232,31 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Wed Feb 08 2023 Lumír Balhar - 1.6.2-1 - Improve detection of lang files +- Fixes: rhbz#2166295 * Fri Feb 03 2023 Miro Hrončok - 1.6.1-1 - %%pyproject_buildrequires: Avoid leaking stdout from subprocesses +- Fixes: rhbz#2166888 * Fri Jan 20 2023 Miro Hrončok - 1.6.0-1 - Add pyproject-srpm-macros with a minimal %%pyproject_buildrequires macro +* Fri Jan 20 2023 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 13 2023 Miro Hrončok - 1.5.1-1 - Adjusts %%pyproject_buildrequires tests for tox 4 +- Fixes: rhbz#2160687 * Mon Nov 28 2022 Miro Hrončok - 1.5.0-1 - Use %%py3_test_envvars in %%tox when available * Mon Sep 19 2022 Python Maint - 1.4.0-1 - %%pyproject_save_files: Support License-Files installed into the *Root License Directory* from PEP 639 - +- Fixes: rhbz#2127946 - %%pyproject_check_import: Import only the modules whose top-level names match any of the globs provided to %%pyproject_save_files +- Fixes: rhbz#2127958 * Tue Aug 30 2022 Otto Liljalaakso - 1.3.4-1 - Fix typo in internal function name @@ -265,10 +264,15 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Tue Aug 09 2022 Karolina Surma - 1.3.3-1 - Don't fail %%pyproject_save_files '*' if no modules are detected +* Fri Jul 22 2022 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Benjamin A. Beasley - 1.3.2-1 - Update %%pyproject_build_lib to support setuptools 62.1.0 and later +- Fixes: rhbz#2097158 - %%pyproject_buildrequires: When extension modules are built, support https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects +- Fixes: rhbz#2097535 * Fri May 27 2022 Owen Taylor - 1.3.1-1 - %%pyproject_install: pass %%{_prefix} explicitly to pip install @@ -281,9 +285,11 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 prepare_metadata_for_build_wheel hook When used, the wheel is built in %%pyproject_buildrequires and information about runtime requires and extras is read from that wheel. +- Fixes: rhbz#2076994 * Tue Apr 12 2022 Miro Hrončok - 1.1.0-1 - %%pyproject_save_files: Support nested directories in dist-info +- Fixes: rhbz#1985340 * Tue Mar 22 2022 Miro Hrončok - 1.0.1-1 - Prefix paths of intermediate files (such as %%{pyproject_files}) with NVRA @@ -303,6 +309,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Wed Jan 19 2022 Karolina Surma - 0-54 - Include compressed manpages to the package if flag '+auto' is provided to %%pyproject_save_files +- Fixes: rhbz#2033254 * Fri Jan 14 2022 Miro Hrončok - 0-53 - %%pyproject_buildrequires: Make -r (include runtime) the default, use -R to opt-out @@ -325,6 +332,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Sat Oct 16 2021 Miro Hrončok - 0-48 - %%pyproject_buildrequires: Accept installed pre-releases for all requirements +- Fixes: rhbz#2014639 * Thu Sep 09 2021 Miro Hrončok - 0-47 - %%pyproject_save_files: Expand the namespace error message, also display it with / @@ -332,6 +340,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Fri Jul 23 2021 Miro Hrončok - 0-46 - %%pyproject_buildrequires now fails when it encounters an invalid requirement +- Fixes: rhbz#1983053 - Rename %%_pyproject_ghost_distinfo and %%_pyproject_record to indicate they are private - Automatically detect LICENSE files and mark them with %%license macro @@ -340,36 +349,34 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 * Fri Jul 09 2021 Python Maint - 0-44 - Escape weird paths generated by %%pyproject_save_files +- Fixes rhbz#1976363 - Support x.* versions in %%pyproject_buildrequires +- Fixes rhbz#1981558 - %%pyproject_buildrequires fallbacks to setuptools only if setup.py exists +- Fixes: rhbz#1976459 - Explicitly require the "basic" Python RPM macros -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 * Thu Jul 01 2021 Tomas Hrnciar - 0-43 - Generate BuildRequires from file +- Fixes: rhbz#1936448 * Tue Jun 29 2021 Miro Hrončok - 0-42 - Don't accidentally treat "~= X.0" requirement as "~= X" -- Fixes rhzb#1977060 +- Fixes rhbz#1977060 * Mon Jun 28 2021 Miro Hrončok - 0-41 - Don't leak %%{_pyproject_builddir} to pytest collection +- Fixes rhbz#1935212 * Thu May 27 2021 Miro Hrončok - 0-40 - Don't leak $TMPDIR outside of pyproject macros - Set %%_pyproject_wheeldir and %%_pyproject_builddir relative to the source tree, not $PWD -* Thu Apr 22 2021 Miro Hrončok - 0-39.2 +* Mon Mar 29 2021 Miro Hrončok - 0-39 - Handle tox provision (tox.requires / tox.minversion) +- Fixes: rhbz#1922495 - Generate BuildRequires on extras in lower case -- Fixes: rhbz#1947074 - -* Fri Apr 16 2021 Mohan Boddu - 0-39.1 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Mon Mar 08 2021 Charalampos Stratakis - 0-38.1 -- Disable tests on RHEL9 to remove tox dependency +- Fixes: rhbz#1937944 * Sun Feb 07 2021 Miro Hrončok - 0-38 - Include nested __pycache__ directories in %%pyproject_save_files diff --git a/SOURCES/pyproject_buildrequires.py b/pyproject_buildrequires.py similarity index 100% rename from SOURCES/pyproject_buildrequires.py rename to pyproject_buildrequires.py diff --git a/SOURCES/pyproject_buildrequires_testcases.yaml b/pyproject_buildrequires_testcases.yaml similarity index 100% rename from SOURCES/pyproject_buildrequires_testcases.yaml rename to pyproject_buildrequires_testcases.yaml diff --git a/SOURCES/pyproject_construct_toxenv.py b/pyproject_construct_toxenv.py similarity index 100% rename from SOURCES/pyproject_construct_toxenv.py rename to pyproject_construct_toxenv.py diff --git a/SOURCES/pyproject_convert.py b/pyproject_convert.py similarity index 100% rename from SOURCES/pyproject_convert.py rename to pyproject_convert.py diff --git a/SOURCES/pyproject_preprocess_record.py b/pyproject_preprocess_record.py similarity index 100% rename from SOURCES/pyproject_preprocess_record.py rename to pyproject_preprocess_record.py diff --git a/SOURCES/pyproject_requirements_txt.py b/pyproject_requirements_txt.py similarity index 100% rename from SOURCES/pyproject_requirements_txt.py rename to pyproject_requirements_txt.py diff --git a/SOURCES/pyproject_save_files.py b/pyproject_save_files.py similarity index 100% rename from SOURCES/pyproject_save_files.py rename to pyproject_save_files.py diff --git a/SOURCES/pyproject_save_files_test_data.yaml b/pyproject_save_files_test_data.yaml similarity index 100% rename from SOURCES/pyproject_save_files_test_data.yaml rename to pyproject_save_files_test_data.yaml diff --git a/SOURCES/pyproject_wheel.py b/pyproject_wheel.py similarity index 100% rename from SOURCES/pyproject_wheel.py rename to pyproject_wheel.py diff --git a/SOURCES/test_RECORD b/test_RECORD similarity index 100% rename from SOURCES/test_RECORD rename to test_RECORD diff --git a/SOURCES/test_pyproject_buildrequires.py b/test_pyproject_buildrequires.py similarity index 100% rename from SOURCES/test_pyproject_buildrequires.py rename to test_pyproject_buildrequires.py diff --git a/SOURCES/test_pyproject_requirements_txt.py b/test_pyproject_requirements_txt.py similarity index 100% rename from SOURCES/test_pyproject_requirements_txt.py rename to test_pyproject_requirements_txt.py diff --git a/SOURCES/test_pyproject_save_files.py b/test_pyproject_save_files.py similarity index 100% rename from SOURCES/test_pyproject_save_files.py rename to test_pyproject_save_files.py