[gentoo-commits] repo/gentoo:master commit in: dev-python/pyicu/files/, dev-python/pyicu/

2020-06-19 Thread Marek Szuba
commit: 099700dfca77d2ba55321e870cfec12aba62f061
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 19 16:10:50 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 19 16:12:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099700df

dev-python/pyicu: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pyicu/Manifest  |  1 -
 ...cu-2.4.2-testLocaleMatcher_pytest_old_icu.patch | 17 ---
 dev-python/pyicu/pyicu-2.4.2.ebuild| 33 --
 3 files changed, 51 deletions(-)

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index cd374419579..1e7659d7cec 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,3 +1,2 @@
-DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B 
dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0
 SHA512 
3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe921903799eb23a2d55d3b1aadd758870f8bd591f143a05b
 DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 
5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af
 SHA512 
77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
 DIST PyICU-2.5.tar.gz 225591 BLAKE2B 
0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151
 SHA512 
b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548

diff --git 
a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 
b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
deleted file mode 100644
index ab1fed8dc7f..000
--- a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/test/test_LocaleMatcher.py
-+++ b/test/test_LocaleMatcher.py
-@@ -21,11 +21,13 @@
- # DEALINGS IN THE SOFTWARE.
- # 
- 
--import sys, os, six
-+import sys, os, six, pytest
- 
- from unittest import TestCase, main
- from icu import *
- 
-+@pytest.mark.skipif(ICU_VERSION < '65.0',
-+reason='ICU too old for LocaleMatcher support')
- class TestLocaleMatcher(TestCase):
- 
- def testSetSupportedLocales(self):

diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild 
b/dev-python/pyicu/pyicu-2.4.2.ebuild
deleted file mode 100644
index 330fe964470..000
--- a/dev-python/pyicu/pyicu-2.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyicu/files/, dev-python/pyicu/

2019-12-19 Thread Marek Szuba
commit: 00e35d3770dd4336bf9dc0425bd078a03cb4a099
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec 19 13:14:04 2019 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec 19 13:14:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e35d37

dev-python/pyicu: bump to 2.4.2

Now with distutils_enable_tests and better BDEPEND use!

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pyicu/Manifest  |  1 +
 ...cu-2.4.2-testLocaleMatcher_pytest_old_icu.patch | 17 ++
 dev-python/pyicu/pyicu-2.4.2.ebuild| 37 ++
 3 files changed, 55 insertions(+)

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 609c23e1f27..754cb8c3cd2 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1,3 @@
 DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 
6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78
 SHA512 
edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B 
ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c
 SHA512 
2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
+DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B 
dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0
 SHA512 
3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe921903799eb23a2d55d3b1aadd758870f8bd591f143a05b

diff --git 
a/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 
b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
new file mode 100644
index 000..ab1fed8dc7f
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch
@@ -0,0 +1,17 @@
+--- a/test/test_LocaleMatcher.py
 b/test/test_LocaleMatcher.py
+@@ -21,11 +21,13 @@
+ # DEALINGS IN THE SOFTWARE.
+ # 
+ 
+-import sys, os, six
++import sys, os, six, pytest
+ 
+ from unittest import TestCase, main
+ from icu import *
+ 
++@pytest.mark.skipif(ICU_VERSION < '65.0',
++reason='ICU too old for LocaleMatcher support')
+ class TestLocaleMatcher(TestCase):
+ 
+ def testSetSupportedLocales(self):

diff --git a/dev-python/pyicu/pyicu-2.4.2.ebuild 
b/dev-python/pyicu/pyicu-2.4.2.ebuild
new file mode 100644
index 000..f4acff57c10
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/icu:="
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+   ${RDEPEND}
+   dev-python/six
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4.2-testLocaleMatcher_pytest_old_icu.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyicu/files/, dev-python/pyicu/

2019-05-24 Thread Marek Szuba
commit: abf9a58bad090ade3360c3d1e0203dda8a55133d
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 24 09:29:29 2019 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 24 09:30:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf9a58b

dev-python/pyicu: bump to 2.3.1

Includes backported upstream workaround for python2.7 test failure.

Bug: https://bugs.gentoo.org/644226
Signed-off-by: Marek Szuba  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-python/pyicu/Manifest  |  1 +
 ...pyicu-2.3.1-testSurrogatePairs_workaround.patch | 33 +++
 dev-python/pyicu/pyicu-2.3.1.ebuild| 37 ++
 3 files changed, 71 insertions(+)

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 4696f3235b7..e1dfe1b8f09 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1,3 @@
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 
9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141
 SHA512 
b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
+DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 
6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78
 SHA512 
edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B 
ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c
 SHA512 
2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94

diff --git 
a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch 
b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
new file mode 100644
index 000..3525cc16e96
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
@@ -0,0 +1,33 @@
+--- a/test/test_Script.py
 b/test/test_Script.py
+@@ -40,12 +40,16 @@ class TestScript(TestCase):
+ if unicode_32bit:
+ self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+ else:
+-self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++self.assertTrue(
++(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++(['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+ pairs = UnicodeString(pairs)
+ # iterating UChar, not codepoints
+ names = [Script.getScript(c).getShortName() for c in pairs]
+-self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++self.assertTrue(
++(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++(['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+ # iterating codepoints not UChar
+ names = [Script.getScript(cp).getShortName()
+@@ -53,7 +57,9 @@ class TestScript(TestCase):
+ if unicode_32bit:
+ self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+ else:
+-self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++self.assertTrue(
++(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++(['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+ # iterating codepoints, not UChar
+ names = [Script.getScript(pairs.char32At(i)).getShortName()
+

diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild 
b/dev-python/pyicu/pyicu-2.3.1.ebuild
new file mode 100644
index 000..2e9d029a29e
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/icu:="
+DEPEND="${RDEPEND}
+   test? ( dev-python/pytest
+   dev-python/six )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+# This will no longer be necessary in the next release
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-testSurrogatePairs_workaround.patch )
+
+python_test() {
+   esetup.py test
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyicu/files/, dev-python/pyicu/

2016-11-28 Thread Marek Szuba
commit: c9e1ddeb17b70ce6e3fa82a8b7058b78d162064f
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Nov 28 22:42:18 2016 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Nov 28 22:42:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e1ddeb

dev-python/pyicu: remove old

Package-Manager: portage-2.3.2

 dev-python/pyicu/Manifest  |  1 -
 .../pyicu/files/pyicu-1.9.4-exclude_libicule.patch | 46 
 dev-python/pyicu/pyicu-1.9.3.ebuild| 53 --
 dev-python/pyicu/pyicu-1.9.4.ebuild| 63 --
 4 files changed, 163 deletions(-)

diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 2cf248f..79560b4 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,3 +1,2 @@
 DIST PyICU-1.9.3.tar.gz 179514 SHA256 
1a7a96212cb3e42e8df85b9062f1f1d6e207474d44f087218fad1d4ec210fa42 SHA512 
93720f6fd4131b6cff7fe89996a3851b5993c74859e85de7813883a30152b63a0065b8c51c536cd40417b6e3ccf0ec4e26ed471cec84cd48761a306a35bfd15c
 WHIRLPOOL 
97d5ff9d5a96aa98700c3048104bb79309f3b7a2e6610a03be1a1b06b23be44ffaa6ef9afb548144757421616bf2401fa4bffac6d8759a7718021abfa9fb03d0
-DIST PyICU-1.9.4.tar.gz 181149 SHA256 
bb3df41141b1cde07432906a3e9ee096407d59243ceed496957fd4bc54cd765e SHA512 
d635660e569a5c8c02d739c79806a6640ade2fcda07b826ebef5a992a64e38ee6d203e24f5f3f559c37355a78aecba1055404e3922996801b5d843328d69c8d4
 WHIRLPOOL 
b3ecb81a29bf90793e2ab3540d14b0e30663e239da77c66bf3c17959f61cee11d8bdb957cf4a7c643baa006e0850362e62a4e2be06385982b1f37ca5276cba61
 DIST PyICU-1.9.5.tar.gz 181878 SHA256 
73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b SHA512 
19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885
 WHIRLPOOL 
05e931826f445cc989d8d5ad1db10121705e685d53e8696e0befe172ee8e32895482813bcbcac105e3c8ac92ef85d8b96f79c67de35ed6547a7ccc64acee3413

diff --git a/dev-python/pyicu/files/pyicu-1.9.4-exclude_libicule.patch 
b/dev-python/pyicu/files/pyicu-1.9.4-exclude_libicule.patch
deleted file mode 100644
index 3da53af..
--- a/dev-python/pyicu/files/pyicu-1.9.4-exclude_libicule.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2cbec9f..ea42e96 100644
 a/setup.py
-+++ b/setup.py
-@@ -1,5 +1,5 @@
- 
--import os, sys
-+import os, sys, subprocess
- 
- try:
- from setuptools import setup, Extension
-@@ -8,6 +8,7 @@ except ImportError:
- 
- 
- VERSION = '1.9.4'
-+ICU_VERSION = subprocess.check_output(('icu-config', '--version')).strip()
- 
- INCLUDES = {
- 'darwin': ['/usr/local/include'],
-@@ -43,11 +44,11 @@ LFLAGS = {
- }
- 
- LIBRARIES = {
--'darwin': ['icui18n', 'icuuc', 'icudata', 'icule'],
--'linux': ['icui18n', 'icuuc', 'icudata', 'icule'],
--'freebsd': ['icui18n', 'icuuc', 'icudata', 'icule'],
--'win32': ['icuin', 'icuuc', 'icudt', 'icule'],
--'sunos5': ['icui18n', 'icuuc', 'icudata', 'icule'],
-+'darwin': ['icui18n', 'icuuc', 'icudata'],
-+'linux': ['icui18n', 'icuuc', 'icudata'],
-+'freebsd': ['icui18n', 'icuuc', 'icudata'],
-+'win32': ['icuin', 'icuuc', 'icudt'],
-+'sunos5': ['icui18n', 'icuuc', 'icudata'],
- }
- 
- platform = sys.platform
-@@ -79,6 +80,9 @@ else:
- 
- if 'PYICU_LIBRARIES' in os.environ:
- _libraries = os.environ['PYICU_LIBRARIES'].split(os.pathsep)
-+elif ((sys.version_info >= (3,) and str(ICU_VERSION, 'ascii') < '58') or
-+  (sys.version_info < (3,) and ICU_VERSION < '58')):
-+_libraries = LIBRARIES[platform][:] + ['icule']
- else:
- _libraries = LIBRARIES[platform]
- 

diff --git a/dev-python/pyicu/pyicu-1.9.3.ebuild 
b/dev-python/pyicu/pyicu-1.9.3.ebuild
deleted file mode 100644
index a2816c0..
--- a/dev-python/pyicu/pyicu-1.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
-
-inherit distutils-r1
-
-MY_PN="PyICU"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/icu
-"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/epydoc )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(CHANGES CREDITS README.md)
-
-python_compile_all() {
-   if use doc; then
-   einfo "Making documentation from ${EPYTHON} build"
-   mkdir -p doc/html || die
-   epydoc --html --verbose -o doc/html \
-   --url="${HOMEPAGE}" --name="${MY_P}" \
-   icu.py || die "Making the docs failed!"
-   fi
-}
-
-python_test() {
-   esetup.py test
-}
-
-python_install_all() {
-