[Debian-astro-commits] [python-astropy] 06/10: Fix debian/patches/external_python_pkgs.patch syntax
Ole Streicher
olebole at moszumanska.debian.org
Thu Jan 12 12:16:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository python-astropy.
commit 8635c6698be88a582f4ef60f501118c231fec229
Author: Ole Streicher <olebole at debian.org>
Date: Thu Jan 12 11:39:30 2017 +0100
Fix debian/patches/external_python_pkgs.patch syntax
---
debian/patches/external_python_pkgs.patch | 191 +++++++++++++++++-------------
1 file changed, 110 insertions(+), 81 deletions(-)
diff --git a/debian/patches/external_python_pkgs.patch b/debian/patches/external_python_pkgs.patch
index d694166..33df90a 100644
--- a/debian/patches/external_python_pkgs.patch
+++ b/debian/patches/external_python_pkgs.patch
@@ -1,20 +1,23 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use external python modules instead of convenience copies
---- a/astropy/extern/configobj.py
-+++ b/astropy/extern/configobj.py
-@@ -7,5 +7,8 @@
- Also, this should actually never actually show up as a docstring, because
- it should get overwritten by the appropriate configobj docstring.
- """
-+from __future__ import absolute_import
-+import validate
-+import configobj
-+
-
--from .configobj import configobj, validate, __doc__
+From: Ole Streicher <olebole at debian.org>
+Date: Thu, 12 Jan 2017 11:37:47 +0100
+Subject: Use external python modules instead of convenience copies
+
+---
+ astropy/coordinates/angle_utilities.py | 2 +-
+ astropy/extern/configobj.py | 5 ++++-
+ astropy/extern/six.py | 2 +-
+ astropy/table/jsviewer.py | 14 ++++++++------
+ astropy/table/tests/test_jsviewer.py | 6 +++---
+ astropy/units/format/cds.py | 4 ++--
+ astropy/units/format/generic.py | 4 ++--
+ astropy/units/format/ogip.py | 4 ++--
+ 8 files changed, 23 insertions(+), 18 deletions(-)
+
+diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py
+index ddaeaf6..06eefaf 100644
--- a/astropy/coordinates/angle_utilities.py
+++ b/astropy/coordinates/angle_utilities.py
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ class _AngleParser(object):
@classmethod
def _make_parser(cls):
@@ -23,69 +26,25 @@ Description: Use external python modules instead of convenience copies
# 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/astropy/extern/configobj.py b/astropy/extern/configobj.py
+index 8d1bd8c..e3bb0e0 100644
+--- a/astropy/extern/configobj.py
++++ b/astropy/extern/configobj.py
+@@ -7,5 +7,8 @@ currently installed version of python.
+ Also, this should actually never actually show up as a docstring, because
+ it should get overwritten by the appropriate configobj docstring.
+ """
++from __future__ import absolute_import
++import validate
++import configobj
++
+-from .configobj import configobj, validate, __doc__
+diff --git a/astropy/extern/six.py b/astropy/extern/six.py
+index 5398fc0..fb3a30c 100644
--- a/astropy/extern/six.py
+++ b/astropy/extern/six.py
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0')
# Update this to prevent Astropy from using its bundled copy of six
# (but only if some other version of at least _SIX_MIN_VERSION can
# be provided)
@@ -94,9 +53,11 @@ Description: Use external python modules instead of convenience copies
def _find_module(name, path=None):
+diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py
+index ae99eb9..d856cf8 100644
--- a/astropy/table/jsviewer.py
+++ b/astropy/table/jsviewer.py
-@@ -30,8 +30,8 @@
+@@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace):
conf = Conf()
@@ -107,7 +68,7 @@ Description: Use external python modules instead of convenience copies
IPYNB_JS_SCRIPT = """
<script>
-@@ -108,22 +108,24 @@
+@@ -108,22 +108,24 @@ class JSViewer(object):
@property
def jquery_urls(self):
if self._use_local_files:
@@ -136,18 +97,86 @@ Description: Use external python modules instead of convenience copies
else:
return conf.datatables_url[:-3]
+diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py
+index af04b7e..e02d4be 100644
--- a/astropy/table/tests/test_jsviewer.py
+++ b/astropy/table/tests/test_jsviewer.py
-@@ -127,9 +127,9 @@
+@@ -127,9 +127,9 @@ def test_write_jsviewer_local(tmpdir):
table_id='test',
length='50',
display_length='10, 25, 50, 100, 500, 1000',
- datatables_css_url='file://' + join(EXTERN_DIR, 'css', 'jquery.dataTables.css'),
- datatables_js_url='file://' + join(EXTERN_DIR, 'js', 'jquery.dataTables.min.js'),
- jquery_url='file://' + join(EXTERN_DIR, 'js', 'jquery-3.1.1.min.js')
-+ datatables_css_url='file:///usr/share/javascript/jquery-datatables/css/jquery.dataTables.css'),
-+ datatables_js_url='file:///usr/share/javascript/jquery-datatables/jquery.dataTables.min.js'),
-+ jquery_url='file:///usr/share/javascript/jquery/jquery.min.js')
++ datatables_css_url='file:///usr/share/javascript/jquery-datatables/css/jquery.dataTables.css',
++ datatables_js_url='file:///usr/share/javascript/jquery-datatables/jquery.dataTables.min.js',
++ jquery_url='file:///usr/share/javascript/jquery/jquery.min.js'
)
with open(tmpfile) as f:
assert f.read().strip() == ref.strip()
+diff --git a/astropy/units/format/cds.py b/astropy/units/format/cds.py
+index ecb78e2..d864738 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
+
+@@ -141,7 +141,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 f4aa8c0..d404017 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
+
+@@ -181,7 +181,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 7c66a6b..9eed1de 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
+
+@@ -179,7 +179,7 @@ class OGIP(generic.Generic):
+ <https://bitbucket.org/nxg/unity/>`_.
+ """
+
+- from ...extern.ply import yacc
++ from ply import yacc
+
+ tokens = cls._tokens
+
--
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