From ead2f03508dc4f4befef12a990f86b41f36dfce36e1ea2670c1c829ffdb1b5ec Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Fri, 14 Jun 2024 08:31:06 +0000 Subject: [PATCH] - Update to 2.13.1: - change c++11 to c++17 in setup.py as current versions of ICU require it - 2.13 - fixed build issues on Windows - added wrappers for MeasureUnit(locale, width) and getUnitDisplayName() - added wrappers for DateFormatSymbols.getEra|ZodiacNames() - added wrappers for DateFormatSymbols.getZoneStrings() - added wrappers for LocaleDisplayNames - fixed bug dealloc calling wrong destructor on most types (Fredrik Roubert) - added support for ICU 75.1 - added wrappers for LocalizedNumber|Range|Formatter.withoutLocale() - added wrappers for UIdentifierType, Char.hasIDType(), Char.getIDTypes() - added wrappers for UIdentifierStatus - added wrappers for UProperty.IDENTIFIER_TYPE, UProperty.IDENTIFIER_STATUS OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyICU?expand=0&rev=35 --- PyICU-2.12.tar.gz | 3 -- PyICU-2.13.1.tar.gz | 3 ++ python-PyICU.changes | 18 +++++++++ python-PyICU.spec | 8 ++-- remove_six.patch | 93 +++++++++++++++++++++++++++++++------------- 5 files changed, 91 insertions(+), 34 deletions(-) delete mode 100644 PyICU-2.12.tar.gz create mode 100644 PyICU-2.13.1.tar.gz diff --git a/PyICU-2.12.tar.gz b/PyICU-2.12.tar.gz deleted file mode 100644 index 4fe3229..0000000 --- a/PyICU-2.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7ab5efa93ad692e6daa29cd249364e521218329221726a113ca3cb281c8611 -size 260041 diff --git a/PyICU-2.13.1.tar.gz b/PyICU-2.13.1.tar.gz new file mode 100644 index 0000000..a9939ef --- /dev/null +++ b/PyICU-2.13.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4919085eaa07da12bade8ee721e7bbf7ade0151ca0f82946a26c8f4b98cdceb +size 262424 diff --git a/python-PyICU.changes b/python-PyICU.changes index 28afbde..6154dd7 100644 --- a/python-PyICU.changes +++ b/python-PyICU.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jun 14 08:14:34 UTC 2024 - Daniel Garcia + +- Update to 2.13.1: + - change c++11 to c++17 in setup.py as current versions of ICU require it +- 2.13 + - fixed build issues on Windows + - added wrappers for MeasureUnit(locale, width) and getUnitDisplayName() + - added wrappers for DateFormatSymbols.getEra|ZodiacNames() + - added wrappers for DateFormatSymbols.getZoneStrings() + - added wrappers for LocaleDisplayNames + - fixed bug dealloc calling wrong destructor on most types (Fredrik Roubert) + - added support for ICU 75.1 + - added wrappers for LocalizedNumber|Range|Formatter.withoutLocale() + - added wrappers for UIdentifierType, Char.hasIDType(), Char.getIDTypes() + - added wrappers for UIdentifierStatus + - added wrappers for UProperty.IDENTIFIER_TYPE, UProperty.IDENTIFIER_STATUS + ------------------------------------------------------------------- Mon Dec 18 14:06:00 UTC 2023 - Dirk Müller diff --git a/python-PyICU.spec b/python-PyICU.spec index 3e2b891..3dddfcd 100644 --- a/python-PyICU.spec +++ b/python-PyICU.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-PyICU # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?sle15_python_module_pythons} %global modname PyICU Name: python-%{modname} -Version: 2.12 +Version: 2.13.1 Release: 0 Summary: Python Extension Wrapping the ICU C++ API License: MIT @@ -50,7 +50,7 @@ Python extension wrapping IBM's International Components for Unicode C++ library (ICU). %prep -%autosetup -p1 -n %{modname}-%{version} +%autosetup -p1 -n pyicu-%{version} %build export CXXFLAGS="%{optflags} -fno-strict-aliasing" diff --git a/remove_six.patch b/remove_six.patch index f902591..f442c97 100644 --- a/remove_six.patch +++ b/remove_six.patch @@ -14,8 +14,10 @@ test/test_UCharsTrie.py | 2 +- 13 files changed, 27 insertions(+), 28 deletions(-) ---- a/setup.py -+++ b/setup.py +Index: pyicu-2.13.1/setup.py +=================================================================== +--- pyicu-2.13.1.orig/setup.py ++++ pyicu-2.13.1/setup.py @@ -1,4 +1,3 @@ - import os, sys @@ -28,7 +30,7 @@ -Please install pkg-config on your system or set the PYICU_CFLAGS environment +Please install pkg-config on your system or set the PYICU_CFLAGS environment 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 + 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: Please install pkg-config on your system or set the PYICU_LFLAGS environment @@ -45,8 +47,10 @@ packages=['icu'], - tests_require=['pytest', 'six']) + tests_require=['pytest']) ---- a/test/test_BytesTrie.py -+++ b/test/test_BytesTrie.py +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 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -56,8 +60,10 @@ from unittest import TestCase, main from icu import * ---- a/test/test_Charset.py -+++ b/test/test_Charset.py +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 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -76,8 +82,10 @@ self.assertTrue(ustring.encode('iso-8859-1') == bytes) ---- a/test/test_Collator.py -+++ b/test/test_Collator.py +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 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -96,8 +104,10 @@ input.close() ecole = names[0] ---- a/test/test_LayoutEngine.py -+++ b/test/test_LayoutEngine.py +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 @@ -22,7 +22,7 @@ # ==================================================================== # @@ -107,8 +117,10 @@ from unittest import TestCase, main from icu import * ---- a/test/test_Locale.py -+++ b/test/test_Locale.py +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. # ==================================================================== @@ -118,8 +130,10 @@ from unittest import TestCase, main from icu import * ---- a/test/test_LocaleData.py -+++ b/test/test_LocaleData.py +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 @@ # # This is a python translation of ICU's LocaleDataTest.java @@ -155,8 +169,10 @@ 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]): ---- a/test/test_LocaleMatcher.py -+++ b/test/test_LocaleMatcher.py +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 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -166,8 +182,10 @@ from unittest import TestCase, main, SkipTest from icu import * ---- a/test/test_PythonReplaceable.py -+++ b/test/test_PythonReplaceable.py +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 @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ==================================================================== @@ -177,8 +195,10 @@ from unittest import TestCase, main from icu import * ---- a/test/test_Script.py -+++ b/test/test_Script.py +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 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -210,8 +230,10 @@ if __name__ == "__main__": main() ---- a/test/test_TimeZone.py -+++ b/test/test_TimeZone.py +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 @@ -21,7 +21,7 @@ # ==================================================================== # @@ -221,8 +243,10 @@ from unittest import TestCase, main from icu import * ---- a/test/test_Transliterator.py -+++ b/test/test_Transliterator.py +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 @@ -22,7 +22,7 @@ # ==================================================================== # @@ -241,8 +265,23 @@ self.assertTrue(trans.transliterate(string) == result) self.assertTrue(string == result) ---- a/test/test_UCharsTrie.py -+++ b/test/test_UCharsTrie.py +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 +@@ -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_Regex.py +=================================================================== +--- pyicu-2.13.1.orig/test/test_Regex.py ++++ pyicu-2.13.1/test/test_Regex.py @@ -21,7 +21,7 @@ # DEALINGS IN THE SOFTWARE. # ====================================================================