1 |
commit: a77a5e53e7edf95d22f91756354e10a38282bd59 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 28 01:54:46 2017 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 28 19:07:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77a5e53 |
7 |
|
8 |
dev-python/xdis: Version bump, remove older versions not compatible with python-3.5.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2_p30 |
11 |
|
12 |
dev-python/xdis/Manifest | 2 - |
13 |
.../xdis/files/xdis-test_magic_bytes_error.patch | 24 ++++++++++++ |
14 |
dev-python/xdis/xdis-2.3.1.ebuild | 45 ---------------------- |
15 |
dev-python/xdis/xdis-3.2.3.ebuild | 45 ---------------------- |
16 |
dev-python/xdis/xdis-3.2.4.ebuild | 6 ++- |
17 |
5 files changed, 28 insertions(+), 94 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest |
20 |
index d32e9cf2363..6aea180d09e 100644 |
21 |
--- a/dev-python/xdis/Manifest |
22 |
+++ b/dev-python/xdis/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST xdis-2.3.1.tar.gz 69207 SHA256 9b28426a5b476b6740b83063604de7ef4af8b721a5da5894145fbae8921d25ae SHA512 5015914a13296d04e71050c2e916fd5770bfe8bba1f92bf3c64bca06365ea7547cbb216d7cfca19fdcef60af3943fa4ba4e7c27895b1da9c6240daf990051927 WHIRLPOOL c30ae717289c73069efbdb70cdd6388bb009e945c967de53b159aa2f8a606cdca8e28b265b4da56b7f77ab01b8a415b8d8d8b7e1b972370121ab86b18d8921e7 |
25 |
-DIST xdis-3.2.3.tar.gz 126710 SHA256 2e11b7dfafc02ce28da15f1d1bed327384ec34333d4a03e76cee8c1840897a5e SHA512 ce4e2ad09c1d13b2ab35b931ceedb8d08ec2f81dc2a34f50f854e6a4aca5efe857b56d6c2f1dbd73ae12d4ec9e2b0cc8e20c08873e87e4b0ca80fac229cebe06 WHIRLPOOL 1f553c3c57df5419b42ef6c94f7b78b5cbac14615d2d4066234420acd925b83df851332485a16ec8cace9ee5182b21b5bc1fc2fad7199ff4d6f17ce7de189cdb |
26 |
DIST xdis-3.2.4.tar.gz 127507 SHA256 b311253b97a321ab45625089a729ccbf8bcb1319a8c4c0167b719f81c081543c SHA512 6c9274e10f2a41ab4a173c8ae4462374fc7ab444a589ab572172550d0f5284906f7d9c9cf4a640f163f6012d17f40bc5e1c36e5963f8b6106a9c37e420027a97 WHIRLPOOL 5a0910f04e3d9ec70129d5d3b659fe06034e7a6298692d2a776f2616a8b895a539efa7f96972b2adc6986c2475e697552ea071d33bdd22c60bb1e0fec1950dd4 |
27 |
|
28 |
diff --git a/dev-python/xdis/files/xdis-test_magic_bytes_error.patch b/dev-python/xdis/files/xdis-test_magic_bytes_error.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..560f58b7611 |
31 |
--- /dev/null |
32 |
+++ b/dev-python/xdis/files/xdis-test_magic_bytes_error.patch |
33 |
@@ -0,0 +1,24 @@ |
34 |
+From 8aa4a91d664380395f08b0ccd4aa944d53a21e55 Mon Sep 17 00:00:00 2001 |
35 |
+From: Brian Dolbec <dolsen@g.o> |
36 |
+Date: Mon, 27 Mar 2017 18:13:00 -0700 |
37 |
+Subject: [PATCH] test_unit/test_magic.py: Add python-3.5.3 magic |
38 |
+ |
39 |
+--- |
40 |
+ xdis/magics.py | 1 + |
41 |
+ 1 file changed, 1 insertion(+) |
42 |
+ |
43 |
+diff --git a/xdis/magics.py b/xdis/magics.py |
44 |
+index 6a58040..571f0ea 100755 |
45 |
+--- a/xdis/magics.py |
46 |
++++ b/xdis/magics.py |
47 |
+@@ -103,6 +103,7 @@ versions = { |
48 |
+ int2magic(3300): '3.4a4+', # more changes to __qualname__ computation |
49 |
+ int2magic(3310): '3.4rc2', # alter __qualname__ computation |
50 |
+ int2magic(3350): '3.5', # 3.5.0, 3.5.1, 3.5.2 |
51 |
++ int2magic(3351): '3.5.3', # 3.5.3 |
52 |
+ int2magic(3361): '3.6.0a1', # 3.6.0a1 |
53 |
+ int2magic(3370): '3.6.0a1+1', # 3.6.0a? |
54 |
+ int2magic(3370): '3.6.0a1+2', # |
55 |
+-- |
56 |
+2.12.1 |
57 |
+ |
58 |
|
59 |
diff --git a/dev-python/xdis/xdis-2.3.1.ebuild b/dev-python/xdis/xdis-2.3.1.ebuild |
60 |
deleted file mode 100644 |
61 |
index 73346d881de..00000000000 |
62 |
--- a/dev-python/xdis/xdis-2.3.1.ebuild |
63 |
+++ /dev/null |
64 |
@@ -1,45 +0,0 @@ |
65 |
-# Copyright 1999-2016 Gentoo Foundation |
66 |
-# Distributed under the terms of the GNU General Public License v2 |
67 |
- |
68 |
-EAPI=6 |
69 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy) |
70 |
- |
71 |
-inherit distutils-r1 |
72 |
- |
73 |
-DESCRIPTION="Python cross-version byte-code disassembler and marshal routines" |
74 |
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis" |
75 |
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" |
76 |
- |
77 |
-LICENSE="MIT" |
78 |
-SLOT="0" |
79 |
-KEYWORDS="~amd64 ~x86" |
80 |
-IUSE="test" |
81 |
- |
82 |
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]" |
83 |
-DEPEND=" |
84 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
85 |
- test? ( |
86 |
- >=dev-python/nose-1.0[${PYTHON_USEDEP}] |
87 |
- dev-python/mock[${PYTHON_USEDEP}] |
88 |
- dev-python/pytest[${PYTHON_USEDEP}] |
89 |
- ) |
90 |
-" |
91 |
- |
92 |
-python_prepare_all() { |
93 |
- # Remove the 3.3 specific code from being run |
94 |
- rm -R "test_unit/3.3" || die |
95 |
- # Remove an unconditional test only dep |
96 |
- sed \ |
97 |
- -e "s/setup_requires/tests_require/" \ |
98 |
- -i setup.py |
99 |
- distutils-r1_python_prepare_all |
100 |
-} |
101 |
- |
102 |
-python_test() { |
103 |
- PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \ |
104 |
- py.test -v || die "Tests failed under ${EPYTHON}" |
105 |
- cd test |
106 |
- PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \ |
107 |
- ${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \ |
108 |
- "Tests failed under ${EPYTHON}" |
109 |
-} |
110 |
|
111 |
diff --git a/dev-python/xdis/xdis-3.2.3.ebuild b/dev-python/xdis/xdis-3.2.3.ebuild |
112 |
deleted file mode 100644 |
113 |
index 535c7010aff..00000000000 |
114 |
--- a/dev-python/xdis/xdis-3.2.3.ebuild |
115 |
+++ /dev/null |
116 |
@@ -1,45 +0,0 @@ |
117 |
-# Copyright 1999-2016 Gentoo Foundation |
118 |
-# Distributed under the terms of the GNU General Public License v2 |
119 |
- |
120 |
-EAPI=6 |
121 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy) |
122 |
- |
123 |
-inherit distutils-r1 |
124 |
- |
125 |
-DESCRIPTION="Python cross-version byte-code disassembler and marshal routines" |
126 |
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis" |
127 |
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" |
128 |
- |
129 |
-LICENSE="MIT" |
130 |
-SLOT="0" |
131 |
-KEYWORDS="~amd64 ~x86" |
132 |
-IUSE="test" |
133 |
- |
134 |
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]" |
135 |
-DEPEND=" |
136 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
137 |
- test? ( |
138 |
- >=dev-python/nose-1.0[${PYTHON_USEDEP}] |
139 |
- dev-python/mock[${PYTHON_USEDEP}] |
140 |
- dev-python/pytest[${PYTHON_USEDEP}] |
141 |
- ) |
142 |
-" |
143 |
- |
144 |
-python_prepare_all() { |
145 |
- # Fix an unconditional test only dep |
146 |
- sed \ |
147 |
- -e "s/setup_requires/tests_require/" \ |
148 |
- -i setup.py |
149 |
- distutils-r1_python_prepare_all |
150 |
-} |
151 |
- |
152 |
-python_test() { |
153 |
- # Need to rm any pyc files to prevent test failures. |
154 |
- rm -R "${S}"/test/__pycache__ |
155 |
- PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \ |
156 |
- py.test -v || die "Tests failed under ${EPYTHON}" |
157 |
- cd test |
158 |
- PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \ |
159 |
- ${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \ |
160 |
- "Tests failed under ${EPYTHON}" |
161 |
-} |
162 |
|
163 |
diff --git a/dev-python/xdis/xdis-3.2.4.ebuild b/dev-python/xdis/xdis-3.2.4.ebuild |
164 |
index 4b6a2f74208..f1ec7b951a7 100644 |
165 |
--- a/dev-python/xdis/xdis-3.2.4.ebuild |
166 |
+++ b/dev-python/xdis/xdis-3.2.4.ebuild |
167 |
@@ -1,8 +1,8 @@ |
168 |
-# Copyright 1999-2016 Gentoo Foundation |
169 |
+# Copyright 1999-2017 Gentoo Foundation |
170 |
# Distributed under the terms of the GNU General Public License v2 |
171 |
|
172 |
EAPI=6 |
173 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy) |
174 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy) |
175 |
|
176 |
inherit distutils-r1 |
177 |
|
178 |
@@ -25,6 +25,8 @@ DEPEND=" |
179 |
) |
180 |
" |
181 |
|
182 |
+PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch" ) |
183 |
+ |
184 |
python_prepare_all() { |
185 |
# Fix an unconditional test only dep |
186 |
sed \ |