Compare commits
2 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| de1015d701 | |||
| 4af3898020 |
50
py39.patch
50
py39.patch
@@ -1,15 +1,26 @@
|
|||||||
Index: prestring-0.9.0/prestring/tests/test_lazy_object.py
|
From 55165f7b1a622577801f8d6c2bd3d0f16555be4b Mon Sep 17 00:00:00 2001
|
||||||
===================================================================
|
From: podhmo <ababjam61+github@gmail.com>
|
||||||
--- prestring-0.9.0.orig/prestring/tests/test_lazy_object.py
|
Date: Sun, 28 Mar 2021 14:27:35 +0900
|
||||||
+++ prestring-0.9.0/prestring/tests/test_lazy_object.py
|
Subject: [PATCH] Fix test for py39 (#75)
|
||||||
@@ -29,23 +29,27 @@ class LazyArgumentsTests(unittest.TestCa
|
|
||||||
|
* test: remove try-except
|
||||||
|
|
||||||
|
* test: fix tests (work-around)
|
||||||
|
---
|
||||||
|
prestring/tests/test_lazy_object.py | 33 +++++++++++++++++------------
|
||||||
|
1 file changed, 20 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/prestring/tests/test_lazy_object.py b/prestring/tests/test_lazy_object.py
|
||||||
|
index f528009..a41457f 100644
|
||||||
|
--- a/prestring/tests/test_lazy_object.py
|
||||||
|
+++ b/prestring/tests/test_lazy_object.py
|
||||||
|
@@ -29,23 +29,30 @@ def test_with_actual_types(self):
|
||||||
self.assertEqual(str(target), "x: int, y: bool, *")
|
self.assertEqual(str(target), "x: int, y: bool, *")
|
||||||
|
|
||||||
def test_with_actual_types2(self):
|
def test_with_actual_types2(self):
|
||||||
- try:
|
- try:
|
||||||
- import typing as t
|
- import typing as t
|
||||||
+ import typing as t
|
-
|
||||||
|
|
||||||
- target = self._makeOne(
|
- target = self._makeOne(
|
||||||
- ["x", "y", "z"],
|
- ["x", "y", "z"],
|
||||||
- types={
|
- types={
|
||||||
@@ -18,12 +29,8 @@ Index: prestring-0.9.0/prestring/tests/test_lazy_object.py
|
|||||||
- "z": t.Sequence[t.Optional[int]],
|
- "z": t.Sequence[t.Optional[int]],
|
||||||
- },
|
- },
|
||||||
- )
|
- )
|
||||||
- self.assertEqual(
|
+ import typing as t
|
||||||
- str(target),
|
+
|
||||||
- "x: int, y: 'typing.Union[int, NoneType]', z: 'typing.Sequence[typing.Union[int, NoneType]]'",
|
|
||||||
- )
|
|
||||||
- except ImportError:
|
|
||||||
- pass
|
|
||||||
+ target = self._makeOne(
|
+ target = self._makeOne(
|
||||||
+ ["x", "y", "z"],
|
+ ["x", "y", "z"],
|
||||||
+ types={
|
+ types={
|
||||||
@@ -36,13 +43,18 @@ Index: prestring-0.9.0/prestring/tests/test_lazy_object.py
|
|||||||
+ # TODO: fix, this is work-around
|
+ # TODO: fix, this is work-around
|
||||||
+ import sys
|
+ import sys
|
||||||
+
|
+
|
||||||
+ if sys.version_info[:2] >= (3, 14):
|
+ if (3, 9) > sys.version_info:
|
||||||
+ match = "x: int, y: 'int | None', z: 'typing.Sequence[int | None]'"
|
self.assertEqual(
|
||||||
+ elif sys.version_info[:2] > (3, 9):
|
str(target),
|
||||||
+ match = "x: int, y: 'typing.Optional[int]', z: 'typing.Sequence[typing.Optional[int]]'"
|
"x: int, y: 'typing.Union[int, NoneType]', z: 'typing.Sequence[typing.Union[int, NoneType]]'",
|
||||||
|
)
|
||||||
|
- except ImportError:
|
||||||
|
- pass
|
||||||
+ else:
|
+ else:
|
||||||
+ match = "x: int, y: 'typing.Union[int, NoneType]', z: 'typing.Sequence[typing.Union[int, NoneType]]'"
|
+ self.assertEqual(
|
||||||
+ self.assertEqual(str(target), match)
|
+ str(target),
|
||||||
|
+ "x: int, y: 'typing.Optional[int]', z: 'typing.Sequence[typing.Optional[int]]'",
|
||||||
|
+ )
|
||||||
|
|
||||||
|
|
||||||
@test_target("prestring:LazyKeywords")
|
@test_target("prestring:LazyKeywords")
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Tue Nov 18 03:55:44 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
|
||||||
|
|
||||||
- Rewrite py39.patch to support all Python 3 versions we ship.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 3 12:07:31 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
Tue Jun 3 12:07:31 UTC 2025 - Markéta Machová <mmachova@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-prestring
|
# spec file for package python-prestring
|
||||||
#
|
#
|
||||||
# Copyright (c) 2025 SUSE LLC and contributors
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -35,14 +35,14 @@ BuildArch: noarch
|
|||||||
BuildRequires: %{python_module evilunit}
|
BuildRequires: %{python_module evilunit}
|
||||||
BuildRequires: %{python_module typing_extensions}
|
BuildRequires: %{python_module typing_extensions}
|
||||||
# /SECTION
|
# /SECTION
|
||||||
Requires: python-typing_extensions
|
|
||||||
%python_subpackages
|
%python_subpackages
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Python source code generation library (with overuse with-syntax).
|
Python source code generation library (with overuse with-syntax).
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n prestring-%{version}
|
%setup -q -n prestring-%{version}
|
||||||
|
%autopatch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%pyproject_wheel
|
%pyproject_wheel
|
||||||
@@ -58,6 +58,6 @@ Python source code generation library (with overuse with-syntax).
|
|||||||
%doc README.rst
|
%doc README.rst
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{python_sitelib}/prestring
|
%{python_sitelib}/prestring
|
||||||
%{python_sitelib}/prestring-%{version}.dist-info
|
%{python_sitelib}/prestring-%{version}*-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
Reference in New Issue
Block a user