Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-pyu2f for openSUSE:Factory 
checked in at 2023-10-17 20:22:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyu2f (Old)
 and      /work/SRC/openSUSE:Factory/.python-pyu2f.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pyu2f"

Tue Oct 17 20:22:35 2023 rev:6 rq:1118207 version:0.1.5a

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyu2f/python-pyu2f.changes        
2023-04-22 21:58:19.308449285 +0200
+++ /work/SRC/openSUSE:Factory/.python-pyu2f.new.20540/python-pyu2f.changes     
2023-10-17 20:22:42.230462612 +0200
@@ -1,0 +2,14 @@
+Tue Oct 17 07:32:00 UTC 2023 - Daniel Garcia Moreno <daniel.gar...@suse.com>
+
+- Use upstream patches instead of custom one for python312
+  compatibility.
+  - drop python312.patch
+  - add python312-1.patch gh#google/pyu2f@793acd9ff661
+  - add python312-2.patch gh#google/pyu2f@dad654010a03
+
+-------------------------------------------------------------------
+Tue Oct 17 07:18:36 UTC 2023 - Daniel Garcia Moreno <daniel.gar...@suse.com>
+
+- Add python312.patch to fix tests in python3.12
+
+-------------------------------------------------------------------

New:
----
  python312-1.patch
  python312-2.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-pyu2f.spec ++++++
--- /var/tmp/diff_new_pack.2Naluv/_old  2023-10-17 20:22:43.098492999 +0200
+++ /var/tmp/diff_new_pack.2Naluv/_new  2023-10-17 20:22:43.098492999 +0200
@@ -29,15 +29,17 @@
 Patch:          fix-deprecation-warning.patch
 # https://github.com/google/pyu2f/issues/34
 Patch1:         python-pyu2f-no-six.patch
+# PATCH-FIX-UPSTREAM python312-1.patch gh#google/pyu2f@793acd9ff661
+Patch2:         python312-1.patch
+# PATCH-FIX-UPSTREAM python312-2.patch gh#google/pyu2f@dad654010a03
+Patch3:         python312-2.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
 # SECTION test requirements
-BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module pyfakefs >= 2.4}
 BuildRequires:  %{python_module pytest}
 # /SECTION
 BuildRequires:  fdupes
-Requires:       python-six
 BuildArch:      noarch
 %python_subpackages
 

++++++ fix-deprecation-warning.patch ++++++
--- /var/tmp/diff_new_pack.2Naluv/_old  2023-10-17 20:22:43.122493839 +0200
+++ /var/tmp/diff_new_pack.2Naluv/_new  2023-10-17 20:22:43.126493980 +0200
@@ -8,11 +8,11 @@
  pyu2f/tests/hid/linux_test.py | 12 ++++++------
  2 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/pyu2f/hid/macos.py b/pyu2f/hid/macos.py
-index 905bce2..919fd4d 100644
---- a/pyu2f/hid/macos.py
-+++ b/pyu2f/hid/macos.py
-@@ -174,7 +174,7 @@ class _CFAllocator(_CFType):
+Index: pyu2f-0.1.5a/pyu2f/hid/macos.py
+===================================================================
+--- pyu2f-0.1.5a.orig/pyu2f/hid/macos.py
++++ pyu2f-0.1.5a/pyu2f/hid/macos.py
+@@ -174,7 +174,7 @@ if sys.platform.startswith('darwin'):
                                           ctypes.POINTER(ctypes.c_uint8),
                                           CF_INDEX]
  else:
@@ -21,11 +21,11 @@
  
  
  def CFStr(s):
-diff --git a/pyu2f/tests/hid/linux_test.py b/pyu2f/tests/hid/linux_test.py
-index 1a299fa..610d200 100644
---- a/pyu2f/tests/hid/linux_test.py
-+++ b/pyu2f/tests/hid/linux_test.py
-@@ -49,14 +49,14 @@
+Index: pyu2f-0.1.5a/pyu2f/tests/hid/linux_test.py
+===================================================================
+--- pyu2f-0.1.5a.orig/pyu2f/tests/hid/linux_test.py
++++ pyu2f-0.1.5a/pyu2f/tests/hid/linux_test.py
+@@ -49,14 +49,14 @@ KEYBOARD_RD = (
  
  def AddDevice(fs, dev_name, product_name,
                vendor_id, product_id, report_descriptor_b64):
@@ -44,7 +44,7 @@
  
  
  class FakeDeviceOsModule(object):
-@@ -79,10 +79,10 @@ def read(self, unused_dev, unused_length):  # pylint: 
disable=invalid-name
+@@ -79,10 +79,10 @@ class FakeDeviceOsModule(object):
  class LinuxTest(unittest.TestCase):
    def setUp(self):
      self.fs = fake_filesystem.FakeFilesystem()

++++++ python312-1.patch ++++++
++++ 772 lines (skipped)

++++++ python312-2.patch ++++++
>From 793acd9ff6612bb035f0724b04e10a01cdb5bb8d Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.kar...@gmail.com>
Date: Fri, 15 Oct 2021 10:38:31 +0000
Subject: [PATCH] Use assertRaisesRegex instead of assertRaisesRegexp for
 Python 3.11 compatibility.

---
 pyu2f/tests/hidtransport_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: pyu2f-0.1.5a/pyu2f/tests/hidtransport_test.py
===================================================================
--- pyu2f-0.1.5a.orig/pyu2f/tests/hidtransport_test.py
+++ pyu2f-0.1.5a/pyu2f/tests/hidtransport_test.py
@@ -128,8 +128,8 @@ class TransportTest(unittest.TestCase):
     # the second will succeed on the second retry.
     fake_hid_dev.SetChannelBusyCount(3)
     with mock.patch.object(hidtransport, 'time') as _:
-      self.assertRaisesRegexp(errors.HidError, '^Device Busy', t.SendMsgBytes,
-                              [0x00, 0x01, 0x00, 0x00])
+      self.assertRaisesRegex(errors.HidError, '^Device Busy', t.SendMsgBytes,
+                             [0x00, 0x01, 0x00, 0x00])
 
       reply = t.SendMsgBytes([0x00, 0x01, 0x00, 0x00])
       self.assertEqual(reply, bytearray([0x01, 0x90, 0x00]))

Reply via email to