From 734492f3e26c3751152bfeaa944723afb4b621c32932ee93e1689f32a3702c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 11:54:42 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-pbr revision fc4530c20b0a60b2f5dff377f72d7737 --- pbr-5.11.1.tar.gz | 3 --- pbr-6.1.0.tar.gz | 3 +++ python-pbr.changes | 59 +++++++++++++++++++++++++++++++++++++++------- python-pbr.spec | 35 +++++++++++++-------------- 4 files changed, 69 insertions(+), 31 deletions(-) delete mode 100644 pbr-5.11.1.tar.gz create mode 100644 pbr-6.1.0.tar.gz diff --git a/pbr-5.11.1.tar.gz b/pbr-5.11.1.tar.gz deleted file mode 100644 index 411ff0c..0000000 --- a/pbr-5.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aefc51675b0b533d56bb5fd1c8c6c0522fe31896679882e1c4c63d5e4a0fccb3 -size 127597 diff --git a/pbr-6.1.0.tar.gz b/pbr-6.1.0.tar.gz new file mode 100644 index 0000000..2c15597 --- /dev/null +++ b/pbr-6.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24 +size 124032 diff --git a/python-pbr.changes b/python-pbr.changes index b272c11..0b427bb 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Mon Oct 28 12:13:48 UTC 2024 - Daniel Garcia + +- Use pytest to run tests to do not depend on python-stestr + +------------------------------------------------------------------- +Sat Aug 31 11:49:48 UTC 2024 - Dirk Müller + +- update to 6.1.0: + * Add openstack-tox-py312 as non-voting job + * Add SetupTools to our functional testing venvs + * Use SetupTools' vendored distutils in tests + * Also run coverage tests serially + * Omnibus PBR CI fixups + * Serialize tests + * Fix tempest-full job + * Use summary for the package summary + * Test on py310 and py311 + +------------------------------------------------------------------- +Mon May 13 05:17:26 UTC 2024 - Steve Kowalik + +- Use stestr rather than pytest to run the testsuite. + +------------------------------------------------------------------- +Tue Jan 2 22:34:18 UTC 2024 - Dirk Müller + +- require setuptools + +------------------------------------------------------------------- +Mon Nov 27 11:56:49 UTC 2023 - Dirk Müller + +- update to 6.0.0: + * build: Use kwargs + * Add support for PEP-660 + * Fix PBR integration testing + * Replace imp with importlib.machinery + * Add release note for build\_sphinx removal + * Use \_ instead of - in setup.cfg directives + * Remove sphinx doc building integration + ------------------------------------------------------------------- Thu May 4 07:09:44 UTC 2023 - Martin Liška @@ -27,7 +68,7 @@ Thu Apr 13 22:42:57 UTC 2023 - Matej Cepl ------------------------------------------------------------------- Tue Apr 4 02:27:52 UTC 2023 - Steve Kowalik -- Remove unneeded BuildRequires on pep517. +- Remove unneeded BuildRequires on pep517. ------------------------------------------------------------------- Sat Jan 21 09:57:57 UTC 2023 - Dirk Müller @@ -41,7 +82,7 @@ Sat Jan 21 09:57:57 UTC 2023 - Dirk Müller ------------------------------------------------------------------- Fri Oct 28 19:46:28 UTC 2022 - Yogalakshmi Arunachalam -- Update to 5.11.0 +- Update to 5.11.0 * Fix symbol identification in multiline message * Replace deprecated readfp method with read_file @@ -72,7 +113,7 @@ Tue Feb 22 09:04:17 UTC 2022 - Dirk Müller * Don't test with setuptools local distutils * Use context blocks for open() calls in packaging - remove remove_mock.patch (upstream) - + ------------------------------------------------------------------- Mon Dec 6 10:23:57 UTC 2021 - Dirk Müller @@ -253,7 +294,7 @@ Tue Dec 4 12:51:21 UTC 2018 - Matej Cepl ------------------------------------------------------------------- Wed Nov 7 11:22:59 UTC 2018 - mmnelemane@suse.com -- Fix for error "invalid option --#" in SLE_12_SP4 build. +- Fix for error "invalid option --#" in SLE_12_SP4 build. ------------------------------------------------------------------- Mon Oct 15 13:23:36 UTC 2018 - Matej Cepl @@ -286,7 +327,7 @@ Sun Oct 7 06:34:26 UTC 2018 - Matěj Cepl ------------------------------------------------------------------- Fri Sep 14 21:18:14 UTC 2018 - dmueller@suse.com -- add 0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch +- add 0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch ------------------------------------------------------------------- Tue Sep 4 08:47:32 UTC 2018 - dmueller@suse.com @@ -747,7 +788,7 @@ Thu Apr 16 08:53:20 UTC 2015 - hpj@urpla.net * Stop filtering out argparse * Remove mirror testing from the integration script - Changes from 0.10.1 - * Prefix git suffixes with + instead of + * Prefix git suffixes with + instead of - fix Sphinx config.init_values fallout - add update-alternatives - remove outdated patches @@ -924,7 +965,7 @@ Thu Jul 4 07:29:43 UTC 2013 - speilicke@suse.com ------------------------------------------------------------------- Tue Jul 2 16:06:42 UTC 2013 - dmueller@suse.com -- update description +- update description ------------------------------------------------------------------- Wed Jun 26 15:29:49 UTC 2013 - cdenicolo@suse.com @@ -935,7 +976,7 @@ Wed Jun 26 15:29:49 UTC 2013 - cdenicolo@suse.com ------------------------------------------------------------------- Wed Jun 26 09:47:22 UTC 2013 - dmueller@suse.com -- remove python-discover dependency for newer distros +- remove python-discover dependency for newer distros ------------------------------------------------------------------- Fri Jun 21 07:28:12 UTC 2013 - dmueller@suse.com @@ -949,7 +990,7 @@ Fri Jun 21 07:28:12 UTC 2013 - dmueller@suse.com ------------------------------------------------------------------- Mon Jun 10 13:35:54 UTC 2013 - dmueller@suse.com -- add 0001-Use-pip-instead-of-easy_install-for-installation.patch +- add 0001-Use-pip-instead-of-easy_install-for-installation.patch ------------------------------------------------------------------- Mon Jun 10 12:01:19 UTC 2013 - dmueller@suse.com diff --git a/python-pbr.spec b/python-pbr.spec index d28a7e1..71fb82a 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-pbr # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,22 +26,21 @@ %bcond_with test %endif Name: python-pbr%{psuffix} -Version: 5.11.1 +Version: 6.1.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 -Group: Development/Languages/Python URL: https://docs.openstack.org/pbr/latest/ Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-setuptools +Requires: python-setuptools >= 64.0.0 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: git-core -Suggests: python-nose Obsoletes: python-pbr-doc BuildArch: noarch %if %{with test} @@ -53,7 +52,7 @@ BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module build} BuildRequires: %{python_module devel} BuildRequires: %{python_module fixtures >= 3.0.0} -BuildRequires: %{python_module pbr} +BuildRequires: %{python_module pbr = %{version}} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module six >= 1.12.0} @@ -85,16 +84,14 @@ sed -i '/coverage/d;/hacking/d' test-requirements.txt %if %{with test} %check export OS_TEST_TIMEOUT=60 -dont_test="test_parse_requirements or test_requirement_parsing or test_pep_517_support " -dont_test+="or test_write_git_changelog or test_build_doc or test_cmd_builder_override " -dont_test+="or test_cmd_builder_override_multiple_builders or test_extras_parsing " -dont_test+="or test_project_url_parsing or test_keywords_parsing " -dont_test+="or test_handling_of_whitespace_in_data_files " -# the following tests fail due to Sphinx 7.0 and removal of build_sphinx feature -# https://bugs.launchpad.net/pbr/+bug/2018453 -dont_test+="or test_setup_py_build_sphinx or test_builders_config " -dont_test+="or test_default_api_build_dir or test_different_api_build_dir" -%pytest -k "not ($dont_test)" +exclude="parse_requirements|requirement_parsing|pep_517_support|" +exclude+="write_git_changelog|build_doc|cmd_builder_override|" +exclude+="extras_parsing|project_url_parsing|keywords_parsing|" +exclude+="test_handling_of_whitespace_in_data_files" +# Run tests with pytest to do not depend on python-stestr, that's no +# available on SLFO:Main +# stestr run -E "($exclude)" +%pytest -k "not (${exclude//|/ or })" %endif %if !%{with test} @@ -116,7 +113,7 @@ dont_test+="or test_default_api_build_dir or test_different_api_build_dir" %doc AUTHORS ChangeLog CONTRIBUTING.rst README.rst %python_alternative %{_bindir}/pbr %{python_sitelib}/pbr -%{python_sitelib}/pbr-%{version}*-info +%{python_sitelib}/pbr-%{version}.dist-info %endif %changelog