[Debian-astro-commits] [python-astropy] 07/07: Use bundled version of ply
Leo Singer
lsinger-guest at moszumanska.debian.org
Wed Apr 12 00:36:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
lsinger-guest pushed a commit to branch debian/jessie-backports
in repository python-astropy.
commit e9d11c97c7b36860c88092f4f731aff846fe9019
Author: Leo Singer <leo.singer at ligo.org>
Date: Sun Apr 9 10:13:50 2017 -0400
Use bundled version of ply
---
debian/README.source | 5 +-
debian/changelog | 2 +
debian/clean | 1 -
debian/control | 4 --
debian/copyright | 1 +
debian/patches/Use-bundled-version-of-ply.patch | 96 +++++++++++++++++++++++++
debian/patches/series | 1 +
7 files changed, 103 insertions(+), 7 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index b21f15e..c2c0d2a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,5 +3,6 @@ has been patched in order to adjust for a slight wording change in an HDF5
exception message between Jessie and Stretch.
The patch `external_python_pkgs.patch` from master has been partially
-reverted by `Use-bundled-version-of-six.patch` because there is not
-currently a sufficiently new version of python-six in jessie-backports.
+reverted by `Use-bundled-version-of-six.patch` and
+`Use-bundled-version-of-ply.patch` because there are not sufficiently
+new versions of python-six or python-ply in jessie-backports.
diff --git a/debian/changelog b/debian/changelog
index c7e37bb..2712e35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-astropy (1.3-8~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
* Use bundled version of six because jessie-backports does not have
a sufficiently new version of python-six.
+ * Use bundled version of ply because jessie-backports does not have
+ a sufficiently new version of python-ply.
* Qualify dependency on pytest >= 2.7.0 because the unit tests
make use of parameterize ids as a callable, a feature that was
added in that version. See also:
diff --git a/debian/clean b/debian/clean
index abaaffd..f0e56b7 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,7 +14,6 @@ astropy/wcs/include/docstrings.h
astropy/wcs/include/wcsconfig.h
astropy/wcs/src/docstrings.c
astropy/extern/configobj/*
-astropy/extern/ply/*
astropy/extern/js/*
astropy/extern/css/*
astropy/extern/pytest.py
diff --git a/debian/control b/debian/control
index 393276d..858f559 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: cython,
python-matplotlib,
python-nose,
python-numpy (>= 1.4),
- python-ply,
python-pytest (>= 2.7.0),
python-scipy,
python-setuptools (>= 0.6.4),
@@ -31,7 +30,6 @@ Build-Depends: cython,
python3-matplotlib,
python3-nose,
python3-numpy (>= 1:1.6.2),
- python3-ply,
python3-pytest (>= 2.7.0),
python3-scipy,
python3-setuptools (>= 0.6.4),
@@ -48,7 +46,6 @@ X-Python3-Version: >= 3.2
Package: python-astropy
Architecture: any
Depends: python-configobj,
- python-ply,
python-pytest (>= 2.7.0),
${misc:Depends},
${python:Depends},
@@ -74,7 +71,6 @@ Description: Core functionality for performing astrophysics with Python
Package: python3-astropy
Architecture: any
Depends: python3-configobj,
- python3-ply,
python3-pytest (>= 2.7.0),
${misc:Depends},
${python3:Depends},
diff --git a/debian/copyright b/debian/copyright
index 9917f98..17230b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ Files: * astropy/io/fits/*
astropy_helpers/astropy_helpers/sphinx/ext/traitsdoc.py
astropy/extern/configobj/*
astropy/extern/js/jquery.dataTables.js
+ astropy/extern/ply/*
Copyright: Copyright (c) 2011, Astropy Developers,
2004-2005 Association of Universities for Research in Astronomy,
2006 Enthought, Inc.,
diff --git a/debian/patches/Use-bundled-version-of-ply.patch b/debian/patches/Use-bundled-version-of-ply.patch
new file mode 100644
index 0000000..7b699ee
--- /dev/null
+++ b/debian/patches/Use-bundled-version-of-ply.patch
@@ -0,0 +1,96 @@
+From: Leo Singer <leo.singer at ligo.org>
+Date: Sun, 9 Apr 2017 10:05:26 -0400
+Subject: Use bundled version of ply
+
+Jessie doesn't have a sufficiently new version of python-ply,
+because astropy uses the character literals action feature that
+was added in version 3.5.
+
+This is a partial revert of the patch:
+"Use external python modules instead of convenience copies"
+---
+ astropy/coordinates/angle_utilities.py | 2 +-
+ astropy/units/format/cds.py | 4 ++--
+ astropy/units/format/generic.py | 4 ++--
+ astropy/units/format/ogip.py | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py
+index 06eefaf..ddaeaf6 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 ply import lex, yacc
++ from ..extern.ply import lex, yacc
+
+ # List of token names.
+ tokens = (
+diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py
+index d864738..ecb78e2 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 ply import lex
++ from ...extern.ply import lex
+
+ tokens = cls._tokens
+
+@@ -141,7 +141,7 @@ class CDS(Base):
+ <https://bitbucket.org/nxg/unity/>`_.
+ """
+
+- from ply import yacc
++ from ...extern.ply import yacc
+
+ tokens = cls._tokens
+
+diff --git a/astropy/units/format/generic.py b/astropy/units/format/generic.py
+index d404017..f4aa8c0 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 ply import lex
++ from ...extern.ply import lex
+
+ tokens = cls._tokens
+
+@@ -181,7 +181,7 @@ class Generic(Base):
+ formats, the only difference being the set of available unit
+ strings.
+ """
+- from ply import yacc
++ from ...extern.ply import yacc
+
+ tokens = cls._tokens
+
+diff --git a/astropy/units/format/ogip.py b/astropy/units/format/ogip.py
+index 9eed1de..7c66a6b 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 ply import lex
++ from ...extern.ply import lex
+
+ tokens = cls._tokens
+
+@@ -179,7 +179,7 @@ class OGIP(generic.Generic):
+ <https://bitbucket.org/nxg/unity/>`_.
+ """
+
+- from ply import yacc
++ from ...extern.ply import yacc
+
+ tokens = cls._tokens
+
diff --git a/debian/patches/series b/debian/patches/series
index a37864b..a9ca494 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Fix-default-value-for-remote_data-option.patch
Use-parametrize-instead-of-yield.patch
Allow-pytest-3.x-to-use-plugin-for-doctests-in-.rst-files.patch
Use-bundled-version-of-six.patch
+Use-bundled-version-of-ply.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git
More information about the Debian-astro-commits
mailing list