From ffdd44ecf3c039cd196769d8a822e6265277a96d9be735a9d090d3b548e77837 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 13 Feb 2023 23:22:14 +0000
Subject: [PATCH] Accepting request 1065499 from
 home:bnavigator:branches:devel:languages:python

- Remove fix_test_compiled_signature_annotation_string.patch
  All tests pass without it

OBS-URL: https://build.opensuse.org/request/show/1065499
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jedi?expand=0&rev=101
---
 ...compiled_signature_annotation_string.patch | 34 -------------------
 python-jedi.changes                           |  6 ++++
 python-jedi.spec                              |  3 --
 3 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 fix_test_compiled_signature_annotation_string.patch

diff --git a/fix_test_compiled_signature_annotation_string.patch b/fix_test_compiled_signature_annotation_string.patch
deleted file mode 100644
index 20b037b..0000000
--- a/fix_test_compiled_signature_annotation_string.patch
+++ /dev/null
@@ -1,34 +0,0 @@
----
- test/test_inference/test_mixed.py |    8 ++++++--
- test/test_utils.py                |    2 +-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
---- a/test/test_inference/test_mixed.py
-+++ b/test/test_inference/test_mixed.py
-@@ -1,3 +1,4 @@
-+import sys
- from typing import Generic, TypeVar, List
- 
- import pytest
-@@ -110,5 +111,8 @@ def test_compiled_signature_annotation_s
-     func.__name__ = 'not_func'
- 
-     s, = jedi.Interpreter('func()', [locals()]).get_signatures(1, 5)
--    assert s.params[0].description == 'param x: Type'
--    assert s.params[1].description == 'param y: Union[Type, int]'
-+    assert s.params[0].description == 'param x: Type' \
-+        if sys.version_info < (3, 10, 0) else "param x: 'typing.Type'"
-+    assert s.params[1].description == 'param y: Union[Type, int]' \
-+        if sys.version_info < (3, 10, 0) else "param y: 'typing.Union[typing.Type, int]"
-+
---- a/test/test_utils.py
-+++ b/test/test_utils.py
-@@ -81,7 +81,7 @@ class TestSetupReadline(unittest.TestCas
-             if all(not x.startswith('from os import ' + s)
-                    for s in ['_', 'O_', 'EX_', 'MFD_', 'SF_', 'ST_',
-                              'CLD_', 'POSIX_SPAWN_', 'P_', 'RWF_',
--                             'SCHED_'])
-+                             'SCHED_', 'SPLICE_', 'EFD_', 'eventfd'])
-         }
-         # There are quite a few differences, because both Windows and Linux
-         # (posix and nt) librariesare included.
diff --git a/python-jedi.changes b/python-jedi.changes
index 594d121..0fb102a 100644
--- a/python-jedi.changes
+++ b/python-jedi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 13 12:25:57 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Remove fix_test_compiled_signature_annotation_string.patch
+  All tests pass without it
+
 -------------------------------------------------------------------
 Sun Feb 12 23:52:07 UTC 2023 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-jedi.spec b/python-jedi.spec
index ce603c7..68e7daa 100644
--- a/python-jedi.spec
+++ b/python-jedi.spec
@@ -28,9 +28,6 @@ Source0:        https://files.pythonhosted.org/packages/source/j/jedi/jedi-%{ver
 Source1:        %{name}-rpmlintrc
 # PATCH-FIX-UPSTREAM gh#davidhalter/jedi#1903
 Patch0:         support-python-311-typing.patch
-# PATCH-FIX-UPSTREAM fix_test_compiled_signature_annotation_string.patch gh#davidhalter/jedi#1732 mcepl@suse.com
-# Make tests working with Python 3.10+ as well
-Patch1:         fix_test_compiled_signature_annotation_string.patch
 # PATCH-FIX-UPSTREAM supported_pythons_310_311.patch gh#davidhalter/jedi#1914 mcepl@suse.com
 # Add '3.11' among _SUPPORTED_PYTHONS
 Patch2:         supported_pythons_310_311.patch