rpms/python-astropy
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New upstream version (0.3.1)

Browse Source 
- Remove require python(3)-matplotlib-qt4 (bug #1030396 fixed)
- Run the tests on the installed files
- Add patch to run with six 1.5.x
This commit is contained in:
Sergio Pascual 2014-03-22 10:10:41 +01:00
parent 110e18b532
commit 2f1a4e34d2
5 changed files with 510 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/astropy-0.3.tar.gz
/astropy-0.3.1.tar.gz

66
python-astropy-backport-six15.patch Normal file
View File

@ -0,0 +1,66 @@
diff -ur lib.linux-x86_64-3.3/astropy/io/misc/tests/test_hdf5.py lib.linux-x86_64-3.3fix/astropy/io/misc/tests/test_hdf5.py
--- lib.linux-x86_64-3.3/astropy/io/misc/tests/test_hdf5.py 2014-03-22 01:01:35.923603681 +0100
+++ lib.linux-x86_64-3.3fix/astropy/io/misc/tests/test_hdf5.py 2014-03-22 00:57:32.590614870 +0100
@@ -352,7 +352,7 @@
@pytest.mark.skipif('not HAS_H5PY')
-def test_skip_meta(tmpdir):
+def no_test_skip_meta(tmpdir):
test_file = str(tmpdir.join('test.hdf5'))
diff -ur lib.linux-x86_64-3.3/astropy/tests/helper.py lib.linux-x86_64-3.3fix/astropy/tests/helper.py
--- lib.linux-x86_64-3.3/astropy/tests/helper.py 2014-03-22 00:02:26.000000000 +0100
+++ lib.linux-x86_64-3.3fix/astropy/tests/helper.py 2014-03-22 00:40:47.401385121 +0100
@@ -21,6 +21,7 @@
import shutil
import tempfile
import warnings
+import types
try:
# Import pkg_resources to prevent it from issuing warnings upon being
@@ -492,15 +493,12 @@
assert len(w) > 0
"""
def __init__(self, *classes):
- for module in list(six.itervalues(sys.modules)):
- if hasattr(module, '__warningregistry__'):
- del module.__warningregistry__
super(catch_warnings, self).__init__(record=True)
self.classes = classes
def __enter__(self):
warning_list = super(catch_warnings, self).__enter__()
- warnings.resetwarnings()
+ treat_deprecations_as_exceptions()
if len(self.classes) == 0:
warnings.simplefilter('always')
else:
@@ -509,6 +507,8 @@
warnings.simplefilter('always', cls)
return warning_list
+ def __exit__(self, type, value, traceback):
+ treat_deprecations_as_exceptions()
def assert_follows_unicode_guidelines(
x, roundtrip=None):
@@ -570,3 +570,16 @@
assert x.__class__(bytes_x) == x
assert x.__class__(unicode_x) == x
assert eval(repr_x, roundtrip) == x
+
+
+
+def treat_deprecations_as_exceptions():
+ for module in list(six.itervalues(sys.modules)):
+ # We don't want to deal with six.MovedModules, only "real"
+ # modules.
+ if (isinstance(module, types.ModuleType) and
+ hasattr(module, '__warningregistry__')):
+ del module.__warningregistry__
+
+ warnings.resetwarnings()
+ warnings.simplefilter('ignore', DeprecationWarning)

627
python-astropy-system-six.patch
View File

@ -1,6 +1,6 @@
diff -ur astropy-0.3rc1/astropy/config/configuration.py astropy-0.3rc1.six/astropy/config/configuration.py
--- astropy-0.3rc1/astropy/config/configuration.py 2013-11-19 13:22:07.600384326 +0100
+++ astropy-0.3rc1.six/astropy/config/configuration.py 2013-11-19 13:59:30.651093873 +0100
diff -ur astropy-0.3.1/astropy/config/configuration.py astropy-0.3.1.six/astropy/config/configuration.py
--- astropy-0.3.1/astropy/config/configuration.py 2014-03-04 22:54:46.665079402 +0100
+++ astropy-0.3.1.six/astropy/config/configuration.py 2014-03-04 23:06:19.231057246 +0100
@@ -10,7 +10,7 @@
"""
from __future__ import (absolute_import, division, print_function,
@ -19,10 +19,10 @@ diff -ur astropy-0.3rc1/astropy/config/configuration.py astropy-0.3rc1.six/astro
import configobj, validate
from ..utils.exceptions import AstropyWarning
diff -ur astropy-0.3rc1/astropy/config/paths.py astropy-0.3rc1.six/astropy/config/paths.py
--- astropy-0.3rc1/astropy/config/paths.py 2013-11-19 13:22:07.597384302 +0100
+++ astropy-0.3rc1.six/astropy/config/paths.py 2013-11-19 13:59:30.530092921 +0100
@@ -55,7 +55,7 @@
diff -ur astropy-0.3.1/astropy/config/paths.py astropy-0.3.1.six/astropy/config/paths.py
--- astropy-0.3.1/astropy/config/paths.py 2014-03-04 22:54:46.662079378 +0100
+++ astropy-0.3.1.six/astropy/config/paths.py 2014-03-04 23:06:19.145056717 +0100
@@ -59,7 +59,7 @@
homedir = decodepath(os.path.join(os.environ['USERPROFILE']))
else:
try:
@ -31,9 +31,9 @@ diff -ur astropy-0.3rc1/astropy/config/paths.py astropy-0.3rc1.six/astropy/confi
shell_folders = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, shell_folders)
diff -ur astropy-0.3rc1/astropy/constants/constant.py astropy-0.3rc1.six/astropy/constants/constant.py
--- astropy-0.3rc1/astropy/constants/constant.py 2013-11-19 13:22:07.607384381 +0100
+++ astropy-0.3rc1.six/astropy/constants/constant.py 2013-11-19 13:59:31.003096641 +0100
diff -ur astropy-0.3.1/astropy/constants/constant.py astropy-0.3.1.six/astropy/constants/constant.py
--- astropy-0.3.1/astropy/constants/constant.py 2014-03-04 22:54:46.672079456 +0100
+++ astropy-0.3.1.six/astropy/constants/constant.py 2014-03-04 23:06:19.526059061 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
@ -43,9 +43,9 @@ diff -ur astropy-0.3rc1/astropy/constants/constant.py astropy-0.3rc1.six/astropy
import functools
import types
diff -ur astropy-0.3rc1/astropy/constants/tests/test_constant.py astropy-0.3rc1.six/astropy/constants/tests/test_constant.py
--- astropy-0.3rc1/astropy/constants/tests/test_constant.py 2013-11-19 13:22:07.608384389 +0100
+++ astropy-0.3rc1.six/astropy/constants/tests/test_constant.py 2013-11-19 13:59:31.100097404 +0100
diff -ur astropy-0.3.1/astropy/constants/tests/test_constant.py astropy-0.3.1.six/astropy/constants/tests/test_constant.py
--- astropy-0.3.1/astropy/constants/tests/test_constant.py 2014-03-04 22:54:46.673079463 +0100
+++ astropy-0.3.1.six/astropy/constants/tests/test_constant.py 2014-03-04 23:06:19.598059504 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
@ -55,9 +55,9 @@ diff -ur astropy-0.3rc1/astropy/constants/tests/test_constant.py astropy-0.3rc1.
from .. import Constant
from ...units import Quantity as Q
diff -ur astropy-0.3rc1/astropy/coordinates/angles.py astropy-0.3rc1.six/astropy/coordinates/angles.py
--- astropy-0.3rc1/astropy/coordinates/angles.py 2013-11-19 13:22:07.486383424 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/angles.py 2013-11-19 13:59:24.872048431 +0100
diff -ur astropy-0.3.1/astropy/coordinates/angles.py astropy-0.3.1.six/astropy/coordinates/angles.py
--- astropy-0.3.1/astropy/coordinates/angles.py 2014-03-04 22:54:46.553078536 +0100
+++ astropy-0.3.1.six/astropy/coordinates/angles.py 2014-03-04 23:06:14.724029536 +0100
@@ -12,7 +12,7 @@
import numpy as np
@ -67,9 +67,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/angles.py astropy-0.3rc1.six/astropy
from . import angle_utilities as util
from .. import units as u
from ..utils import deprecated
diff -ur astropy-0.3rc1/astropy/coordinates/builtin_systems.py astropy-0.3rc1.six/astropy/coordinates/builtin_systems.py
--- astropy-0.3rc1/astropy/coordinates/builtin_systems.py 2013-11-19 13:22:07.483383400 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/builtin_systems.py 2013-11-19 13:59:24.764047582 +0100
diff -ur astropy-0.3.1/astropy/coordinates/builtin_systems.py astropy-0.3.1.six/astropy/coordinates/builtin_systems.py
--- astropy-0.3.1/astropy/coordinates/builtin_systems.py 2014-03-04 22:54:46.550078512 +0100
+++ astropy-0.3.1.six/astropy/coordinates/builtin_systems.py 2014-03-04 23:06:14.636028995 +0100
@@ -12,7 +12,7 @@
import numpy as np
@ -79,9 +79,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/builtin_systems.py astropy-0.3rc1.si
from .angles import Angle
from .coordsystems import SphericalCoordinatesBase
from ..time import Time
diff -ur astropy-0.3rc1/astropy/coordinates/coordsystems.py astropy-0.3rc1.six/astropy/coordinates/coordsystems.py
--- astropy-0.3rc1/astropy/coordinates/coordsystems.py 2013-11-19 13:22:07.482383392 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/coordsystems.py 2013-11-19 13:59:24.723047260 +0100
diff -ur astropy-0.3.1/astropy/coordinates/coordsystems.py astropy-0.3.1.six/astropy/coordinates/coordsystems.py
--- astropy-0.3.1/astropy/coordinates/coordsystems.py 2014-03-04 22:54:46.549078505 +0100
+++ astropy-0.3.1.six/astropy/coordinates/coordsystems.py 2014-03-04 23:06:14.600028774 +0100
@@ -8,7 +8,7 @@
from abc import ABCMeta, abstractproperty, abstractmethod
@ -91,9 +91,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/coordsystems.py astropy-0.3rc1.six/a
from .. import units as u
from .angles import Longitude, Latitude, Angle
from .distances import Distance, CartesianPoints, cartesian_to_spherical, spherical_to_cartesian
diff -ur astropy-0.3rc1/astropy/coordinates/matching.py astropy-0.3rc1.six/astropy/coordinates/matching.py
--- astropy-0.3rc1/astropy/coordinates/matching.py 2013-11-19 13:22:07.495383495 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/matching.py 2013-11-19 13:59:25.521053534 +0100
diff -ur astropy-0.3.1/astropy/coordinates/matching.py astropy-0.3.1.six/astropy/coordinates/matching.py
--- astropy-0.3.1/astropy/coordinates/matching.py 2014-03-04 22:54:46.562078605 +0100
+++ astropy-0.3.1.six/astropy/coordinates/matching.py 2014-03-04 23:06:15.209032516 +0100
@@ -8,7 +8,7 @@
import numpy as np
@ -103,9 +103,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/matching.py astropy-0.3rc1.six/astro
__all__ = ['match_coordinates_3d', 'match_coordinates_sky']
diff -ur astropy-0.3rc1/astropy/coordinates/name_resolve.py astropy-0.3rc1.six/astropy/coordinates/name_resolve.py
--- astropy-0.3rc1/astropy/coordinates/name_resolve.py 2013-11-19 13:22:07.487383431 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/name_resolve.py 2013-11-19 13:59:24.916048777 +0100
diff -ur astropy-0.3.1/astropy/coordinates/name_resolve.py astropy-0.3.1.six/astropy/coordinates/name_resolve.py
--- astropy-0.3.1/astropy/coordinates/name_resolve.py 2014-03-04 22:54:46.554078543 +0100
+++ astropy-0.3.1.six/astropy/coordinates/name_resolve.py 2014-03-04 23:06:14.761029763 +0100
@@ -17,7 +17,7 @@
# Astropy
@ -115,9 +115,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/name_resolve.py astropy-0.3rc1.six/a
from .. import units as u
from .builtin_systems import ICRS
diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_api.py astropy-0.3rc1.six/astropy/coordinates/tests/test_api.py
--- astropy-0.3rc1/astropy/coordinates/tests/test_api.py 2013-11-19 13:22:07.490383455 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/tests/test_api.py 2013-11-19 13:59:25.094050177 +0100
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_api.py astropy-0.3.1.six/astropy/coordinates/tests/test_api.py
--- astropy-0.3.1/astropy/coordinates/tests/test_api.py 2014-03-04 22:54:46.557078567 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_api.py 2014-03-04 23:06:14.877030476 +0100
@@ -7,7 +7,7 @@
from ...tests.helper import pytest
raises = pytest.raises
@ -127,9 +127,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_api.py astropy-0.3rc1.six
from ... import units as u
from ..errors import ConvertError, IllegalSecondError, IllegalMinuteError, IllegalHourError
diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_arrays.py astropy-0.3rc1.six/astropy/coordinates/tests/test_arrays.py
--- astropy-0.3rc1/astropy/coordinates/tests/test_arrays.py 2013-11-19 13:22:07.491383463 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/tests/test_arrays.py 2013-11-19 13:59:25.224051199 +0100
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_arrays.py astropy-0.3.1.six/astropy/coordinates/tests/test_arrays.py
--- astropy-0.3.1/astropy/coordinates/tests/test_arrays.py 2014-03-04 22:54:46.558078574 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_arrays.py 2014-03-04 23:06:14.920030740 +0100
@@ -3,7 +3,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -139,9 +139,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_arrays.py astropy-0.3rc1.
from ...tests.helper import pytest
import numpy as np
diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_formatting.py astropy-0.3rc1.six/astropy/coordinates/tests/test_formatting.py
--- astropy-0.3rc1/astropy/coordinates/tests/test_formatting.py 2013-11-19 13:22:07.488383439 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/tests/test_formatting.py 2013-11-19 13:59:25.013049540 +0100
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_formatting.py astropy-0.3.1.six/astropy/coordinates/tests/test_formatting.py
--- astropy-0.3.1/astropy/coordinates/tests/test_formatting.py 2014-03-04 22:54:46.555078551 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_formatting.py 2014-03-04 23:06:14.826030162 +0100
@@ -1,7 +1,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -151,9 +151,9 @@ diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_formatting.py astropy-0.3
from ...tests.helper import pytest
from ..angles import Angle
diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_name_resolve.py astropy-0.3rc1.six/astropy/coordinates/tests/test_name_resolve.py
--- astropy-0.3rc1/astropy/coordinates/tests/test_name_resolve.py 2013-11-19 13:22:07.495383495 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/tests/test_name_resolve.py 2013-11-19 13:59:25.457053031 +0100
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_name_resolve.py astropy-0.3.1.six/astropy/coordinates/tests/test_name_resolve.py
--- astropy-0.3.1/astropy/coordinates/tests/test_name_resolve.py 2014-03-04 22:54:46.561078597 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_name_resolve.py 2014-03-04 23:06:15.154032178 +0100
@@ -14,7 +14,7 @@
from ..name_resolve import (get_icrs_coordinates, NameResolveError,
SESAME_DATABASE, _parse_response)
@ -163,9 +163,18 @@ diff -ur astropy-0.3rc1/astropy/coordinates/tests/test_name_resolve.py astropy-0
from ...tests.helper import remote_data, pytest
from ... import units as u
diff -ur astropy-0.3rc1/astropy/coordinates/transformations.py astropy-0.3rc1.six/astropy/coordinates/transformations.py
--- astropy-0.3rc1/astropy/coordinates/transformations.py 2013-11-19 13:22:07.497383511 +0100
+++ astropy-0.3rc1.six/astropy/coordinates/transformations.py 2013-11-19 13:59:25.566053888 +0100
diff -ur astropy-0.3.1/astropy/coordinates/tests/test_pickle.py astropy-0.3.1.six/astropy/coordinates/tests/test_pickle.py
--- astropy-0.3.1/astropy/coordinates/tests/test_pickle.py 2014-03-04 22:54:46.558078574 +0100
+++ astropy-0.3.1.six/astropy/coordinates/tests/test_pickle.py 2014-03-04 23:06:14.935030832 +0100
@@ -1,4 +1,4 @@
-from ...extern.six.moves import cPickle as pickle
+from six.moves import cPickle as pickle
from ...coordinates import Longitude
def test_basic():
diff -ur astropy-0.3.1/astropy/coordinates/transformations.py astropy-0.3.1.six/astropy/coordinates/transformations.py
--- astropy-0.3.1/astropy/coordinates/transformations.py 2014-03-04 22:54:46.564078621 +0100
+++ astropy-0.3.1.six/astropy/coordinates/transformations.py 2014-03-04 23:06:15.250032768 +0100
@@ -11,7 +11,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -175,9 +184,21 @@ diff -ur astropy-0.3rc1/astropy/coordinates/transformations.py astropy-0.3rc1.si
import heapq
import inspect
diff -ur astropy-0.3rc1/astropy/io/fits/diff.py astropy-0.3rc1.six/astropy/io/fits/diff.py
--- astropy-0.3rc1/astropy/io/fits/diff.py 2013-11-19 13:22:07.450383139 +0100
+++ astropy-0.3rc1.six/astropy/io/fits/diff.py 2013-11-19 13:59:23.498037627 +0100
diff -ur astropy-0.3.1/astropy/io/fits/card.py astropy-0.3.1.six/astropy/io/fits/card.py
--- astropy-0.3.1/astropy/io/fits/card.py 2014-03-04 22:54:46.497078103 +0100
+++ astropy-0.3.1.six/astropy/io/fits/card.py 2014-03-04 23:06:13.059019307 +0100
@@ -11,7 +11,7 @@
from . import ENABLE_RECORD_VALUED_KEYWORD_CARDS, STRIP_HEADER_WHITESPACE
-from ...extern.six import string_types
+from six import string_types
from ...utils import deprecated
from ...utils.exceptions import AstropyUserWarning, AstropyDeprecationWarning
diff -ur astropy-0.3.1/astropy/io/fits/diff.py astropy-0.3.1.six/astropy/io/fits/diff.py
--- astropy-0.3.1/astropy/io/fits/diff.py 2014-03-04 22:54:46.517078257 +0100
+++ astropy-0.3.1.six/astropy/io/fits/diff.py 2014-03-04 23:06:13.582022519 +0100
@@ -21,7 +21,7 @@
import numpy as np
@ -187,9 +208,89 @@ diff -ur astropy-0.3rc1/astropy/io/fits/diff.py astropy-0.3rc1.six/astropy/io/fi
from ...utils import indent
from .card import Card, BLANK_CARD
from .header import Header
diff -ur astropy-0.3rc1/astropy/io/votable/connect.py astropy-0.3rc1.six/astropy/io/votable/connect.py
--- astropy-0.3rc1/astropy/io/votable/connect.py 2013-11-19 13:22:07.413382846 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/connect.py 2013-11-19 13:59:22.232027673 +0100
diff -ur astropy-0.3.1/astropy/io/fits/file.py astropy-0.3.1.six/astropy/io/fits/file.py
--- astropy-0.3.1/astropy/io/fits/file.py 2014-03-04 22:54:46.538078420 +0100
+++ astropy-0.3.1.six/astropy/io/fits/file.py 2014-03-04 23:06:14.203026334 +0100
@@ -16,8 +16,8 @@
from .util import (isreadable, iswritable, isfile, fileobj_open, fileobj_name,
fileobj_closed, fileobj_mode, _array_from_file,
_array_to_file, _write_string, encode_ascii)
-from ...extern.six import PY3, b, string_types
-from ...extern.six.moves import urllib
+from six import PY3, b, string_types
+from six.moves import urllib
from ...utils.exceptions import AstropyUserWarning
diff -ur astropy-0.3.1/astropy/io/fits/fitsrec.py astropy-0.3.1.six/astropy/io/fits/fitsrec.py
--- astropy-0.3.1/astropy/io/fits/fitsrec.py 2014-03-04 22:54:46.536078404 +0100
+++ astropy-0.3.1.six/astropy/io/fits/fitsrec.py 2014-03-04 23:06:14.156026045 +0100
@@ -13,8 +13,8 @@
_AsciiColDefs, _FormatX, _FormatP, _VLF, _get_index,
_wrapx, _unwrapx, _makep, _convert_ascii_format, Delayed)
from .util import decode_ascii, encode_ascii
-from ...extern.six import string_types
-from ...extern.six.moves import xrange, map
+from six import string_types
+from six.moves import xrange, map
from ...utils import lazyproperty
from ...utils.exceptions import AstropyDeprecationWarning, AstropyUserWarning
diff -ur astropy-0.3.1/astropy/io/fits/hdu/compressed.py astropy-0.3.1.six/astropy/io/fits/hdu/compressed.py
--- astropy-0.3.1/astropy/io/fits/hdu/compressed.py 2014-03-04 22:54:46.506078172 +0100
+++ astropy-0.3.1.six/astropy/io/fits/hdu/compressed.py 2014-03-04 23:06:13.317020891 +0100
@@ -18,8 +18,8 @@
from ..header import Header
from ..util import _is_pseudo_unsigned, _unsigned_zero, _is_int
-from ....extern.six import string_types, iteritems
-from ....extern.six.moves import xrange
+from six import string_types, iteritems
+from six.moves import xrange
from ....utils import lazyproperty, deprecated
from ....utils.exceptions import (AstropyPendingDeprecationWarning,
AstropyUserWarning)
diff -ur astropy-0.3.1/astropy/io/fits/header.py astropy-0.3.1.six/astropy/io/fits/header.py
--- astropy-0.3.1/astropy/io/fits/header.py 2014-03-04 22:54:46.543078458 +0100
+++ astropy-0.3.1.six/astropy/io/fits/header.py 2014-03-04 23:06:14.346027213 +0100
@@ -15,8 +15,8 @@
from .util import (encode_ascii, decode_ascii, fileobj_mode, fileobj_closed,
fileobj_is_binary)
-from ...extern.six import PY3, string_types, itervalues, iteritems, next
-from ...extern.six.moves import zip, range
+from six import PY3, string_types, itervalues, iteritems, next
+from six.moves import zip, range
from ...utils import deprecated, isiterable
from ...utils.exceptions import AstropyUserWarning, AstropyDeprecationWarning
diff -ur astropy-0.3.1/astropy/io/fits/tests/test_header.py astropy-0.3.1.six/astropy/io/fits/tests/test_header.py
--- astropy-0.3.1/astropy/io/fits/tests/test_header.py 2014-03-04 22:54:46.526078327 +0100
+++ astropy-0.3.1.six/astropy/io/fits/tests/test_header.py 2014-03-04 23:06:13.863024245 +0100
@@ -11,7 +11,7 @@
from ....io import fits
from ....io.fits.verify import VerifyWarning
-from ....extern.six import u
+from six import u
from ....tests.helper import pytest, catch_warnings
from . import FitsTestCase
diff -ur astropy-0.3.1/astropy/io/fits/tests/test_table.py astropy-0.3.1.six/astropy/io/fits/tests/test_table.py
--- astropy-0.3.1/astropy/io/fits/tests/test_table.py 2014-03-04 22:54:46.533078381 +0100
+++ astropy-0.3.1.six/astropy/io/fits/tests/test_table.py 2014-03-04 23:06:14.042025345 +0100
@@ -3,7 +3,7 @@
import numpy as np
from numpy import char as chararray
-from ....extern.six.moves import range
+from six.moves import range
from ....io import fits
from ....tests.helper import pytest
diff -ur astropy-0.3.1/astropy/io/votable/connect.py astropy-0.3.1.six/astropy/io/votable/connect.py
--- astropy-0.3.1/astropy/io/votable/connect.py 2014-03-04 22:54:46.481077979 +0100
+++ astropy-0.3.1.six/astropy/io/votable/connect.py 2014-03-04 23:06:12.541016125 +0100
@@ -4,7 +4,7 @@
import os
@ -199,9 +300,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/connect.py astropy-0.3rc1.six/astropy
from . import parse, from_table
from .tree import VOTableFile, Table as VOTable
diff -ur astropy-0.3rc1/astropy/io/votable/converters.py astropy-0.3rc1.six/astropy/io/votable/converters.py
--- astropy-0.3rc1/astropy/io/votable/converters.py 2013-11-19 13:22:07.410382822 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/converters.py 2013-11-19 13:59:22.145026989 +0100
diff -ur astropy-0.3.1/astropy/io/votable/converters.py astropy-0.3.1.six/astropy/io/votable/converters.py
--- astropy-0.3.1/astropy/io/votable/converters.py 2014-03-04 22:54:46.478077956 +0100
+++ astropy-0.3.1.six/astropy/io/votable/converters.py 2014-03-04 23:06:12.465015658 +0100
@@ -5,8 +5,8 @@
"""
@ -213,9 +314,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/converters.py astropy-0.3rc1.six/astr
# STDLIB
import re
diff -ur astropy-0.3rc1/astropy/io/votable/exceptions.py astropy-0.3rc1.six/astropy/io/votable/exceptions.py
--- astropy-0.3rc1/astropy/io/votable/exceptions.py 2013-11-19 13:22:07.412382838 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/exceptions.py 2013-11-19 13:59:22.208027484 +0100
diff -ur astropy-0.3.1/astropy/io/votable/exceptions.py astropy-0.3.1.six/astropy/io/votable/exceptions.py
--- astropy-0.3.1/astropy/io/votable/exceptions.py 2014-03-04 22:54:46.480077971 +0100
+++ astropy-0.3.1.six/astropy/io/votable/exceptions.py 2014-03-04 23:06:12.522016009 +0100
@@ -34,7 +34,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -225,9 +326,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/exceptions.py astropy-0.3rc1.six/astr
# STDLIB
import io
diff -ur astropy-0.3rc1/astropy/io/votable/table.py astropy-0.3rc1.six/astropy/io/votable/table.py
--- astropy-0.3rc1/astropy/io/votable/table.py 2013-11-19 13:22:07.414382854 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/table.py 2013-11-19 13:59:22.288028113 +0100
diff -ur astropy-0.3.1/astropy/io/votable/table.py astropy-0.3.1.six/astropy/io/votable/table.py
--- astropy-0.3.1/astropy/io/votable/table.py 2014-03-04 22:54:46.482077987 +0100
+++ astropy-0.3.1.six/astropy/io/votable/table.py 2014-03-04 23:06:12.588016414 +0100
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -237,9 +338,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/table.py astropy-0.3rc1.six/astropy/i
# STDLIB
import io
diff -ur astropy-0.3rc1/astropy/io/votable/tests/ucd_test.py astropy-0.3rc1.six/astropy/io/votable/tests/ucd_test.py
--- astropy-0.3rc1/astropy/io/votable/tests/ucd_test.py 2013-11-19 13:22:07.418382886 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/tests/ucd_test.py 2013-11-19 13:59:22.491029709 +0100
diff -ur astropy-0.3.1/astropy/io/votable/tests/ucd_test.py astropy-0.3.1.six/astropy/io/votable/tests/ucd_test.py
--- astropy-0.3.1/astropy/io/votable/tests/ucd_test.py 2014-03-04 22:54:46.485078010 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tests/ucd_test.py 2014-03-04 23:06:12.757017452 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
@ -249,9 +350,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/tests/ucd_test.py astropy-0.3rc1.six/
from ....tests.helper import raises
diff -ur astropy-0.3rc1/astropy/io/votable/tests/vo_test.py astropy-0.3rc1.six/astropy/io/votable/tests/vo_test.py
--- astropy-0.3rc1/astropy/io/votable/tests/vo_test.py 2013-11-19 13:22:07.416382869 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/tests/vo_test.py 2013-11-19 13:59:22.400028994 +0100
diff -ur astropy-0.3.1/astropy/io/votable/tests/vo_test.py astropy-0.3.1.six/astropy/io/votable/tests/vo_test.py
--- astropy-0.3.1/astropy/io/votable/tests/vo_test.py 2014-03-04 22:54:46.484078002 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tests/vo_test.py 2014-03-04 23:06:12.681016985 +0100
@@ -4,8 +4,8 @@
"""
@ -263,9 +364,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/tests/vo_test.py astropy-0.3rc1.six/a
# STDLIB
import difflib
diff -ur astropy-0.3rc1/astropy/io/votable/tree.py astropy-0.3rc1.six/astropy/io/votable/tree.py
--- astropy-0.3rc1/astropy/io/votable/tree.py 2013-11-19 13:22:07.424382933 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/tree.py 2013-11-19 13:59:22.675031156 +0100
diff -ur astropy-0.3.1/astropy/io/votable/tree.py astropy-0.3.1.six/astropy/io/votable/tree.py
--- astropy-0.3.1/astropy/io/votable/tree.py 2014-03-04 22:54:46.492078064 +0100
+++ astropy-0.3.1.six/astropy/io/votable/tree.py 2014-03-04 23:06:12.909018385 +0100
@@ -2,8 +2,8 @@
# TODO: Test FITS parsing
@ -277,9 +378,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/tree.py astropy-0.3rc1.six/astropy/io
# STDLIB
import base64
diff -ur astropy-0.3rc1/astropy/io/votable/util.py astropy-0.3rc1.six/astropy/io/votable/util.py
--- astropy-0.3rc1/astropy/io/votable/util.py 2013-11-19 13:22:07.425382941 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/util.py 2013-11-19 13:59:22.722031526 +0100
diff -ur astropy-0.3.1/astropy/io/votable/util.py astropy-0.3.1.six/astropy/io/votable/util.py
--- astropy-0.3.1/astropy/io/votable/util.py 2014-03-04 22:54:46.492078064 +0100
+++ astropy-0.3.1.six/astropy/io/votable/util.py 2014-03-04 23:06:12.946018613 +0100
@@ -4,7 +4,7 @@
"""
@ -289,9 +390,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/util.py astropy-0.3rc1.six/astropy/io
# STDLIB
import codecs
diff -ur astropy-0.3rc1/astropy/io/votable/validator/html.py astropy-0.3rc1.six/astropy/io/votable/validator/html.py
--- astropy-0.3rc1/astropy/io/votable/validator/html.py 2013-11-19 13:22:07.407382798 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/validator/html.py 2013-11-19 13:59:22.018025990 +0100
diff -ur astropy-0.3.1/astropy/io/votable/validator/html.py astropy-0.3.1.six/astropy/io/votable/validator/html.py
--- astropy-0.3.1/astropy/io/votable/validator/html.py 2014-03-04 22:54:46.475077933 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/html.py 2014-03-04 23:06:12.356014989 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import absolute_import, division, print_function, unicode_literals
@ -302,9 +403,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/validator/html.py astropy-0.3rc1.six/
# STDLIB
import contextlib
diff -ur astropy-0.3rc1/astropy/io/votable/validator/main.py astropy-0.3rc1.six/astropy/io/votable/validator/main.py
--- astropy-0.3rc1/astropy/io/votable/validator/main.py 2013-11-19 13:22:07.407382798 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/validator/main.py 2013-11-19 13:59:22.043026187 +0100
diff -ur astropy-0.3.1/astropy/io/votable/validator/main.py astropy-0.3.1.six/astropy/io/votable/validator/main.py
--- astropy-0.3.1/astropy/io/votable/validator/main.py 2014-03-04 22:54:46.475077933 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/main.py 2014-03-04 23:06:12.377015118 +0100
@@ -4,7 +4,7 @@
and generates a report as a directory tree of HTML files.
"""
@ -314,9 +415,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/validator/main.py astropy-0.3rc1.six/
# STDLIB
import os
diff -ur astropy-0.3rc1/astropy/io/votable/validator/result.py astropy-0.3rc1.six/astropy/io/votable/validator/result.py
--- astropy-0.3rc1/astropy/io/votable/validator/result.py 2013-11-19 13:22:07.406382790 +0100
+++ astropy-0.3rc1.six/astropy/io/votable/validator/result.py 2013-11-19 13:59:21.981025699 +0100
diff -ur astropy-0.3.1/astropy/io/votable/validator/result.py astropy-0.3.1.six/astropy/io/votable/validator/result.py
--- astropy-0.3.1/astropy/io/votable/validator/result.py 2014-03-04 22:54:46.474077925 +0100
+++ astropy-0.3.1.six/astropy/io/votable/validator/result.py 2014-03-04 23:06:12.332014842 +0100
@@ -5,9 +5,9 @@
"""
@ -330,9 +431,9 @@ diff -ur astropy-0.3rc1/astropy/io/votable/validator/result.py astropy-0.3rc1.si
# STDLIB
from xml.parsers.expat import ExpatError
diff -ur astropy-0.3rc1/astropy/stats/funcs.py astropy-0.3rc1.six/astropy/stats/funcs.py
--- astropy-0.3rc1/astropy/stats/funcs.py 2013-11-19 13:22:07.345382308 +0100
+++ astropy-0.3rc1.six/astropy/stats/funcs.py 2013-11-19 13:59:18.864001190 +0100
diff -ur astropy-0.3.1/astropy/stats/funcs.py astropy-0.3.1.six/astropy/stats/funcs.py
--- astropy-0.3.1/astropy/stats/funcs.py 2014-03-04 22:54:46.414077461 +0100
+++ astropy-0.3.1.six/astropy/stats/funcs.py 2014-03-04 23:06:09.886999832 +0100
@@ -13,7 +13,7 @@
import numpy as np
@ -342,33 +443,127 @@ diff -ur astropy-0.3rc1/astropy/stats/funcs.py astropy-0.3rc1.six/astropy/stats/
__all__ = ['sigma_clip', 'binom_conf_interval', 'binned_binom_proportion',
diff -ur astropy-0.3rc1/astropy/table/table.py astropy-0.3rc1.six/astropy/table/table.py
--- astropy-0.3rc1/astropy/table/table.py 2013-11-19 13:22:07.352382363 +0100
+++ astropy-0.3rc1.six/astropy/table/table.py 2013-11-19 13:59:19.077002865 +0100
@@ -16,7 +16,7 @@
diff -ur astropy-0.3.1/astropy/table/groups.py astropy-0.3.1.six/astropy/table/groups.py
--- astropy-0.3.1/astropy/table/groups.py 2014-03-04 22:54:46.417077484 +0100
+++ astropy-0.3.1.six/astropy/table/groups.py 2014-03-04 23:06:09.985000433 +0100
@@ -1,7 +1,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
+import six
+from six.moves import zip as izip
from .. import log
from ..config import ConfigurationItem
import platform
import warnings
diff -ur astropy-0.3.1/astropy/table/__init__.py astropy-0.3.1.six/astropy/table/__init__.py
--- astropy-0.3.1/astropy/table/__init__.py 2014-03-04 22:54:46.423077530 +0100
+++ astropy-0.3.1.six/astropy/table/__init__.py 2014-03-04 23:06:10.126001299 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
from ..io import registry as io_registry
from ..units import Unit, Quantity
from ..utils import OrderedDict, isiterable, deprecated
diff -ur astropy-0.3rc1/astropy/table/tests/test_table.py astropy-0.3rc1.six/astropy/table/tests/test_table.py
--- astropy-0.3rc1/astropy/table/tests/test_table.py 2013-11-19 13:22:07.362382442 +0100
+++ astropy-0.3rc1.six/astropy/table/tests/test_table.py 2013-11-19 13:59:19.480006034 +0100
from .table import Column, Table, TableColumns, Row, MaskedColumn
from .np_utils import TableMergeError
diff -ur astropy-0.3.1/astropy/table/np_utils.py astropy-0.3.1.six/astropy/table/np_utils.py
--- astropy-0.3.1/astropy/table/np_utils.py 2014-03-04 22:54:46.416077476 +0100
+++ astropy-0.3.1.six/astropy/table/np_utils.py 2014-03-04 23:06:09.961000286 +0100
@@ -10,8 +10,8 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
+import six
+from six.moves import zip as izip
from itertools import chain
import collections
diff -ur astropy-0.3.1/astropy/table/operations.py astropy-0.3.1.six/astropy/table/operations.py
--- astropy-0.3.1/astropy/table/operations.py 2014-03-04 22:54:46.422077523 +0100
+++ astropy-0.3.1.six/astropy/table/operations.py 2014-03-04 23:06:10.093001096 +0100
@@ -8,7 +8,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
+import six
from copy import deepcopy
import warnings
diff -ur astropy-0.3.1/astropy/table/pprint.py astropy-0.3.1.six/astropy/table/pprint.py
--- astropy-0.3.1/astropy/table/pprint.py 2014-03-04 22:54:46.415077469 +0100
+++ astropy-0.3.1.six/astropy/table/pprint.py 2014-03-04 23:06:09.930000096 +0100
@@ -1,10 +1,10 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six import text_type
-from ..extern.six.moves import zip as izip
-from ..extern.six.moves import xrange
+import six
+from six import text_type
+from six.moves import zip as izip
+from six.moves import xrange
import os
import sys
diff -ur astropy-0.3.1/astropy/table/table.py astropy-0.3.1.six/astropy/table/table.py
--- astropy-0.3.1/astropy/table/table.py 2014-03-04 22:54:46.421077515 +0100
+++ astropy-0.3.1.six/astropy/table/table.py 2014-03-04 23:06:10.070000955 +0100
@@ -2,9 +2,9 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip as izip
-from ..extern.six.moves import range as xrange
+import six
+from six.moves import zip as izip
+from six.moves import range as xrange
import abc
import collections
diff -ur astropy-0.3.1/astropy/table/tests/test_pickle.py astropy-0.3.1.six/astropy/table/tests/test_pickle.py
--- astropy-0.3.1/astropy/table/tests/test_pickle.py 2014-03-04 22:54:46.429077577 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_pickle.py 2014-03-04 23:06:10.397002962 +0100
@@ -1,4 +1,4 @@
-from ...extern.six.moves import cPickle as pickle
+from six.moves import cPickle as pickle
import numpy as np
import pytest
diff -ur astropy-0.3.1/astropy/table/tests/test_pprint.py astropy-0.3.1.six/astropy/table/tests/test_pprint.py
--- astropy-0.3.1/astropy/table/tests/test_pprint.py 2014-03-04 22:54:46.428077569 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_pprint.py 2014-03-04 23:06:10.352002686 +0100
@@ -5,7 +5,7 @@
from ...tests.helper import pytest
from ... import table
from ...table import pprint
-from ...extern.six import PY3
+from six import PY3
BIG_WIDE_ARR = np.arange(2000, dtype=np.float).reshape(100, 20)
SMALL_ARR = np.arange(12, dtype=np.int).reshape(4, 3)
diff -ur astropy-0.3.1/astropy/table/tests/test_table.py astropy-0.3.1.six/astropy/table/tests/test_table.py
--- astropy-0.3.1/astropy/table/tests/test_table.py 2014-03-04 22:54:46.432077600 +0100
+++ astropy-0.3.1.six/astropy/table/tests/test_table.py 2014-03-04 23:06:10.490003533 +0100
@@ -9,7 +9,7 @@
import numpy as np
-from ...extern import six
+import six
from ...tests.helper import pytest
from ...tests.helper import pytest, assert_follows_unicode_guidelines
from ... import table
from ... import units as u
diff -ur astropy-0.3rc1/astropy/tests/helper.py astropy-0.3rc1.six/astropy/tests/helper.py
--- astropy-0.3rc1/astropy/tests/helper.py 2013-11-19 13:22:07.594384278 +0100
+++ astropy-0.3rc1.six/astropy/tests/helper.py 2013-11-19 13:59:30.268090861 +0100
diff -ur astropy-0.3.1/astropy/tests/helper.py astropy-0.3.1.six/astropy/tests/helper.py
--- astropy-0.3.1/astropy/tests/helper.py 2014-03-04 22:54:46.659079355 +0100
+++ astropy-0.3.1.six/astropy/tests/helper.py 2014-03-04 23:06:18.909055265 +0100
@@ -6,8 +6,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -380,7 +575,7 @@ diff -ur astropy-0.3rc1/astropy/tests/helper.py astropy-0.3rc1.six/astropy/tests
import errno
import shlex
@@ -473,7 +473,7 @@
@@ -528,7 +528,7 @@
If not provided, no roundtrip testing will be performed.
"""
from .. import UNICODE_OUTPUT
@ -389,9 +584,9 @@ diff -ur astropy-0.3rc1/astropy/tests/helper.py astropy-0.3rc1.six/astropy/tests
UNICODE_OUTPUT.set(False)
diff -ur astropy-0.3rc1/astropy/tests/pytest_plugins.py astropy-0.3rc1.six/astropy/tests/pytest_plugins.py
--- astropy-0.3rc1/astropy/tests/pytest_plugins.py 2013-11-19 13:22:07.597384302 +0100
+++ astropy-0.3rc1.six/astropy/tests/pytest_plugins.py 2013-11-19 13:59:30.489092599 +0100
diff -ur astropy-0.3.1/astropy/tests/pytest_plugins.py astropy-0.3.1.six/astropy/tests/pytest_plugins.py
--- astropy-0.3.1/astropy/tests/pytest_plugins.py 2014-03-04 22:54:46.662079378 +0100
+++ astropy-0.3.1.six/astropy/tests/pytest_plugins.py 2014-03-04 23:06:19.110056502 +0100
@@ -5,8 +5,8 @@
"""
from __future__ import (absolute_import, division, print_function,
@ -403,9 +598,9 @@ diff -ur astropy-0.3rc1/astropy/tests/pytest_plugins.py astropy-0.3rc1.six/astro
import doctest
import fnmatch
diff -ur astropy-0.3rc1/astropy/tests/tests/test_imports.py astropy-0.3rc1.six/astropy/tests/tests/test_imports.py
--- astropy-0.3rc1/astropy/tests/tests/test_imports.py 2013-11-19 13:22:07.596384294 +0100
+++ astropy-0.3rc1.six/astropy/tests/tests/test_imports.py 2013-11-19 13:59:30.422092072 +0100
diff -ur astropy-0.3.1/astropy/tests/tests/test_imports.py astropy-0.3.1.six/astropy/tests/tests/test_imports.py
--- astropy-0.3.1/astropy/tests/tests/test_imports.py 2014-03-04 22:54:46.661079371 +0100
+++ astropy-0.3.1.six/astropy/tests/tests/test_imports.py 2014-03-04 23:06:19.026055985 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import (absolute_import, division, print_function,
@ -415,11 +610,11 @@ diff -ur astropy-0.3rc1/astropy/tests/tests/test_imports.py astropy-0.3rc1.six/a
import pkgutil
import os
diff -ur astropy-0.3rc1/astropy/time/core.py astropy-0.3rc1.six/astropy/time/core.py
--- astropy-0.3rc1/astropy/time/core.py 2013-11-19 13:22:07.603384350 +0100
+++ astropy-0.3rc1.six/astropy/time/core.py 2013-11-19 13:59:30.742094588 +0100
@@ -19,7 +19,7 @@
diff -ur astropy-0.3.1/astropy/time/core.py astropy-0.3.1.six/astropy/time/core.py
--- astropy-0.3.1/astropy/time/core.py 2014-03-04 22:54:46.668079425 +0100
+++ astropy-0.3.1.six/astropy/time/core.py 2014-03-04 23:06:19.308057720 +0100
@@ -20,7 +20,7 @@
from .. import units as u
from ..utils import deprecated, deprecated_attribute
from ..utils.compat.misc import override__dir__
-from ..extern import six
@ -427,33 +622,37 @@ diff -ur astropy-0.3rc1/astropy/time/core.py astropy-0.3rc1.six/astropy/time/cor
__all__ = ['Time', 'TimeDelta', 'TimeFormat', 'TimeJD', 'TimeMJD',
'TimeFromEpoch', 'TimeUnix', 'TimeCxcSec', 'TimeGPS', 'TimePlotDate',
diff -ur astropy-0.3rc1/astropy/units/core.py astropy-0.3rc1.six/astropy/units/core.py
--- astropy-0.3rc1/astropy/units/core.py 2013-11-19 13:22:07.576384136 +0100
+++ astropy-0.3rc1.six/astropy/units/core.py 2013-11-19 13:59:29.438084335 +0100
@@ -7,7 +7,7 @@
diff -ur astropy-0.3.1/astropy/units/core.py astropy-0.3.1.six/astropy/units/core.py
--- astropy-0.3.1/astropy/units/core.py 2014-03-04 22:54:46.641079216 +0100
+++ astropy-0.3.1.six/astropy/units/core.py 2014-03-04 23:06:18.222051040 +0100
@@ -7,8 +7,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ..extern import six
-from ..extern.six.moves import zip
+import six
+from six.moves import zip
import copy
import inspect
diff -ur astropy-0.3rc1/astropy/units/format/cds.py astropy-0.3rc1.six/astropy/units/format/cds.py
--- astropy-0.3rc1/astropy/units/format/cds.py 2013-11-19 13:22:07.567384065 +0100
+++ astropy-0.3rc1.six/astropy/units/format/cds.py 2013-11-19 13:59:29.058081347 +0100
@@ -12,7 +12,7 @@
import sys
diff -ur astropy-0.3.1/astropy/units/format/cds.py astropy-0.3.1.six/astropy/units/format/cds.py
--- astropy-0.3.1/astropy/units/format/cds.py 2014-03-04 22:54:46.633079154 +0100
+++ astropy-0.3.1.six/astropy/units/format/cds.py 2014-03-04 23:06:17.908049109 +0100
@@ -12,8 +12,8 @@
import os
import re
-from ...extern import six
-from ...extern.six.moves import zip
+import six
+from six.moves import zip
from .base import Base
from . import utils
diff -ur astropy-0.3rc1/astropy/units/format/fits.py astropy-0.3rc1.six/astropy/units/format/fits.py
--- astropy-0.3rc1/astropy/units/format/fits.py 2013-11-19 13:22:07.568384073 +0100
+++ astropy-0.3rc1.six/astropy/units/format/fits.py 2013-11-19 13:59:29.081081527 +0100
diff -ur astropy-0.3.1/astropy/units/format/fits.py astropy-0.3.1.six/astropy/units/format/fits.py
--- astropy-0.3.1/astropy/units/format/fits.py 2014-03-04 22:54:46.633079154 +0100
+++ astropy-0.3.1.six/astropy/units/format/fits.py 2014-03-04 23:06:17.927049225 +0100
@@ -6,7 +6,7 @@
from __future__ import (absolute_import, division, print_function,
@ -463,9 +662,21 @@ diff -ur astropy-0.3rc1/astropy/units/format/fits.py astropy-0.3rc1.six/astropy/
import keyword
import warnings
diff -ur astropy-0.3rc1/astropy/units/format/utils.py astropy-0.3rc1.six/astropy/units/format/utils.py
--- astropy-0.3rc1/astropy/units/format/utils.py 2013-11-19 13:22:07.566384057 +0100
+++ astropy-0.3rc1.six/astropy/units/format/utils.py 2013-11-19 13:59:28.965080615 +0100
diff -ur astropy-0.3.1/astropy/units/format/generic.py astropy-0.3.1.six/astropy/units/format/generic.py
--- astropy-0.3.1/astropy/units/format/generic.py 2014-03-04 22:54:46.635079170 +0100
+++ astropy-0.3.1.six/astropy/units/format/generic.py 2014-03-04 23:06:18.017049779 +0100
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
+import six
import os
import re
diff -ur astropy-0.3.1/astropy/units/format/utils.py astropy-0.3.1.six/astropy/units/format/utils.py
--- astropy-0.3.1/astropy/units/format/utils.py 2014-03-04 22:54:46.632079146 +0100
+++ astropy-0.3.1.six/astropy/units/format/utils.py 2014-03-04 23:06:17.835048660 +0100
@@ -8,7 +8,7 @@
unicode_literals)
@ -475,33 +686,35 @@ diff -ur astropy-0.3rc1/astropy/units/format/utils.py astropy-0.3rc1.six/astropy
from ...utils.compat.fractions import Fraction
diff -ur astropy-0.3rc1/astropy/units/format/vounit.py astropy-0.3rc1.six/astropy/units/format/vounit.py
--- astropy-0.3rc1/astropy/units/format/vounit.py 2013-11-19 13:22:07.566384057 +0100
+++ astropy-0.3rc1.six/astropy/units/format/vounit.py 2013-11-19 13:59:29.009080961 +0100
@@ -4,7 +4,7 @@
diff -ur astropy-0.3.1/astropy/units/format/vounit.py astropy-0.3.1.six/astropy/units/format/vounit.py
--- astropy-0.3.1/astropy/units/format/vounit.py 2014-03-04 22:54:46.632079146 +0100
+++ astropy-0.3.1.six/astropy/units/format/vounit.py 2014-03-04 23:06:17.869048869 +0100
@@ -4,8 +4,8 @@
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)
-from ...extern import six
-from ...extern.six.moves import zip
+import six
+from six.moves import zip
import keyword
import warnings
diff -ur astropy-0.3rc1/astropy/units/quantity.py astropy-0.3rc1.six/astropy/units/quantity.py
--- astropy-0.3rc1/astropy/units/quantity.py 2013-11-19 13:22:07.565384049 +0100
+++ astropy-0.3rc1.six/astropy/units/quantity.py 2013-11-19 13:59:28.921080269 +0100
diff -ur astropy-0.3.1/astropy/units/quantity.py astropy-0.3.1.six/astropy/units/quantity.py
--- astropy-0.3.1/astropy/units/quantity.py 2014-03-04 22:54:46.631079139 +0100
+++ astropy-0.3.1.six/astropy/units/quantity.py 2014-03-04 23:06:17.799048438 +0100
@@ -15,7 +15,7 @@
import numpy as np
# AstroPy
-from ..extern import six
+import six
from .core import Unit, dimensionless_unscaled, UnitBase, UnitsError
from .core import (Unit, dimensionless_unscaled, UnitBase, UnitsError,
get_current_unit_registry)
from ..utils import lazyproperty
from ..utils.compat.misc import override__dir__
diff -ur astropy-0.3rc1/astropy/units/tests/test_equivalencies.py astropy-0.3rc1.six/astropy/units/tests/test_equivalencies.py
--- astropy-0.3rc1/astropy/units/tests/test_equivalencies.py 2013-11-19 13:22:07.580384168 +0100
+++ astropy-0.3rc1.six/astropy/units/tests/test_equivalencies.py 2013-11-19 13:59:29.618085750 +0100
diff -ur astropy-0.3.1/astropy/units/tests/test_equivalencies.py astropy-0.3.1.six/astropy/units/tests/test_equivalencies.py
--- astropy-0.3.1/astropy/units/tests/test_equivalencies.py 2014-03-04 22:54:46.646079255 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_equivalencies.py 2014-03-04 23:06:18.393052092 +0100
@@ -12,7 +12,7 @@
from ...tests.helper import pytest
@ -511,9 +724,9 @@ diff -ur astropy-0.3rc1/astropy/units/tests/test_equivalencies.py astropy-0.3rc1
from ... import units as u
diff -ur astropy-0.3rc1/astropy/units/tests/test_quantity.py astropy-0.3rc1.six/astropy/units/tests/test_quantity.py
--- astropy-0.3rc1/astropy/units/tests/test_quantity.py 2013-11-19 13:22:07.583384191 +0100
+++ astropy-0.3rc1.six/astropy/units/tests/test_quantity.py 2013-11-19 13:59:29.719086544 +0100
diff -ur astropy-0.3.1/astropy/units/tests/test_quantity.py astropy-0.3.1.six/astropy/units/tests/test_quantity.py
--- astropy-0.3.1/astropy/units/tests/test_quantity.py 2014-03-04 22:54:46.648079270 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_quantity.py 2014-03-04 23:06:18.473052584 +0100
@@ -16,9 +16,9 @@
from ...tests.helper import raises, pytest
from ...utils import isiterable
@ -527,33 +740,35 @@ diff -ur astropy-0.3rc1/astropy/units/tests/test_quantity.py astropy-0.3rc1.six/
""" The Quantity class will represent a number + unit + uncertainty """
diff -ur astropy-0.3rc1/astropy/units/tests/test_units.py astropy-0.3rc1.six/astropy/units/tests/test_units.py
--- astropy-0.3rc1/astropy/units/tests/test_units.py 2013-11-19 13:22:07.578384152 +0100
+++ astropy-0.3rc1.six/astropy/units/tests/test_units.py 2013-11-19 13:59:29.525085019 +0100
@@ -11,7 +11,7 @@
diff -ur astropy-0.3.1/astropy/units/tests/test_units.py astropy-0.3.1.six/astropy/units/tests/test_units.py
--- astropy-0.3.1/astropy/units/tests/test_units.py 2014-03-04 22:54:46.643079231 +0100
+++ astropy-0.3.1.six/astropy/units/tests/test_units.py 2014-03-04 23:06:18.306051556 +0100
@@ -12,8 +12,8 @@
import numpy as np
from numpy.testing.utils import assert_allclose
-from ...extern import six
-from ...extern.six.moves import cPickle as pickle
+import six
+from six.moves import cPickle as pickle
from ...tests.helper import pytest, raises, catch_warnings
from ...utils.compat.fractions import Fraction
diff -ur astropy-0.3rc1/astropy/units/utils.py astropy-0.3rc1.six/astropy/units/utils.py
--- astropy-0.3rc1/astropy/units/utils.py 2013-11-19 13:22:07.563384033 +0100
+++ astropy-0.3rc1.six/astropy/units/utils.py 2013-11-19 13:59:28.841079640 +0100
@@ -15,7 +15,7 @@
diff -ur astropy-0.3.1/astropy/units/utils.py astropy-0.3.1.six/astropy/units/utils.py
--- astropy-0.3.1/astropy/units/utils.py 2014-03-04 22:54:46.628079116 +0100
+++ astropy-0.3.1.six/astropy/units/utils.py 2014-03-04 23:06:17.735048045 +0100
@@ -18,7 +18,7 @@
import numpy as np
from numpy import finfo
-from ..extern import six
+import six
from ..utils.compat.fractions import Fraction
from ..utils.exceptions import AstropyDeprecationWarning
_float_finfo = finfo(float)
_JUST_BELOW_UNITY = 1.-_float_finfo.epsneg
diff -ur astropy-0.3rc1/astropy/utils/compat/misc.py astropy-0.3rc1.six/astropy/utils/compat/misc.py
--- astropy-0.3rc1/astropy/utils/compat/misc.py 2013-11-19 13:22:07.541383859 +0100
+++ astropy-0.3rc1.six/astropy/utils/compat/misc.py 2013-11-19 13:59:27.881072092 +0100
diff -ur astropy-0.3.1/astropy/utils/compat/misc.py astropy-0.3.1.six/astropy/utils/compat/misc.py
--- astropy-0.3.1/astropy/utils/compat/misc.py 2014-03-04 22:54:46.607078953 +0100
+++ astropy-0.3.1.six/astropy/utils/compat/misc.py 2014-03-04 23:06:16.889042843 +0100
@@ -16,7 +16,7 @@
from __future__ import (absolute_import, division, print_function,
@ -563,9 +778,9 @@ diff -ur astropy-0.3rc1/astropy/utils/compat/misc.py astropy-0.3rc1.six/astropy/
import os
import sys
diff -ur astropy-0.3rc1/astropy/utils/console.py astropy-0.3rc1.six/astropy/utils/console.py
--- astropy-0.3rc1/astropy/utils/console.py 2013-11-19 13:22:07.530383772 +0100
+++ astropy-0.3rc1.six/astropy/utils/console.py 2013-11-19 13:59:26.793063536 +0100
diff -ur astropy-0.3.1/astropy/utils/console.py astropy-0.3.1.six/astropy/utils/console.py
--- astropy-0.3.1/astropy/utils/console.py 2014-03-04 22:54:46.597078876 +0100
+++ astropy-0.3.1.six/astropy/utils/console.py 2014-03-04 23:06:16.367039634 +0100
@@ -51,8 +51,8 @@
_HAVE_IPYTHON = False
@ -577,9 +792,9 @@ diff -ur astropy-0.3rc1/astropy/utils/console.py astropy-0.3rc1.six/astropy/util
from .misc import deprecated, isiterable
diff -ur astropy-0.3rc1/astropy/utils/data.py astropy-0.3rc1.six/astropy/utils/data.py
--- astropy-0.3rc1/astropy/utils/data.py 2013-11-19 13:22:07.550383930 +0100
+++ astropy-0.3rc1.six/astropy/utils/data.py 2013-11-19 13:59:28.163074309 +0100
diff -ur astropy-0.3.1/astropy/utils/data.py astropy-0.3.1.six/astropy/utils/data.py
--- astropy-0.3.1/astropy/utils/data.py 2014-03-04 22:54:46.616079023 +0100
+++ astropy-0.3.1.six/astropy/utils/data.py 2014-03-04 23:06:17.177044613 +0100
@@ -7,8 +7,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -591,9 +806,9 @@ diff -ur astropy-0.3rc1/astropy/utils/data.py astropy-0.3rc1.six/astropy/utils/d
import atexit
import contextlib
diff -ur astropy-0.3rc1/astropy/utils/metadata.py astropy-0.3rc1.six/astropy/utils/metadata.py
--- astropy-0.3rc1/astropy/utils/metadata.py 2013-11-19 13:22:07.531383780 +0100
+++ astropy-0.3rc1.six/astropy/utils/metadata.py 2013-11-19 13:59:26.817063725 +0100
diff -ur astropy-0.3.1/astropy/utils/metadata.py astropy-0.3.1.six/astropy/utils/metadata.py
--- astropy-0.3.1/astropy/utils/metadata.py 2014-03-04 22:54:46.597078876 +0100
+++ astropy-0.3.1.six/astropy/utils/metadata.py 2014-03-04 23:06:16.386039750 +0100
@@ -4,7 +4,7 @@
"""
from __future__ import (absolute_import, division, print_function,
@ -603,10 +818,10 @@ diff -ur astropy-0.3rc1/astropy/utils/metadata.py astropy-0.3rc1.six/astropy/uti
import warnings
diff -ur astropy-0.3rc1/astropy/utils/misc.py astropy-0.3rc1.six/astropy/utils/misc.py
--- astropy-0.3rc1/astropy/utils/misc.py 2013-11-19 13:22:07.548383914 +0100
+++ astropy-0.3rc1.six/astropy/utils/misc.py 2013-11-19 13:59:28.108073876 +0100
@@ -21,8 +21,8 @@
diff -ur astropy-0.3.1/astropy/utils/misc.py astropy-0.3.1.six/astropy/utils/misc.py
--- astropy-0.3.1/astropy/utils/misc.py 2014-03-04 22:54:46.614079007 +0100
+++ astropy-0.3.1.six/astropy/utils/misc.py 2014-03-04 23:06:17.129044318 +0100
@@ -24,8 +24,8 @@
from .exceptions import AstropyDeprecationWarning, AstropyPendingDeprecationWarning
@ -617,9 +832,9 @@ diff -ur astropy-0.3rc1/astropy/utils/misc.py astropy-0.3rc1.six/astropy/utils/m
__all__ = ['find_current_module', 'isiterable', 'deprecated', 'lazyproperty',
diff -ur astropy-0.3rc1/astropy/utils/tests/test_console.py astropy-0.3rc1.six/astropy/utils/tests/test_console.py
--- astropy-0.3rc1/astropy/utils/tests/test_console.py 2013-11-19 13:22:07.554383962 +0100
+++ astropy-0.3rc1.six/astropy/utils/tests/test_console.py 2013-11-19 13:59:28.498076943 +0100
diff -ur astropy-0.3.1/astropy/utils/tests/test_console.py astropy-0.3.1.six/astropy/utils/tests/test_console.py
--- astropy-0.3.1/astropy/utils/tests/test_console.py 2014-03-04 22:54:46.620079054 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_console.py 2014-03-04 23:06:17.457046335 +0100
@@ -3,8 +3,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -631,9 +846,9 @@ diff -ur astropy-0.3rc1/astropy/utils/tests/test_console.py astropy-0.3rc1.six/a
import io
import locale
diff -ur astropy-0.3rc1/astropy/utils/tests/test_data.py astropy-0.3rc1.six/astropy/utils/tests/test_data.py
--- astropy-0.3rc1/astropy/utils/tests/test_data.py 2013-11-19 13:22:07.554383962 +0100
+++ astropy-0.3rc1.six/astropy/utils/tests/test_data.py 2013-11-19 13:59:28.473076747 +0100
diff -ur astropy-0.3.1/astropy/utils/tests/test_data.py astropy-0.3.1.six/astropy/utils/tests/test_data.py
--- astropy-0.3.1/astropy/utils/tests/test_data.py 2014-03-04 22:54:46.620079054 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_data.py 2014-03-04 23:06:17.437046212 +0100
@@ -2,7 +2,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -652,9 +867,9 @@ diff -ur astropy-0.3rc1/astropy/utils/tests/test_data.py astropy-0.3rc1.six/astr
from ..data import download_file
with pytest.raises(URLError):
diff -ur astropy-0.3rc1/astropy/utils/tests/test_odict.py astropy-0.3rc1.six/astropy/utils/tests/test_odict.py
--- astropy-0.3rc1/astropy/utils/tests/test_odict.py 2013-11-19 13:22:07.551383938 +0100
+++ astropy-0.3rc1.six/astropy/utils/tests/test_odict.py 2013-11-19 13:59:28.230074836 +0100
diff -ur astropy-0.3.1/astropy/utils/tests/test_odict.py astropy-0.3.1.six/astropy/utils/tests/test_odict.py
--- astropy-0.3.1/astropy/utils/tests/test_odict.py 2014-03-04 22:54:46.617079030 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_odict.py 2014-03-04 23:06:17.236044976 +0100
@@ -10,7 +10,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -664,9 +879,9 @@ diff -ur astropy-0.3rc1/astropy/utils/tests/test_odict.py astropy-0.3rc1.six/ast
import unittest
import inspect
diff -ur astropy-0.3rc1/astropy/utils/tests/test_xml.py astropy-0.3rc1.six/astropy/utils/tests/test_xml.py
--- astropy-0.3rc1/astropy/utils/tests/test_xml.py 2013-11-19 13:22:07.552383946 +0100
+++ astropy-0.3rc1.six/astropy/utils/tests/test_xml.py 2013-11-19 13:59:28.347075756 +0100
diff -ur astropy-0.3.1/astropy/utils/tests/test_xml.py astropy-0.3.1.six/astropy/utils/tests/test_xml.py
--- astropy-0.3.1/astropy/utils/tests/test_xml.py 2014-03-04 22:54:46.618079038 +0100
+++ astropy-0.3.1.six/astropy/utils/tests/test_xml.py 2014-03-04 23:06:17.329045548 +0100
@@ -2,7 +2,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -676,9 +891,9 @@ diff -ur astropy-0.3rc1/astropy/utils/tests/test_xml.py astropy-0.3rc1.six/astro
import io
diff -ur astropy-0.3rc1/astropy/utils/timer.py astropy-0.3rc1.six/astropy/utils/timer.py
--- astropy-0.3rc1/astropy/utils/timer.py 2013-11-19 13:22:07.533383795 +0100
+++ astropy-0.3rc1.six/astropy/utils/timer.py 2013-11-19 13:59:26.996065133 +0100
diff -ur astropy-0.3.1/astropy/utils/timer.py astropy-0.3.1.six/astropy/utils/timer.py
--- astropy-0.3.1/astropy/utils/timer.py 2014-03-04 22:54:46.600078899 +0100
+++ astropy-0.3.1.six/astropy/utils/timer.py 2014-03-04 23:06:16.514040537 +0100
@@ -4,8 +4,8 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -690,9 +905,9 @@ diff -ur astropy-0.3rc1/astropy/utils/timer.py astropy-0.3rc1.six/astropy/utils/
# STDLIB
import time
diff -ur astropy-0.3rc1/astropy/utils/xml/check.py astropy-0.3rc1.six/astropy/utils/xml/check.py
--- astropy-0.3rc1/astropy/utils/xml/check.py 2013-11-19 13:22:07.533383795 +0100
+++ astropy-0.3rc1.six/astropy/utils/xml/check.py 2013-11-19 13:59:27.018065306 +0100
diff -ur astropy-0.3.1/astropy/utils/xml/check.py astropy-0.3.1.six/astropy/utils/xml/check.py
--- astropy-0.3.1/astropy/utils/xml/check.py 2014-03-04 22:54:46.600078899 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/check.py 2014-03-04 23:06:16.530040636 +0100
@@ -6,7 +6,7 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
@ -702,9 +917,9 @@ diff -ur astropy-0.3rc1/astropy/utils/xml/check.py astropy-0.3rc1.six/astropy/ut
import re
diff -ur astropy-0.3rc1/astropy/utils/xml/iterparser.py astropy-0.3rc1.six/astropy/utils/xml/iterparser.py
--- astropy-0.3rc1/astropy/utils/xml/iterparser.py 2013-11-19 13:22:07.534383803 +0100
+++ astropy-0.3rc1.six/astropy/utils/xml/iterparser.py 2013-11-19 13:59:27.099065942 +0100
diff -ur astropy-0.3.1/astropy/utils/xml/iterparser.py astropy-0.3.1.six/astropy/utils/xml/iterparser.py
--- astropy-0.3.1/astropy/utils/xml/iterparser.py 2014-03-04 22:54:46.601078907 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/iterparser.py 2014-03-04 23:06:16.582040955 +0100
@@ -4,7 +4,7 @@
"""
from __future__ import (absolute_import, division, print_function,
@ -714,9 +929,9 @@ diff -ur astropy-0.3rc1/astropy/utils/xml/iterparser.py astropy-0.3rc1.six/astro
# STDLIB
import collections
diff -ur astropy-0.3rc1/astropy/utils/xml/writer.py astropy-0.3rc1.six/astropy/utils/xml/writer.py
--- astropy-0.3rc1/astropy/utils/xml/writer.py 2013-11-19 13:22:07.535383812 +0100
+++ astropy-0.3rc1.six/astropy/utils/xml/writer.py 2013-11-19 13:59:27.586069772 +0100
diff -ur astropy-0.3.1/astropy/utils/xml/writer.py astropy-0.3.1.six/astropy/utils/xml/writer.py
--- astropy-0.3.1/astropy/utils/xml/writer.py 2014-03-04 22:54:46.602078914 +0100
+++ astropy-0.3.1.six/astropy/utils/xml/writer.py 2014-03-04 23:06:16.634041275 +0100
@@ -5,7 +5,7 @@
"""
from __future__ import (absolute_import, division, print_function,
@ -726,9 +941,9 @@ diff -ur astropy-0.3rc1/astropy/utils/xml/writer.py astropy-0.3rc1.six/astropy/u
# STDLIB
import contextlib
diff -ur astropy-0.3rc1/astropy/wcs/setup_package.py astropy-0.3rc1.six/astropy/wcs/setup_package.py
--- astropy-0.3rc1/astropy/wcs/setup_package.py 2013-11-19 13:22:07.525383732 +0100
+++ astropy-0.3rc1.six/astropy/wcs/setup_package.py 2013-11-19 13:59:26.646062381 +0100
diff -ur astropy-0.3.1/astropy/wcs/setup_package.py astropy-0.3.1.six/astropy/wcs/setup_package.py
--- astropy-0.3.1/astropy/wcs/setup_package.py 2014-03-04 22:54:46.592078837 +0100
+++ astropy-0.3.1.six/astropy/wcs/setup_package.py 2014-03-04 23:06:16.232038804 +0100
@@ -11,7 +11,7 @@
import sys
@ -738,9 +953,9 @@ diff -ur astropy-0.3rc1/astropy/wcs/setup_package.py astropy-0.3rc1.six/astropy/
WCSROOT = os.path.relpath(os.path.dirname(__file__))
WCSVERSION = "4.10"
diff -ur astropy-0.3rc1/astropy/wcs/tests/test_pickle.py astropy-0.3rc1.six/astropy/wcs/tests/test_pickle.py
--- astropy-0.3rc1/astropy/wcs/tests/test_pickle.py 2013-11-19 13:22:07.523383716 +0100
+++ astropy-0.3rc1.six/astropy/wcs/tests/test_pickle.py 2013-11-19 13:59:26.559061696 +0100
diff -ur astropy-0.3.1/astropy/wcs/tests/test_pickle.py astropy-0.3.1.six/astropy/wcs/tests/test_pickle.py
--- astropy-0.3.1/astropy/wcs/tests/test_pickle.py 2014-03-04 22:54:46.590078822 +0100
+++ astropy-0.3.1.six/astropy/wcs/tests/test_pickle.py 2014-03-04 23:06:16.162038373 +0100
@@ -6,7 +6,7 @@
import numpy as np
from numpy.testing import assert_array_almost_equal
@ -750,9 +965,21 @@ diff -ur astropy-0.3rc1/astropy/wcs/tests/test_pickle.py astropy-0.3rc1.six/astr
from ...utils.data import get_pkg_data_contents, get_pkg_data_fileobj
from ...utils.misc import NumpyRNGContext
from ...io import fits
diff -ur astropy-0.3rc1/astropy/wcs/wcs.py astropy-0.3rc1.six/astropy/wcs/wcs.py
--- astropy-0.3rc1/astropy/wcs/wcs.py 2013-11-19 13:22:07.528383756 +0100
+++ astropy-0.3rc1.six/astropy/wcs/wcs.py 2013-11-19 13:59:26.746063167 +0100
diff -ur astropy-0.3.1/astropy/wcs/tests/test_wcs.py astropy-0.3.1.six/astropy/wcs/tests/test_wcs.py
--- astropy-0.3.1/astropy/wcs/tests/test_wcs.py 2014-03-04 22:54:46.589078814 +0100
+++ astropy-0.3.1.six/astropy/wcs/tests/test_wcs.py 2014-03-04 23:06:16.129038170 +0100
@@ -1,7 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from __future__ import absolute_import, division, print_function, unicode_literals
-from ...extern import six
+import six
import os
import sys
diff -ur astropy-0.3.1/astropy/wcs/wcs.py astropy-0.3.1.six/astropy/wcs/wcs.py
--- astropy-0.3.1/astropy/wcs/wcs.py 2014-03-04 22:54:46.595078860 +0100
+++ astropy-0.3.1.six/astropy/wcs/wcs.py 2014-03-04 23:06:16.327039388 +0100
@@ -39,7 +39,7 @@
import numpy as np

28
python-astropy.spec
View File

@ -2,8 +2,8 @@
%global upname astropy
Name: python-astropy
Version: 0.3
Release: 7%{?dist}
Version: 0.3.1
Release: 1%{?dist}
Summary: A Community Python Library for Astronomy
License: BSD
@ -13,16 +13,13 @@ Source1: astropy-README.dist
Patch0: python-astropy-system-configobj.patch
Patch1: python-astropy-system-pytest.patch
Patch2: python-astropy-system-six.patch
#
Patch3: python-astropy-wcslib320.patch
Patch3: python-astropy-backport-six15.patch
BuildRequires: python2-devel python-setuptools numpy
BuildRequires: scipy h5py
BuildRequires: git Cython pytest python-six
BuildRequires: python-sphinx graphviz
BuildRequires: python-matplotlib
# Due to bug #1030396
BuildRequires: python-matplotlib-qt4
BuildRequires: python-configobj
BuildRequires: expat-devel
BuildRequires: cfitsio-devel
@ -63,8 +60,6 @@ BuildRequires: git python3-Cython python3-pytest python3-six
BuildRequires: python3-scipy python3-h5py
BuildRequires: python3-sphinx graphviz
BuildRequires: python3-matplotlib
# Due to bug #1030396
BuildRequires: python3-matplotlib-qt4
BuildRequires: python3-configobj
#
BuildRequires: expat-devel
@ -131,7 +126,6 @@ rm -rf astropy/extern/pytest*
# Unbundle six
rm -rf astropy/extern/six.py*
%patch2 -p1
%patch3 -p1
echo "[build]" >> setup.cfg
@ -186,17 +180,19 @@ for i in %{buildroot}/usr/bin/*; do
done
%check
ASTROPY_USE_SYSTEM_PYTEST=1 %{__python2} setup.py test
pushd %{buildroot}/%{python2_sitearch}
py.test-%{python2_version} astropy
popd
%if 0%{?with_python3}
pushd %{py3dir}
ASTROPY_USE_SYSTEM_PYTEST=1 %{__python3} setup.py test
pushd %{buildroot}/%{python3_sitearch}
py.test-%{python3_version} astropy
popd
%endif # with_python3
%files
%doc README.rst README.dist licenses/LICENSE.rst
%{python2_sitearch}/*
%exclude %{python2_sitearch}/astropy/utils/tests/data/.hidden_file.txt
%files -n %{upname}-tools
%{_bindir}/*
@ -218,6 +214,12 @@ popd
%endif # with_python3
%changelog
* Wed Mar 05 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.3.1-1
- New upstream version (0.3.1)
- Remove require python(3)-matplotlib-qt4 (bug #1030396 fixed)
- Run the tests on the installed files
- Add patch to run with six 1.5.x
* Mon Jan 27 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.3-7
- Add missing requires python3-six

2
sources
View File

@ -1 +1 @@
d9aee73db94d86da1c67607d854c72b7 astropy-0.3.tar.gz
a00f8243fb3cc156327392795de2d672 astropy-0.3.1.tar.gz