[Debian-astro-commits] [python-astropy] 02/10: Use external module ply instead of convenience copy

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository python-astropy.

commit a43c8400e5a8e2cb5dcd805e97f6c376d7c889bc
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jan 6 13:03:10 2017 +0100

    Use external module ply instead of convenience copy
---
 debian/clean                      |  1 +
 debian/control                    |  2 ++
 debian/patches/external_ply.patch | 73 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 4 files changed, 77 insertions(+)

diff --git a/debian/clean b/debian/clean
index cfafb7d..47d14ea 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,4 +14,5 @@ astropy/wcs/include/docstrings.h
 astropy/wcs/include/wcsconfig.h
 astropy/wcs/src/docstrings.c
 astropy/extern/configobj/*
+astropy/extern/ply/*
 docs/api/*
diff --git a/debian/control b/debian/control
index 23764ec..c8f05fb 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: cython,
                python-matplotlib,
                python-nose,
                python-numpy (>= 1.4),
+               python-ply,
                python-pytest,
                python-scipy,
                python-setuptools (>= 0.6.4),
@@ -29,6 +30,7 @@ Build-Depends: cython,
                python3-matplotlib,
                python3-nose,
                python3-numpy (>= 1:1.6.2),
+               python3-ply,
                python3-pytest,
                python3-scipy,
                python3-setuptools (>= 0.6.4),
diff --git a/debian/patches/external_ply.patch b/debian/patches/external_ply.patch
new file mode 100644
index 0000000..5d1a8c5
--- /dev/null
+++ b/debian/patches/external_ply.patch
@@ -0,0 +1,73 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Use external module ply instead of convenience copy
+--- a/astropy/coordinates/angle_utilities.py
++++ b/astropy/coordinates/angle_utilities.py
+@@ -64,7 +64,7 @@
+ 
+     @classmethod
+     def _make_parser(cls):
+-        from ..extern.ply import lex, yacc
++        from ply import lex, yacc
+ 
+         # List of token names.
+         tokens = (
+--- a/astropy/units/format/cds.py
++++ b/astropy/units/format/cds.py
+@@ -78,7 +78,7 @@
+ 
+     @classmethod
+     def _make_lexer(cls):
+-        from ...extern.ply import lex
++        from ply import lex
+ 
+         tokens = cls._tokens
+ 
+@@ -141,7 +141,7 @@
+         <https://bitbucket.org/nxg/unity/>`_.
+         """
+ 
+-        from ...extern.ply import yacc
++        from ply import yacc
+ 
+         tokens = cls._tokens
+ 
+--- a/astropy/units/format/generic.py
++++ b/astropy/units/format/generic.py
+@@ -102,7 +102,7 @@
+ 
+     @classmethod
+     def _make_lexer(cls):
+-        from ...extern.ply import lex
++        from ply import lex
+ 
+         tokens = cls._tokens
+ 
+@@ -181,7 +181,7 @@
+         formats, the only difference being the set of available unit
+         strings.
+         """
+-        from ...extern.ply import yacc
++        from ply import yacc
+ 
+         tokens = cls._tokens
+ 
+--- a/astropy/units/format/ogip.py
++++ b/astropy/units/format/ogip.py
+@@ -110,7 +110,7 @@
+ 
+     @classmethod
+     def _make_lexer(cls):
+-        from ...extern.ply import lex
++        from ply import lex
+ 
+         tokens = cls._tokens
+ 
+@@ -179,7 +179,7 @@
+         <https://bitbucket.org/nxg/unity/>`_.
+         """
+ 
+-        from ...extern.ply import yacc
++        from ply import yacc
+ 
+         tokens = cls._tokens
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c9be4f5..0a5c608 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ only_python3-binaries.patch
 mark_known_failures.patch
 Ensure-NUMPY_LT_1_12-works-for-beta-prerelease.patch
 external_configobj.patch
+external_ply.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git