From 1bcce7329a2ba264714fef6663b11827411b1cfa94377b61d0a0db5331da3099 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Tue, 25 Mar 2025 04:31:51 +0000 Subject: [PATCH 1/4] - Lowercase metadata directory name. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=41 --- python-PyICU.changes | 5 +++++ python-PyICU.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-PyICU.changes b/python-PyICU.changes index a59cacc..5e2e822 100644 --- a/python-PyICU.changes +++ b/python-PyICU.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 25 04:31:02 UTC 2025 - Steve Kowalik + +- Lowercase metadata directory name. + ------------------------------------------------------------------- Wed Feb 5 02:22:25 UTC 2025 - Steve Kowalik diff --git a/python-PyICU.spec b/python-PyICU.spec index 1e6449e..7360c26 100644 --- a/python-PyICU.spec +++ b/python-PyICU.spec @@ -71,6 +71,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSE %doc CHANGES CREDITS README.md %{python_sitearch}/icu -%{python_sitearch}/PyICU-%{version}.dist-info +%{python_sitearch}/pyicu-%{version}.dist-info %changelog From 7931025e94d7ddad316704de9b12e672e311b931fd7dfea19c4da393f148387a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 1 Apr 2025 12:50:40 +0000 Subject: [PATCH 2/4] - 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 --- python-PyICU.changes | 5 +++++ python-PyICU.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-PyICU.changes b/python-PyICU.changes index 5e2e822..8d1f67b 100644 --- a/python-PyICU.changes +++ b/python-PyICU.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 1 12:50:14 UTC 2025 - Markéta Machová + +- Wrap the metadata directory name in a distro-based conditional + ------------------------------------------------------------------- Tue Mar 25 04:31:02 UTC 2025 - Steve Kowalik diff --git a/python-PyICU.spec b/python-PyICU.spec index 7360c26..1377e1e 100644 --- a/python-PyICU.spec +++ b/python-PyICU.spec @@ -71,6 +71,10 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSE %doc CHANGES CREDITS README.md %{python_sitearch}/icu +%if 0%{?suse_version} > 1600 %{python_sitearch}/pyicu-%{version}.dist-info +%else +%{python_sitearch}/PyICU-%{version}.dist-info +%endif %changelog From 0336a75692fc48926311241178e72e53ad484fabf925e028a426029767e2a2a9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 14 Apr 2025 14:54:19 +0000 Subject: [PATCH 3/4] Accepting request 1268579 from home:glaubitz:branches: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 OBS-URL: https://build.opensuse.org/request/show/1268579 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=43 --- PyICU-2.14.tar.gz | 3 - PyICU-2.15.tar.gz | 3 + python-PyICU.changes | 8 +++ python-PyICU.spec | 2 +- remove_six.patch | 166 +++++++++++++++++++------------------------ 5 files changed, 86 insertions(+), 96 deletions(-) delete mode 100644 PyICU-2.14.tar.gz create mode 100644 PyICU-2.15.tar.gz diff --git a/PyICU-2.14.tar.gz b/PyICU-2.14.tar.gz deleted file mode 100644 index c7f4be0..0000000 --- a/PyICU-2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acc7eb92bd5c554ed577249c6978450a4feda0aa6f01470152b3a7b382a02132 -size 263912 diff --git a/PyICU-2.15.tar.gz b/PyICU-2.15.tar.gz new file mode 100644 index 0000000..b05e239 --- /dev/null +++ b/PyICU-2.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:241bf4e73851524af67fea5d94ff60bac83dd98ce3ef6fd6f2c00e07e8476c87 +size 267399 diff --git a/python-PyICU.changes b/python-PyICU.changes index 8d1f67b..86add55 100644 --- a/python-PyICU.changes +++ b/python-PyICU.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 11 09:50:16 UTC 2025 - John Paul Adrian Glaubitz + +- 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á diff --git a/python-PyICU.spec b/python-PyICU.spec index 1377e1e..68fe701 100644 --- a/python-PyICU.spec +++ b/python-PyICU.spec @@ -19,7 +19,7 @@ %{?sle15_python_module_pythons} %global modname PyICU Name: python-%{modname} -Version: 2.14 +Version: 2.15 Release: 0 Summary: Python Extension Wrapping the ICU C++ API License: MIT diff --git a/remove_six.patch b/remove_six.patch index f442c97..508f1eb 100644 --- a/remove_six.patch +++ b/remove_six.patch @@ -1,29 +1,12 @@ ---- - setup.py | 7 +++---- - test/test_BytesTrie.py | 2 +- - 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 +diff -Nru pyicu-2.15.orig/setup.py pyicu-2.15/setup.py +--- pyicu-2.15.orig/setup.py 2025-03-23 10:55:56.000000000 +0100 ++++ pyicu-2.15/setup.py 2025-04-11 11:37:48.987583659 +0200 @@ -1,4 +1,3 @@ - import os, sys try: -@@ -195,7 +194,7 @@ else: +@@ -195,7 +194,7 @@ except: if not _cflags: 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 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 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: _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep) -@@ -283,4 +282,4 @@ setup(name="PyICU", +@@ -283,4 +282,4 @@ libraries=_libraries)], package_dir={"": "py"}, packages=['icu'], - tests_require=['pytest', 'six']) + tests_require=['pytest']) -Index: pyicu-2.13.1/test/test_BytesTrie.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_BytesTrie.py -+++ 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.15/test/test_BytesTrie.py 2025-04-11 11:37:48.987966786 +0200 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -60,10 +42,9 @@ Index: pyicu-2.13.1/test/test_BytesTrie.py from unittest import TestCase, main from icu import * -Index: pyicu-2.13.1/test/test_Charset.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Charset.py -+++ 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.15/test/test_Charset.py 2025-04-11 11:37:48.988161345 +0200 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -73,7 +54,7 @@ Index: pyicu-2.13.1/test/test_Charset.py from unittest import TestCase, main from icu import * -@@ -59,7 +59,7 @@ class TestCharset(TestCase): +@@ -59,7 +59,7 @@ def testUnicode(self): 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) -Index: pyicu-2.13.1/test/test_Collator.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Collator.py -+++ 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.15/test/test_Collator.py 2025-04-11 11:37:48.988362728 +0200 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -95,7 +75,7 @@ Index: pyicu-2.13.1/test/test_Collator.py from unittest import TestCase, main from icu import * -@@ -44,7 +44,7 @@ class TestCollator(TestCase): +@@ -44,7 +44,7 @@ collator = Collator.createInstance(Locale.getFrance()) input = open(self.filePath('noms.txt'), 'rb') @@ -104,10 +84,9 @@ Index: pyicu-2.13.1/test/test_Collator.py input.close() ecole = names[0] -Index: pyicu-2.13.1/test/test_LayoutEngine.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_LayoutEngine.py -+++ 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.15/test/test_LayoutEngine.py 2025-04-11 11:37:48.988552187 +0200 @@ -22,7 +22,7 @@ # ==================================================================== # @@ -117,23 +96,9 @@ Index: pyicu-2.13.1/test/test_LayoutEngine.py from unittest import TestCase, main from icu import * -Index: pyicu-2.13.1/test/test_Locale.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Locale.py -+++ 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 +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.15/test/test_LocaleData.py 2025-04-11 11:37:48.988916789 +0200 @@ -22,7 +22,7 @@ # # 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 icu import * -@@ -110,8 +110,8 @@ class TestLocaleData(TestCase): +@@ -110,8 +110,8 @@ break if existsInScript == False: 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])) if (exemplarSets[1] == exemplarSets[0]): ++equalCount -@@ -156,10 +156,10 @@ class TestLocaleData(TestCase): +@@ -156,10 +156,10 @@ if existsInScript == False and h == 0: print_output("ExemplarSet containment failed for locale,option,type : " \ + 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-folder is a superset", exemplarSets[3].containsAll(exemplarSets[1])) if (exemplarSets[2] == exemplarSets[0]): -Index: pyicu-2.13.1/test/test_LocaleMatcher.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_LocaleMatcher.py -+++ 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.15/test/test_LocaleMatcher.py 2025-04-11 11:37:48.989158288 +0200 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -182,10 +146,9 @@ Index: pyicu-2.13.1/test/test_LocaleMatcher.py from unittest import TestCase, main, SkipTest from icu import * -Index: pyicu-2.13.1/test/test_PythonReplaceable.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_PythonReplaceable.py -+++ 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.15/test/test_Locale.py 2025-04-11 11:37:48.988729704 +0200 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -195,10 +158,33 @@ Index: pyicu-2.13.1/test/test_PythonReplaceable.py from unittest import TestCase, main from icu import * -Index: pyicu-2.13.1/test/test_Script.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Script.py -+++ 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.15/test/test_PythonReplaceable.py 2025-04-11 11:37:48.989340013 +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_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 @@ # ==================================================================== # @@ -208,7 +194,7 @@ Index: pyicu-2.13.1/test/test_Script.py from unittest import TestCase, main from icu import * -@@ -53,7 +53,7 @@ class TestScript(TestCase): +@@ -53,7 +53,7 @@ # iterating codepoints not UChar names = [Script.getScript(cp).getShortName() @@ -217,7 +203,7 @@ Index: pyicu-2.13.1/test/test_Script.py if unicode_32bit: self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names) else: -@@ -83,10 +83,10 @@ class TestScript(TestCase): +@@ -83,10 +83,10 @@ self.assertEqual(str(u), char) elif is_unicode_32bit(): self.assertEqual(len(char), 1) @@ -230,10 +216,9 @@ Index: pyicu-2.13.1/test/test_Script.py if __name__ == "__main__": main() -Index: pyicu-2.13.1/test/test_TimeZone.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_TimeZone.py -+++ 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.15/test/test_TimeZone.py 2025-04-11 11:37:48.989672705 +0200 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -243,10 +228,9 @@ Index: pyicu-2.13.1/test/test_TimeZone.py from unittest import TestCase, main from icu import * -Index: pyicu-2.13.1/test/test_Transliterator.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Transliterator.py -+++ 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.15/test/test_Transliterator.py 2025-04-11 11:37:48.989846134 +0200 @@ -22,7 +22,7 @@ # ==================================================================== # @@ -256,7 +240,7 @@ Index: pyicu-2.13.1/test/test_Transliterator.py from unittest import TestCase, main from icu import * -@@ -50,7 +50,7 @@ class TestTransliterator(TestCase): +@@ -50,7 +50,7 @@ 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' @@ -265,10 +249,9 @@ Index: pyicu-2.13.1/test/test_Transliterator.py self.assertTrue(trans.transliterate(string) == result) self.assertTrue(string == result) -Index: pyicu-2.13.1/test/test_UCharsTrie.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_UCharsTrie.py -+++ 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.15/test/test_UCharsTrie.py 2025-04-11 11:37:48.989998022 +0200 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -278,11 +261,10 @@ Index: pyicu-2.13.1/test/test_UCharsTrie.py from unittest import TestCase, main from icu import * -Index: pyicu-2.13.1/test/test_Regex.py -=================================================================== ---- pyicu-2.13.1.orig/test/test_Regex.py -+++ pyicu-2.13.1/test/test_Regex.py -@@ -21,7 +21,7 @@ +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.15/test/test_UnicodeSet.py 2025-04-11 11:38:05.928520422 +0200 +@@ -20,7 +20,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== From b3d990a486de0aafca3aa1f52403017ae236bfa8dc28d0d6b9a5f04f4b77fcb5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 14 Apr 2025 15:00:44 +0000 Subject: [PATCH 4/4] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=44 --- python-PyICU.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/python-PyICU.spec b/python-PyICU.spec index 68fe701..2f51eb3 100644 --- a/python-PyICU.spec +++ b/python-PyICU.spec @@ -16,8 +16,8 @@ # -%{?sle15_python_module_pythons} %global modname PyICU +%{?sle15_python_module_pythons} Name: python-%{modname} Version: 2.15 Release: 0 @@ -71,10 +71,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSE %doc CHANGES CREDITS README.md %{python_sitearch}/icu -%if 0%{?suse_version} > 1600 -%{python_sitearch}/pyicu-%{version}.dist-info -%else -%{python_sitearch}/PyICU-%{version}.dist-info -%endif +%{python_sitearch}/[Pp]y[Ii][Cc][Uu]-%{version}*-info %changelog