diff options
| -rw-r--r-- | dev-python/astropy/astropy-1.3.3.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch | 81 |
2 files changed, 6 insertions, 81 deletions
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild index fad05b0a7b5c..784a43072ae8 100644 --- a/dev-python/astropy/astropy-1.3.3.ebuild +++ b/dev-python/astropy/astropy-1.3.3.ebuild @@ -16,11 +16,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" +# ply-3.10 incompatible, keep bundled (bug #622802) +#rdep: dev-python/ply[${PYTHON_USEDEP}] +#prep: cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die + RDEPEND=" dev-libs/expat:0= dev-python/configobj[${PYTHON_USEDEP}] >=dev-python/numpy-1.10[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] >=sci-astronomy/erfa-1.3:0= >=sci-astronomy/wcslib-5:0= @@ -61,7 +64,6 @@ python_prepare_all() { export mydistutilsargs="--offline" export ASTROPY_USE_SYSTEM_PYTEST=True #rm -r ${PN}_helpers || die - cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die rm -r cextern/{expat,erfa,cfitsio,wcslib} || die sed -i -e '/auto_use/s/True/False/' setup.cfg || die cat >> setup.cfg <<-EOF 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 index 417960940603..5c69704df9b0 100644 --- 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 @@ -1,3 +1,5 @@ +Edit: bicatali@gentoo.org, ply-3.10 incompatible, so keep bundled. + From: Ole Streicher <olebole@debian.org> Date: Thu, 12 Jan 2017 11:37:47 +0100 Subject: Use external python modules instead of convenience copies @@ -14,19 +16,6 @@ Subject: Use external python modules instead of convenience copies astropy/units/format/ogip.py | 4 ++-- 9 files changed, 24 insertions(+), 19 deletions(-) -diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py -index cfa894e..bb8fb7d 100644 ---- a/astropy/coordinates/angle_utilities.py -+++ b/astropy/coordinates/angle_utilities.py -@@ -64,7 +64,7 @@ class _AngleParser(object): - - @classmethod - def _make_parser(cls): -- from ..extern.ply import lex, yacc -+ from ply import lex, yacc - - # List of token names. - tokens = ( diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py index 8d1bd8c..e3bb0e0 100644 --- a/astropy/extern/configobj.py @@ -128,69 +117,3 @@ index 9e88d1f..94bd40a 100644 import pytest else: -diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py -index e40c1cf..0d5e033 100644 ---- a/astropy/units/format/cds.py -+++ b/astropy/units/format/cds.py -@@ -78,7 +78,7 @@ class CDS(Base): - - @classmethod - def _make_lexer(cls): -- from ...extern.ply import lex -+ from ply import lex - - tokens = cls._tokens - -@@ -142,7 +142,7 @@ class CDS(Base): - <https://bitbucket.org/nxg/unity/>`_. - """ - -- from ...extern.ply import yacc -+ from ply import yacc - - tokens = cls._tokens - -diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py -index 6f1d0e6..8c12a2d 100644 ---- a/astropy/units/format/generic.py -+++ b/astropy/units/format/generic.py -@@ -102,7 +102,7 @@ class Generic(Base): - - @classmethod - def _make_lexer(cls): -- from ...extern.ply import lex -+ from ply import lex - - tokens = cls._tokens - -@@ -177,7 +177,7 @@ class Generic(Base): - formats, the only difference being the set of available unit - strings. - """ -- from ...extern.ply import yacc -+ from ply import yacc - - tokens = cls._tokens - -diff --git a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py -index e429407..e80e35a 100644 ---- a/astropy/units/format/ogip.py -+++ b/astropy/units/format/ogip.py -@@ -110,7 +110,7 @@ class OGIP(generic.Generic): - - @classmethod - def _make_lexer(cls): -- from ...extern.ply import lex -+ from ply import lex - - tokens = cls._tokens - -@@ -180,7 +180,7 @@ class OGIP(generic.Generic): - <https://bitbucket.org/nxg/unity/>`_. - """ - -- from ...extern.ply import yacc -+ from ply import yacc - - tokens = cls._tokens - |