Sync from SUSE:SLFO:Main python-proto-plus revision d420318a264792199ce3f2fd5334be14

pytest-staticmethod.patch

@@ -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(".", "/"))
- 

python-proto-plus.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Fri Nov 22 13:28:52 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- 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 <steven.kowalik@suse.com>
+
+- Explicitly BuildRequires on pytz, the testsuite uses it. 
+
+-------------------------------------------------------------------
+Thu Jun 20 12:43:10 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- 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 <rjschwei@suse.com>
+
+- 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 <dmueller@suse.com>
+
+- 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 <buschmann23@opensuse.org>
 
@@ -75,7 +122,7 @@ Mon Jan 31 15:13:44 UTC 2022 - Matthias Fehring <buschmann23@opensuse.org>
 -------------------------------------------------------------------
 Thu Nov 11 08:25:24 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
 
-- Add multibuild to defeat a build loop. 
+- Add multibuild to defeat a build loop.
 
 -------------------------------------------------------------------
 Fri Sep 10 10:52:33 UTC 2021 - Matthias Fehring <buschmann23@opensuse.org>
@@ -91,7 +138,7 @@ Sat Mar 20 12:24:03 UTC 2021 - Matthias Fehring <buschmann23@opensuse.org>
   * 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 <buschmann23@opensuse.org>

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