1 |
commit: 4526068ac73c0fa4ae65c75063197a8824bde127 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 29 08:52:54 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 29 08:52:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4526068a |
7 |
|
8 |
dev-python/ujson: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-python/ujson/Manifest | 1 - |
14 |
dev-python/ujson/files/ujson-1.33-test-py3.patch | 38 -------------------- |
15 |
dev-python/ujson/ujson-1.33.ebuild | 45 ------------------------ |
16 |
3 files changed, 84 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest |
19 |
index c10c9b79e00..6e3b3d1940d 100644 |
20 |
--- a/dev-python/ujson/Manifest |
21 |
+++ b/dev-python/ujson/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST ujson-1.33.zip 197034 BLAKE2B 587e00292340d69fdda9720d66bb360ed646f8c709e279f905f7fdf2db79a2ec51856dce998fd3e2fe5b3bf067c72ad661f77154bc3d63cee4c3eea10bca29ec SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480 |
24 |
DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7 |
25 |
|
26 |
diff --git a/dev-python/ujson/files/ujson-1.33-test-py3.patch b/dev-python/ujson/files/ujson-1.33-test-py3.patch |
27 |
deleted file mode 100644 |
28 |
index e497f396792..00000000000 |
29 |
--- a/dev-python/ujson/files/ujson-1.33-test-py3.patch |
30 |
+++ /dev/null |
31 |
@@ -1,38 +0,0 @@ |
32 |
- tests/tests.py | 8 +++++--- |
33 |
- 1 file changed, 5 insertions(+), 3 deletions(-) |
34 |
- |
35 |
-diff --git a/tests/tests.py b/tests/tests.py |
36 |
-index d210bc6..71f8074 100644 |
37 |
---- a/tests/tests.py |
38 |
-+++ b/tests/tests.py |
39 |
-@@ -11,6 +11,7 @@ try: |
40 |
- except ImportError: |
41 |
- import simplejson as json |
42 |
- import math |
43 |
-+import nose |
44 |
- import platform |
45 |
- import sys |
46 |
- import time |
47 |
-@@ -24,9 +25,10 @@ from functools import partial |
48 |
- |
49 |
- PY3 = (sys.version_info[0] >= 3) |
50 |
- |
51 |
--def _python_ver(skip_major, skip_minor=None): |
52 |
-+def _skip_if_python_ver(skip_major, skip_minor=None): |
53 |
- major, minor = sys.version_info[:2] |
54 |
-- return major == skip_major and (skip_minor is None or minor == skip_minor) |
55 |
-+ if major == skip_major and (skip_minor is None or minor == skip_minor): |
56 |
-+ raise nose.SkipTest |
57 |
- |
58 |
- json_unicode = (json.dumps if sys.version_info[0] >= 3 |
59 |
- else partial(json.dumps, encoding="utf-8")) |
60 |
-@@ -579,8 +581,8 @@ class UltraJSONTests(TestCase): |
61 |
- input = "-31337" |
62 |
- self.assertEquals (-31337, ujson.decode(input)) |
63 |
- |
64 |
-- #@unittest.skipIf(_python_ver(3), "No exception in Python 3") |
65 |
- def test_encodeUnicode4BytesUTF8Fail(self): |
66 |
-+ _skip_if_python_ver(3) |
67 |
- input = "\xfd\xbf\xbf\xbf\xbf\xbf" |
68 |
- try: |
69 |
- enc = ujson.encode(input) |
70 |
|
71 |
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild |
72 |
deleted file mode 100644 |
73 |
index 21bf458e20f..00000000000 |
74 |
--- a/dev-python/ujson/ujson-1.33.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,45 +0,0 @@ |
77 |
-# Copyright 1999-2019 Gentoo Authors |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
- |
80 |
-EAPI=5 |
81 |
- |
82 |
-# One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5. |
83 |
-# Fix and repair and re-insert if it's REALLY needed |
84 |
-PYTHON_COMPAT=( python2_7 python3_5 ) |
85 |
- |
86 |
-inherit distutils-r1 |
87 |
- |
88 |
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python" |
89 |
-HOMEPAGE="https://pypi.org/project/ujson/" |
90 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
91 |
- |
92 |
-LICENSE="BSD" |
93 |
-SLOT="0" |
94 |
-KEYWORDS="amd64 arm x86" |
95 |
-IUSE="test" |
96 |
-RESTRICT="!test? ( test )" |
97 |
- |
98 |
-DEPEND=" |
99 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
100 |
- dev-python/nose[${PYTHON_USEDEP}] |
101 |
- app-arch/unzip" |
102 |
-RDEPEND="${DEPEND}" |
103 |
- |
104 |
-PATCHES=( |
105 |
- "${FILESDIR}"/${P}-test-py3.patch |
106 |
-) |
107 |
- |
108 |
-python_test() { |
109 |
- # See setup.py; line 72. Again "${S}" is used for reading tests |
110 |
- # Since py3_2 is first in the queue it needs its own copy |
111 |
- # or else all py2s to follow will be reading read py3 tests |
112 |
- if [[ "${EPYTHON}" =~ 'python3' ]]; then |
113 |
- cd "${BUILD_DIR}"/lib || die |
114 |
- cp -a "${S}"/tests/ . || die |
115 |
- 2to3 -w tests/tests.py || die |
116 |
- "${PYTHON}" tests/tests.py || die |
117 |
- rm -rf tests/ || die |
118 |
- else |
119 |
- "${PYTHON}" tests/tests.py || die |
120 |
- fi |
121 |
-} |