14
0
forked from pool/python-PyICU

14 Commits

Author SHA256 Message Date
a41b76b679 Accepting request 1307080 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1307080
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyICU?expand=0&rev=24
2025-09-26 20:24:13 +00:00
fbb6ed4223 Accepting request 1307079 from home:glaubitz:branches:devel:languages:python
- Update to 2.15.3
  * switch pl2cpa to new[]
  * replaced uses of calloc with std::unique_ptr<[]>
  * changed pl2cpa into template returning std::unique_ptr
  * switch to is_trivially_copyable for sake of g++ 15+
  * added wrapper for ES_PUNCTUATION
  * added wrapper for UProperty.DEPRECATED
  * drop trainling space from INVALID_CODE wrapper
- Drop pyicu-2.15-gcc15.patch, merged upstream

OBS-URL: https://build.opensuse.org/request/show/1307079
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=49
2025-09-25 10:59:34 +00:00
7748f10836 Accepting request 1274890 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1274890
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyICU?expand=0&rev=23
2025-05-07 17:14:57 +00:00
a831c51e40 - Update to 2.15.2
* fixed calloc/free mismatch with arg::Q() uses (Fredrik Roubert)
  * replaced all malloc/calloc/free with std::unique_ptr<T[]>
- from version 2.15.1
  * fixed build error missing conditional ICU < 70 in UnicodeSetIterator()
  * fixed Enum arg parser with broken strict aliasing rules (Jakub Wilk)
  * replaced all new[]/delete[] with std::unique_ptr<[]>, fixed leaks
  * replaced most new/delete with std::unique_ptr<>, fixed leaks
- Adjust upstream source name in spec file

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=47
2025-05-06 11:16:54 +00:00
68d8eeb857 add pyicu-2.15-gcc15.patch to fix gcc15 compile time error
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=46
2025-05-06 08:02:47 +00:00
e4c84832c0 Accepting request 1269329 from devel:languages:python
- Update to 2.15
  * fixed build error missing conditional ICU < 70 in UnicodeSetIterator()
  * fixed Enum arg parser with broken strict aliasing rules (Jakub Wilk)
- Refresh remove_six.patch

- Wrap the metadata directory name in a distro-based conditional

- Lowercase metadata directory name.

OBS-URL: https://build.opensuse.org/request/show/1269329
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyICU?expand=0&rev=22
2025-04-15 18:46:47 +00:00
4c205f07d2 Clean up the SPEC file
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=44
2025-04-14 15:00:44 +00:00
db51be6913 - Update to 2.15
* fixed build error missing conditional ICU < 70 in UnicodeSetIterator()
  * fixed Enum arg parser with broken strict aliasing rules (Jakub Wilk)
- Refresh remove_six.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=43
2025-04-14 14:54:19 +00:00
dd7c137803 - Wrap the metadata directory name in a distro-based conditional
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=42
2025-04-01 12:50:40 +00:00
c73e76b491 - Lowercase metadata directory name.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=41
2025-03-25 04:31:51 +00:00
60fc8f3386 Accepting request 1243233 from devel:languages:python
- Actually drop BuildRequires on six.

OBS-URL: https://build.opensuse.org/request/show/1243233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyICU?expand=0&rev=21
2025-02-07 21:54:33 +00:00
426c7b7374 - Actually drop BuildRequires on six.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=39
2025-02-05 02:22:36 +00:00
7179f4959b Accepting request 1222456 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1222456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-PyICU?expand=0&rev=20
2024-11-08 10:55:50 +00:00
0ee4c1631c - Update to 2.14
* added wrappers for UCPMap.get|getRange and Char.getIntPropertyMap
  * added wrapper for Locale.getUnicodeKeywordValue
  * added wrapper for UnicodeString.remove, UnicodeString.removeBetween
  * added wrapper for UnicodeString.retainBetween, UnicodeString.truncate
  * fixed bogus UBool uses on stack instead of int (Martin Jansche)
  * added support for ICU 76.1

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=37
2024-11-07 13:17:37 +00:00
5 changed files with 147 additions and 102 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4919085eaa07da12bade8ee721e7bbf7ade0151ca0f82946a26c8f4b98cdceb
size 262424

3
pyicu-2.15.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f32e78e1cb64d0aeb14f027e037a8944861d3114548818a6adf0081ef51aefc3
size 267569

View File

@@ -1,3 +1,68 @@
-------------------------------------------------------------------
Thu Sep 25 10:46:41 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.15.3
* switch pl2cpa to new[]
* replaced uses of calloc with std::unique_ptr<[]>
* changed pl2cpa into template returning std::unique_ptr
* switch to is_trivially_copyable for sake of g++ 15+
* added wrapper for ES_PUNCTUATION
* added wrapper for UProperty.DEPRECATED
* drop trainling space from INVALID_CODE wrapper
- Drop pyicu-2.15-gcc15.patch, merged upstream
-------------------------------------------------------------------
Tue May 6 09:30:09 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.15.2
* fixed calloc/free mismatch with arg::Q() uses (Fredrik Roubert)
* replaced all malloc/calloc/free with std::unique_ptr<T[]>
- from version 2.15.1
* fixed build error missing conditional ICU < 70 in UnicodeSetIterator()
* fixed Enum arg parser with broken strict aliasing rules (Jakub Wilk)
* replaced all new[]/delete[] with std::unique_ptr<[]>, fixed leaks
* replaced most new/delete with std::unique_ptr<>, fixed leaks
- Adjust upstream source name in spec file
-------------------------------------------------------------------
Tue May 6 08:34:17 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- Add pyicu-2.15-gcc15.patch to fix gcc15 compile time error
-------------------------------------------------------------------
Fri Apr 11 09:50:16 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.15
* fixed build error missing conditional ICU < 70 in UnicodeSetIterator()
* fixed Enum arg parser with broken strict aliasing rules (Jakub Wilk)
- Refresh remove_six.patch
-------------------------------------------------------------------
Tue Apr 1 12:50:14 UTC 2025 - Markéta Machová <mmachova@suse.com>
- Wrap the metadata directory name in a distro-based conditional
-------------------------------------------------------------------
Tue Mar 25 04:31:02 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Lowercase metadata directory name.
-------------------------------------------------------------------
Wed Feb 5 02:22:25 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Actually drop BuildRequires on six.
-------------------------------------------------------------------
Thu Nov 7 10:04:14 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 2.14
* added wrappers for UCPMap.get|getRange and Char.getIntPropertyMap
* added wrapper for Locale.getUnicodeKeywordValue
* added wrapper for UnicodeString.remove, UnicodeString.removeBetween
* added wrapper for UnicodeString.retainBetween, UnicodeString.truncate
* fixed bogus UBool uses on stack instead of int (Martin Jansche)
* added support for ICU 76.1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 14 08:14:34 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com> Fri Jun 14 08:14:34 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-PyICU # spec file for package python-PyICU
# #
# Copyright (c) 2024 SUSE LLC # 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
@@ -16,23 +16,21 @@
# #
%{?sle15_python_module_pythons}
%global modname PyICU %global modname PyICU
%{?sle15_python_module_pythons}
Name: python-%{modname} Name: python-%{modname}
Version: 2.13.1 Version: 2.15.3
Release: 0 Release: 0
Summary: Python Extension Wrapping the ICU C++ API Summary: Python Extension Wrapping the ICU C++ API
License: MIT License: MIT
Group: Development/Libraries/Python
URL: https://gitlab.pyicu.org URL: https://gitlab.pyicu.org
Source0: https://files.pythonhosted.org/packages/source/P/PyICU/PyICU-%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/source/p/pyicu/pyicu-%{version}.tar.gz
# PATCH-FEATURE-UPSTREAM remove_six.patch mcepl@suse.com # PATCH-FEATURE-UPSTREAM remove_six.patch mcepl@suse.com
# Remove dependency on six # Remove dependency on six
Patch0: remove_six.patch Patch0: remove_six.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module pip} BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
BuildRequires: %{python_module wheel} BuildRequires: %{python_module wheel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@@ -73,6 +71,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
%license LICENSE %license LICENSE
%doc CHANGES CREDITS README.md %doc CHANGES CREDITS README.md
%{python_sitearch}/icu %{python_sitearch}/icu
%{python_sitearch}/PyICU-%{version}*-info %{python_sitearch}/[Pp]y[Ii][Cc][Uu]-%{version}*-info
%changelog %changelog

View File

@@ -1,29 +1,12 @@
--- diff -Nru pyicu-2.15.orig/setup.py pyicu-2.15/setup.py
setup.py | 7 +++---- --- pyicu-2.15.orig/setup.py 2025-03-23 10:55:56.000000000 +0100
test/test_BytesTrie.py | 2 +- +++ pyicu-2.15/setup.py 2025-04-11 11:37:48.987583659 +0200
test/test_Charset.py | 4 ++--
test/test_Collator.py | 4 ++--
test/test_LayoutEngine.py | 2 +-
test/test_Locale.py | 2 +-
test/test_LocaleData.py | 14 +++++++-------
test/test_LocaleMatcher.py | 2 +-
test/test_PythonReplaceable.py | 2 +-
test/test_Script.py | 8 ++++----
test/test_TimeZone.py | 2 +-
test/test_Transliterator.py | 4 ++--
test/test_UCharsTrie.py | 2 +-
13 files changed, 27 insertions(+), 28 deletions(-)
Index: pyicu-2.13.1/setup.py
===================================================================
--- pyicu-2.13.1.orig/setup.py
+++ pyicu-2.13.1/setup.py
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
- -
import os, sys import os, sys
try: try:
@@ -195,7 +194,7 @@ else: @@ -195,7 +194,7 @@
except: except:
if not _cflags: if not _cflags:
raise RuntimeError(''' raise RuntimeError('''
@@ -32,7 +15,7 @@ Index: pyicu-2.13.1/setup.py
variable to the flags required by the C++ compiler to find the header files variable to the flags required by the C++ compiler to find the header files
for ICU, and possibly -std=c++11 if using ICU version >= 60 or -std=c++17 if using ICU version >= 75 for ICU, and possibly -std=c++11 if using ICU version >= 60 or -std=c++17 if using ICU version >= 75
''') ''')
@@ -234,7 +233,7 @@ else: @@ -234,7 +233,7 @@
Please install pkg-config on your system or set the PYICU_LFLAGS environment Please install pkg-config on your system or set the PYICU_LFLAGS environment
variable to the flags required by the linker to find the libraries for ICU variable to the flags required by the linker to find the libraries for ICU
''') ''')
@@ -41,16 +24,15 @@ Index: pyicu-2.13.1/setup.py
if 'PYICU_LIBRARIES' in os.environ: if 'PYICU_LIBRARIES' in os.environ:
_libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep) _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
@@ -283,4 +282,4 @@ setup(name="PyICU", @@ -283,4 +282,4 @@
libraries=_libraries)], libraries=_libraries)],
package_dir={"": "py"}, package_dir={"": "py"},
packages=['icu'], packages=['icu'],
- tests_require=['pytest', 'six']) - tests_require=['pytest', 'six'])
+ tests_require=['pytest']) + tests_require=['pytest'])
Index: pyicu-2.13.1/test/test_BytesTrie.py diff -Nru pyicu-2.15.orig/test/test_BytesTrie.py pyicu-2.15/test/test_BytesTrie.py
=================================================================== --- pyicu-2.15.orig/test/test_BytesTrie.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_BytesTrie.py +++ pyicu-2.15/test/test_BytesTrie.py 2025-04-11 11:37:48.987966786 +0200
+++ pyicu-2.13.1/test/test_BytesTrie.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# ==================================================================== # ====================================================================
@@ -60,10 +42,9 @@ Index: pyicu-2.13.1/test/test_BytesTrie.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_Charset.py diff -Nru pyicu-2.15.orig/test/test_Charset.py pyicu-2.15/test/test_Charset.py
=================================================================== --- pyicu-2.15.orig/test/test_Charset.py 2024-10-28 10:57:12.000000000 +0100
--- pyicu-2.13.1.orig/test/test_Charset.py +++ pyicu-2.15/test/test_Charset.py 2025-04-11 11:37:48.988161345 +0200
+++ pyicu-2.13.1/test/test_Charset.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# ==================================================================== # ====================================================================
# #
@@ -73,7 +54,7 @@ Index: pyicu-2.13.1/test/test_Charset.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
@@ -59,7 +59,7 @@ class TestCharset(TestCase): @@ -59,7 +59,7 @@
def testUnicode(self): def testUnicode(self):
bytes = u'beaut\xe9 probable'.encode('iso-8859-1') bytes = u'beaut\xe9 probable'.encode('iso-8859-1')
@@ -82,10 +63,9 @@ Index: pyicu-2.13.1/test/test_Charset.py
self.assertTrue(ustring.encode('iso-8859-1') == bytes) self.assertTrue(ustring.encode('iso-8859-1') == bytes)
Index: pyicu-2.13.1/test/test_Collator.py diff -Nru pyicu-2.15.orig/test/test_Collator.py pyicu-2.15/test/test_Collator.py
=================================================================== --- pyicu-2.15.orig/test/test_Collator.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_Collator.py +++ pyicu-2.15/test/test_Collator.py 2025-04-11 11:37:48.988362728 +0200
+++ pyicu-2.13.1/test/test_Collator.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# ==================================================================== # ====================================================================
# #
@@ -95,7 +75,7 @@ Index: pyicu-2.13.1/test/test_Collator.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
@@ -44,7 +44,7 @@ class TestCollator(TestCase): @@ -44,7 +44,7 @@
collator = Collator.createInstance(Locale.getFrance()) collator = Collator.createInstance(Locale.getFrance())
input = open(self.filePath('noms.txt'), 'rb') input = open(self.filePath('noms.txt'), 'rb')
@@ -104,10 +84,9 @@ Index: pyicu-2.13.1/test/test_Collator.py
input.close() input.close()
ecole = names[0] ecole = names[0]
Index: pyicu-2.13.1/test/test_LayoutEngine.py diff -Nru pyicu-2.15.orig/test/test_LayoutEngine.py pyicu-2.15/test/test_LayoutEngine.py
=================================================================== --- pyicu-2.15.orig/test/test_LayoutEngine.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_LayoutEngine.py +++ pyicu-2.15/test/test_LayoutEngine.py 2025-04-11 11:37:48.988552187 +0200
+++ pyicu-2.13.1/test/test_LayoutEngine.py
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
# ==================================================================== # ====================================================================
# #
@@ -117,23 +96,9 @@ Index: pyicu-2.13.1/test/test_LayoutEngine.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_Locale.py diff -Nru pyicu-2.15.orig/test/test_LocaleData.py pyicu-2.15/test/test_LocaleData.py
=================================================================== --- pyicu-2.15.orig/test/test_LocaleData.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_Locale.py +++ pyicu-2.15/test/test_LocaleData.py 2025-04-11 11:37:48.988916789 +0200
+++ pyicu-2.13.1/test/test_Locale.py
@@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE.
# ====================================================================
-import sys, os, six
+import sys, os
from unittest import TestCase, main
from icu import *
Index: pyicu-2.13.1/test/test_LocaleData.py
===================================================================
--- pyicu-2.13.1.orig/test/test_LocaleData.py
+++ pyicu-2.13.1/test/test_LocaleData.py
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
# #
# This is a python translation of ICU's LocaleDataTest.java # This is a python translation of ICU's LocaleDataTest.java
@@ -143,7 +108,7 @@ Index: pyicu-2.13.1/test/test_LocaleData.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
@@ -110,8 +110,8 @@ class TestLocaleData(TestCase): @@ -110,8 +110,8 @@
break break
if existsInScript == False: if existsInScript == False:
print_output("ExemplarSet containment failed for locale : "+ locale) print_output("ExemplarSet containment failed for locale : "+ locale)
@@ -154,7 +119,7 @@ Index: pyicu-2.13.1/test/test_LocaleData.py
self.assertTrue(locale + " case-folded is a superset", exemplarSets[1].containsAll(exemplarSets[0])) self.assertTrue(locale + " case-folded is a superset", exemplarSets[1].containsAll(exemplarSets[0]))
if (exemplarSets[1] == exemplarSets[0]): if (exemplarSets[1] == exemplarSets[0]):
++equalCount ++equalCount
@@ -156,10 +156,10 @@ class TestLocaleData(TestCase): @@ -156,10 +156,10 @@
if existsInScript == False and h == 0: if existsInScript == False and h == 0:
print_output("ExemplarSet containment failed for locale,option,type : " \ print_output("ExemplarSet containment failed for locale,option,type : " \
+ locale + "," + str(option) + "," + str(esType)) + locale + "," + str(option) + "," + str(esType))
@@ -169,10 +134,9 @@ Index: pyicu-2.13.1/test/test_LocaleData.py
self.assertTrue(locale + " case-folded is a superset", exemplarSets[2].containsAll(exemplarSets[0])) self.assertTrue(locale + " case-folded is a superset", exemplarSets[2].containsAll(exemplarSets[0]))
self.assertTrue(locale + " case-folder is a superset", exemplarSets[3].containsAll(exemplarSets[1])) self.assertTrue(locale + " case-folder is a superset", exemplarSets[3].containsAll(exemplarSets[1]))
if (exemplarSets[2] == exemplarSets[0]): if (exemplarSets[2] == exemplarSets[0]):
Index: pyicu-2.13.1/test/test_LocaleMatcher.py diff -Nru pyicu-2.15.orig/test/test_LocaleMatcher.py pyicu-2.15/test/test_LocaleMatcher.py
=================================================================== --- pyicu-2.15.orig/test/test_LocaleMatcher.py 2024-10-29 11:06:30.000000000 +0100
--- pyicu-2.13.1.orig/test/test_LocaleMatcher.py +++ pyicu-2.15/test/test_LocaleMatcher.py 2025-04-11 11:37:48.989158288 +0200
+++ pyicu-2.13.1/test/test_LocaleMatcher.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# ==================================================================== # ====================================================================
@@ -182,10 +146,9 @@ Index: pyicu-2.13.1/test/test_LocaleMatcher.py
from unittest import TestCase, main, SkipTest from unittest import TestCase, main, SkipTest
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_PythonReplaceable.py diff -Nru pyicu-2.15.orig/test/test_Locale.py pyicu-2.15/test/test_Locale.py
=================================================================== --- pyicu-2.15.orig/test/test_Locale.py 2023-04-14 20:45:50.000000000 +0200
--- pyicu-2.13.1.orig/test/test_PythonReplaceable.py +++ pyicu-2.15/test/test_Locale.py 2025-04-11 11:37:48.988729704 +0200
+++ pyicu-2.13.1/test/test_PythonReplaceable.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# ==================================================================== # ====================================================================
@@ -195,10 +158,33 @@ Index: pyicu-2.13.1/test/test_PythonReplaceable.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_Script.py diff -Nru pyicu-2.15.orig/test/test_PythonReplaceable.py pyicu-2.15/test/test_PythonReplaceable.py
=================================================================== --- pyicu-2.15.orig/test/test_PythonReplaceable.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_Script.py +++ pyicu-2.15/test/test_PythonReplaceable.py 2025-04-11 11:37:48.989340013 +0200
+++ pyicu-2.13.1/test/test_Script.py @@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE.
# ====================================================================
-import sys, os, six
+import sys, os
from unittest import TestCase, main
from icu import *
diff -Nru pyicu-2.15.orig/test/test_Regex.py pyicu-2.15/test/test_Regex.py
--- pyicu-2.15.orig/test/test_Regex.py 2023-08-25 22:56:17.000000000 +0200
+++ pyicu-2.15/test/test_Regex.py 2025-04-11 11:37:48.990151824 +0200
@@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE.
# ====================================================================
-import sys, os, six
+import sys, os
from unittest import TestCase, main
from icu import *
diff -Nru pyicu-2.15.orig/test/test_Script.py pyicu-2.15/test/test_Script.py
--- pyicu-2.15.orig/test/test_Script.py 2021-04-01 23:28:41.000000000 +0200
+++ pyicu-2.15/test/test_Script.py 2025-04-11 11:37:48.989518271 +0200
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# ==================================================================== # ====================================================================
# #
@@ -208,7 +194,7 @@ Index: pyicu-2.13.1/test/test_Script.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
@@ -53,7 +53,7 @@ class TestScript(TestCase): @@ -53,7 +53,7 @@
# iterating codepoints not UChar # iterating codepoints not UChar
names = [Script.getScript(cp).getShortName() names = [Script.getScript(cp).getShortName()
@@ -217,7 +203,7 @@ Index: pyicu-2.13.1/test/test_Script.py
if unicode_32bit: if unicode_32bit:
self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names) self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
else: else:
@@ -83,10 +83,10 @@ class TestScript(TestCase): @@ -83,10 +83,10 @@
self.assertEqual(str(u), char) self.assertEqual(str(u), char)
elif is_unicode_32bit(): elif is_unicode_32bit():
self.assertEqual(len(char), 1) self.assertEqual(len(char), 1)
@@ -230,10 +216,9 @@ Index: pyicu-2.13.1/test/test_Script.py
if __name__ == "__main__": if __name__ == "__main__":
main() main()
Index: pyicu-2.13.1/test/test_TimeZone.py diff -Nru pyicu-2.15.orig/test/test_TimeZone.py pyicu-2.15/test/test_TimeZone.py
=================================================================== --- pyicu-2.15.orig/test/test_TimeZone.py 2024-10-03 03:38:26.000000000 +0200
--- pyicu-2.13.1.orig/test/test_TimeZone.py +++ pyicu-2.15/test/test_TimeZone.py 2025-04-11 11:37:48.989672705 +0200
+++ pyicu-2.13.1/test/test_TimeZone.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# ==================================================================== # ====================================================================
# #
@@ -243,10 +228,9 @@ Index: pyicu-2.13.1/test/test_TimeZone.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_Transliterator.py diff -Nru pyicu-2.15.orig/test/test_Transliterator.py pyicu-2.15/test/test_Transliterator.py
=================================================================== --- pyicu-2.15.orig/test/test_Transliterator.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_Transliterator.py +++ pyicu-2.15/test/test_Transliterator.py 2025-04-11 11:37:48.989846134 +0200
+++ pyicu-2.13.1/test/test_Transliterator.py
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
# ==================================================================== # ====================================================================
# #
@@ -256,7 +240,7 @@ Index: pyicu-2.13.1/test/test_Transliterator.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
@@ -50,7 +50,7 @@ class TestTransliterator(TestCase): @@ -50,7 +50,7 @@
string = UnicodeString("Shang4hai3 zi4lai2shui3 lai2 zi4 hai3 shang4") string = UnicodeString("Shang4hai3 zi4lai2shui3 lai2 zi4 hai3 shang4")
result = u'Sh\xe0ngh\u01cei z\xecl\xe1ishu\u01d0 l\xe1i z\xec h\u01cei sh\xe0ng' result = u'Sh\xe0ngh\u01cei z\xecl\xe1ishu\u01d0 l\xe1i z\xec h\u01cei sh\xe0ng'
@@ -265,10 +249,9 @@ Index: pyicu-2.13.1/test/test_Transliterator.py
self.assertTrue(trans.transliterate(string) == result) self.assertTrue(trans.transliterate(string) == result)
self.assertTrue(string == result) self.assertTrue(string == result)
Index: pyicu-2.13.1/test/test_UCharsTrie.py diff -Nru pyicu-2.15.orig/test/test_UCharsTrie.py pyicu-2.15/test/test_UCharsTrie.py
=================================================================== --- pyicu-2.15.orig/test/test_UCharsTrie.py 2021-04-01 23:28:41.000000000 +0200
--- pyicu-2.13.1.orig/test/test_UCharsTrie.py +++ pyicu-2.15/test/test_UCharsTrie.py 2025-04-11 11:37:48.989998022 +0200
+++ pyicu-2.13.1/test/test_UCharsTrie.py
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# ==================================================================== # ====================================================================
@@ -278,11 +261,10 @@ Index: pyicu-2.13.1/test/test_UCharsTrie.py
from unittest import TestCase, main from unittest import TestCase, main
from icu import * from icu import *
Index: pyicu-2.13.1/test/test_Regex.py diff -Nru pyicu-2.15.orig/test/test_UnicodeSet.py pyicu-2.15/test/test_UnicodeSet.py
=================================================================== --- pyicu-2.15.orig/test/test_UnicodeSet.py 2024-11-16 20:41:35.000000000 +0100
--- pyicu-2.13.1.orig/test/test_Regex.py +++ pyicu-2.15/test/test_UnicodeSet.py 2025-04-11 11:38:05.928520422 +0200
+++ pyicu-2.13.1/test/test_Regex.py @@ -20,7 +20,7 @@
@@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# ==================================================================== # ====================================================================