1 |
commit: cfe66eaac18ce62aad4e6c441e41ff2efd86ba57 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 16:58:48 2017 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 28 04:00:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe66eaa |
7 |
|
8 |
dev-python/astropy: ply-3.10 is not compatible, so to simplify, keep bundled ply. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
dev-python/astropy/astropy-1.3.3.ebuild | 6 +- |
13 |
.../files/astropy-1.3.3-external-python-pkgs.patch | 81 +--------------------- |
14 |
2 files changed, 6 insertions(+), 81 deletions(-) |
15 |
|
16 |
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild |
17 |
index fad05b0a7b5..784a43072ae 100644 |
18 |
--- a/dev-python/astropy/astropy-1.3.3.ebuild |
19 |
+++ b/dev-python/astropy/astropy-1.3.3.ebuild |
20 |
@@ -16,11 +16,14 @@ SLOT="0" |
21 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
22 |
IUSE="doc test" |
23 |
|
24 |
+# ply-3.10 incompatible, keep bundled (bug #622802) |
25 |
+#rdep: dev-python/ply[${PYTHON_USEDEP}] |
26 |
+#prep: cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die |
27 |
+ |
28 |
RDEPEND=" |
29 |
dev-libs/expat:0= |
30 |
dev-python/configobj[${PYTHON_USEDEP}] |
31 |
>=dev-python/numpy-1.10[${PYTHON_USEDEP}] |
32 |
- dev-python/ply[${PYTHON_USEDEP}] |
33 |
dev-python/six[${PYTHON_USEDEP}] |
34 |
>=sci-astronomy/erfa-1.3:0= |
35 |
>=sci-astronomy/wcslib-5:0= |
36 |
@@ -61,7 +64,6 @@ python_prepare_all() { |
37 |
export mydistutilsargs="--offline" |
38 |
export ASTROPY_USE_SYSTEM_PYTEST=True |
39 |
#rm -r ${PN}_helpers || die |
40 |
- cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die |
41 |
rm -r cextern/{expat,erfa,cfitsio,wcslib} || die |
42 |
sed -i -e '/auto_use/s/True/False/' setup.cfg || die |
43 |
cat >> setup.cfg <<-EOF |
44 |
|
45 |
diff --git a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch |
46 |
index 41796094060..5c69704df9b 100644 |
47 |
--- a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch |
48 |
+++ b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch |
49 |
@@ -1,3 +1,5 @@ |
50 |
+Edit: bicatali@g.o, ply-3.10 incompatible, so keep bundled. |
51 |
+ |
52 |
From: Ole Streicher <olebole@××××××.org> |
53 |
Date: Thu, 12 Jan 2017 11:37:47 +0100 |
54 |
Subject: Use external python modules instead of convenience copies |
55 |
@@ -14,19 +16,6 @@ Subject: Use external python modules instead of convenience copies |
56 |
astropy/units/format/ogip.py | 4 ++-- |
57 |
9 files changed, 24 insertions(+), 19 deletions(-) |
58 |
|
59 |
-diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py |
60 |
-index cfa894e..bb8fb7d 100644 |
61 |
---- a/astropy/coordinates/angle_utilities.py |
62 |
-+++ b/astropy/coordinates/angle_utilities.py |
63 |
-@@ -64,7 +64,7 @@ class _AngleParser(object): |
64 |
- |
65 |
- @classmethod |
66 |
- def _make_parser(cls): |
67 |
-- from ..extern.ply import lex, yacc |
68 |
-+ from ply import lex, yacc |
69 |
- |
70 |
- # List of token names. |
71 |
- tokens = ( |
72 |
diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py |
73 |
index 8d1bd8c..e3bb0e0 100644 |
74 |
--- a/astropy/extern/configobj.py |
75 |
@@ -128,69 +117,3 @@ index 9e88d1f..94bd40a 100644 |
76 |
import pytest |
77 |
|
78 |
else: |
79 |
-diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py |
80 |
-index e40c1cf..0d5e033 100644 |
81 |
---- a/astropy/units/format/cds.py |
82 |
-+++ b/astropy/units/format/cds.py |
83 |
-@@ -78,7 +78,7 @@ class CDS(Base): |
84 |
- |
85 |
- @classmethod |
86 |
- def _make_lexer(cls): |
87 |
-- from ...extern.ply import lex |
88 |
-+ from ply import lex |
89 |
- |
90 |
- tokens = cls._tokens |
91 |
- |
92 |
-@@ -142,7 +142,7 @@ class CDS(Base): |
93 |
- <https://bitbucket.org/nxg/unity/>`_. |
94 |
- """ |
95 |
- |
96 |
-- from ...extern.ply import yacc |
97 |
-+ from ply import yacc |
98 |
- |
99 |
- tokens = cls._tokens |
100 |
- |
101 |
-diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py |
102 |
-index 6f1d0e6..8c12a2d 100644 |
103 |
---- a/astropy/units/format/generic.py |
104 |
-+++ b/astropy/units/format/generic.py |
105 |
-@@ -102,7 +102,7 @@ class Generic(Base): |
106 |
- |
107 |
- @classmethod |
108 |
- def _make_lexer(cls): |
109 |
-- from ...extern.ply import lex |
110 |
-+ from ply import lex |
111 |
- |
112 |
- tokens = cls._tokens |
113 |
- |
114 |
-@@ -177,7 +177,7 @@ class Generic(Base): |
115 |
- formats, the only difference being the set of available unit |
116 |
- strings. |
117 |
- """ |
118 |
-- from ...extern.ply import yacc |
119 |
-+ from ply import yacc |
120 |
- |
121 |
- tokens = cls._tokens |
122 |
- |
123 |
-diff --git a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py |
124 |
-index e429407..e80e35a 100644 |
125 |
---- a/astropy/units/format/ogip.py |
126 |
-+++ b/astropy/units/format/ogip.py |
127 |
-@@ -110,7 +110,7 @@ class OGIP(generic.Generic): |
128 |
- |
129 |
- @classmethod |
130 |
- def _make_lexer(cls): |
131 |
-- from ...extern.ply import lex |
132 |
-+ from ply import lex |
133 |
- |
134 |
- tokens = cls._tokens |
135 |
- |
136 |
-@@ -180,7 +180,7 @@ class OGIP(generic.Generic): |
137 |
- <https://bitbucket.org/nxg/unity/>`_. |
138 |
- """ |
139 |
- |
140 |
-- from ...extern.ply import yacc |
141 |
-+ from ply import yacc |
142 |
- |
143 |
- tokens = cls._tokens |
144 |
- |