From ec9acbd7cb4c058442523402c6dc33e149315d7d Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Thu, 12 Jan 2017 11:37:47 +0100 Subject: [PATCH] Use external python modules instead of convenience copies Gbp-Pq: Name external_python_pkgs.patch --- astropy/coordinates/angle_utilities.py | 2 +- astropy/extern/configobj.py | 4 ++++ 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(+), 17 deletions(-) create mode 100644 astropy/extern/configobj.py 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 new file mode 100644 index 0000000..2815978 --- /dev/null +++ b/astropy/extern/configobj.py @@ -0,0 +1,4 @@ +# Wrapper to use installed validate and configobj modules +from __future__ import absolute_import +import validate +import configobj 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 @@ _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) -_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six'] +_SIX_SEARCH_PATH = ['six'] def _find_module(name, path=None): diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py index 0ec7824..033dd43 100644 --- a/astropy/table/jsviewer.py +++ b/astropy/table/jsviewer.py @@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace): conf = Conf() -EXTERN_JS_DIR = abspath(join(dirname(extern.__file__), 'js')) -EXTERN_CSS_DIR = abspath(join(dirname(extern.__file__), 'css')) +EXTERN_JS_DIR = '/usr/share/javascript' +EXTERN_CSS_DIR = EXTERN_JS_DIR _SORTING_SCRIPT_PART_1 = """ var astropy_sort_num = function(a, b) {{ @@ -134,22 +134,24 @@ class JSViewer(object): @property def jquery_urls(self): if self._use_local_files: - return ['file://' + join(EXTERN_JS_DIR, 'jquery-3.1.1.min.js'), - 'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min.js')] + return ['file://' + join(EXTERN_JS_DIR, 'jquery', 'jquery.min.js'), + 'file://' + join(EXTERN_JS_DIR, 'jquery-datatables', + 'jquery.dataTables.min.js')] else: return [conf.jquery_url, conf.datatables_url] @property def css_urls(self): if self._use_local_files: - return ['file://' + join(EXTERN_CSS_DIR, + return ['file://' + join(EXTERN_CSS_DIR, 'jquery-datatables', 'css', 'jquery.dataTables.css')] else: return conf.css_urls def _jstable_file(self): if self._use_local_files: - return 'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min') + return 'file://' + join(EXTERN_JS_DIR, 'jquery-datatables', + 'jquery.dataTables.min') else: return conf.datatables_url[:-3] diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py index 51738e1..f95a99a 100644 --- a/astropy/table/tests/test_jsviewer.py +++ b/astropy/table/tests/test_jsviewer.py @@ -146,9 +146,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' ) 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 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): `_. """ - 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 974ca25..7d40dfe 100644 --- a/astropy/units/format/generic.py +++ b/astropy/units/format/generic.py @@ -103,7 +103,7 @@ class Generic(Base): @classmethod def _make_lexer(cls): - from ...extern.ply import lex + from ply import lex tokens = cls._tokens @@ -178,7 +178,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): `_. """ - from ...extern.ply import yacc + from ply import yacc tokens = cls._tokens -- 2.30.2