From fc5b449d10785a0d1569eb33c820b4f0cf12287a406abbbd99c800c5632b7b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Feb 2025 19:38:09 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-proto-plus revision d420318a264792199ce3f2fd5334be14 --- proto-plus-1.22.3.tar.gz | 3 --- proto_plus-1.25.0.tar.gz | 3 +++ pytest-staticmethod.patch | 14 ----------- python-proto-plus.changes | 51 +++++++++++++++++++++++++++++++++++++-- python-proto-plus.spec | 20 +++++++-------- 5 files changed, 61 insertions(+), 30 deletions(-) delete mode 100644 proto-plus-1.22.3.tar.gz create mode 100644 proto_plus-1.25.0.tar.gz delete mode 100644 pytest-staticmethod.patch diff --git a/proto-plus-1.22.3.tar.gz b/proto-plus-1.22.3.tar.gz deleted file mode 100644 index 7b717f1..0000000 --- a/proto-plus-1.22.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdcd09713cbd42480740d2fe29c990f7fbd885a67efc328aa8be6ee3e9f76a6b -size 53592 diff --git a/proto_plus-1.25.0.tar.gz b/proto_plus-1.25.0.tar.gz new file mode 100644 index 0000000..538fc2d --- /dev/null +++ b/proto_plus-1.25.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbb17f57f7bd05a68b7707e745e26528b0b3c34e378db91eef93912c54982d91 +size 56124 diff --git a/pytest-staticmethod.patch b/pytest-staticmethod.patch deleted file mode 100644 index bcc6857..0000000 --- a/pytest-staticmethod.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - proto/_file_info.py | 1 - - 1 file changed, 1 deletion(-) - ---- a/proto/_file_info.py -+++ b/proto/_file_info.py -@@ -51,7 +51,6 @@ class _FileInfo( - - return descriptor - -- @staticmethod - def proto_file_name(name): - return "{0}.proto".format(name.replace(".", "/")) - diff --git a/python-proto-plus.changes b/python-proto-plus.changes index 5ad6efc..04e02e5 100644 --- a/python-proto-plus.changes +++ b/python-proto-plus.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Fri Nov 22 13:28:52 UTC 2024 - Markéta Machová + +- Update to 1.25.0 + * Add support for Python 3.13 + * Construct messages with nested struct + * Fix 'Couldn't build proto file' when using Python 3.13 + * Fix conda compatibility issue + * Fix issue with equality comparison of repeated field with None + * Remove check for Protobuf version +- Drop merged pytest-staticmethod.patch + +------------------------------------------------------------------- +Wed Oct 2 06:05:52 UTC 2024 - Steve Kowalik + +- Explicitly BuildRequires on pytz, the testsuite uses it. + +------------------------------------------------------------------- +Thu Jun 20 12:43:10 UTC 2024 - Dirk Müller + +- update to 1.24.0: + * Add `always_print_fields_with_no_presence` fields to + `to_json` and `to_dict` + * Add compatibility with protobuf==5.x + * AttributeError module 'google._upb._message' has no attribute + 'MessageMapContainer' + * Deprecate field `including_default_value_fields` in `to_json` + and `to_dict` + +------------------------------------------------------------------- +Mon Feb 26 19:29:22 UTC 2024 - Robert Schweikert + +- Include in SLE 15 SP4 and later (jsc#PED-6697) +- Add %{?sle15_python_module_pythons} + +------------------------------------------------------------------- +Mon Jan 1 20:18:46 UTC 2024 - Dirk Müller + +- update to 1.23.0: + * Add additional parameters to `to_json()` and `to_dict()` + methods (#384) + * Add support for proto.__version__ (#393) + * Add support for python 3.12 (#400) + * Add documentation on how to query the current oneof in a + given message (#408) + * Add example for __protobuf__ module level attribute (#409) + ------------------------------------------------------------------- Tue Nov 7 12:59:38 UTC 2023 - Matthias Fehring @@ -75,7 +122,7 @@ Mon Jan 31 15:13:44 UTC 2022 - Matthias Fehring ------------------------------------------------------------------- Thu Nov 11 08:25:24 UTC 2021 - Steve Kowalik -- Add multibuild to defeat a build loop. +- Add multibuild to defeat a build loop. ------------------------------------------------------------------- Fri Sep 10 10:52:33 UTC 2021 - Matthias Fehring @@ -91,7 +138,7 @@ Sat Mar 20 12:24:03 UTC 2021 - Matthias Fehring * Add arm64 support for PY3.6 (gh#googleapis/proto-plus-python#219) - from 1.18.0 * add copy_from method for field assignment - (gh#googleapis/proto-plus-python#512) + (gh#googleapis/proto-plus-python#512) ------------------------------------------------------------------- Mon Mar 15 17:22:01 UTC 2021 - Matthias Fehring diff --git a/python-proto-plus.spec b/python-proto-plus.spec index 20bee34..3ee1e6e 100644 --- a/python-proto-plus.spec +++ b/python-proto-plus.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-proto-plus # -# 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 @@ -24,18 +24,15 @@ %define psuffix %{nil} %bcond_with test %endif -%define skip_python2 1 -%define modname proto-plus +%define modname proto_plus +%{?sle15_python_module_pythons} Name: python-proto-plus%{psuffix} -Version: 1.22.3 +Version: 1.25.0 Release: 0 Summary: Pythonic Protocol Buffers License: Apache-2.0 URL: https://github.com/googleapis/proto-plus-python Source0: https://files.pythonhosted.org/packages/source/p/%{modname}/%{modname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM pytest-staticmethod.patch gh#pytest-dev/pytest#9637 mcepl@suse.com -# workaround for the problem with pytest 7.0 -Patch0: pytest-staticmethod.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module protobuf >= 3.19.0} BuildRequires: %{python_module setuptools} @@ -46,6 +43,7 @@ BuildRequires: python-rpm-macros BuildRequires: %{python_module google-api-core >= 1.31.5} BuildRequires: %{python_module proto-plus} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module pytz} %endif # /SECTION BuildRequires: fdupes @@ -63,11 +61,11 @@ that largely behave like native Python types. %autosetup -p1 -n %{modname}-%{version} %build -%python_build +%pyproject_wheel %install %if !%{with test} -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif @@ -82,7 +80,7 @@ that largely behave like native Python types. %license LICENSE %doc README.rst %{python_sitelib}/proto -%{python_sitelib}/proto_plus-%{version}*-info +%{python_sitelib}/proto_plus-%{version}.dist-info %endif %changelog