From ba8d024163f9a9739d86da4bd92088aa4958e876 Mon Sep 17 00:00:00 2001 From: Josh Dillon Date: Fri, 8 Nov 2019 10:37:42 -0800 Subject: [PATCH] update other modules for py3 only --- hera_cal/__init__.py | 4 +--- hera_cal/abscal.py | 5 +---- hera_cal/apply_cal.py | 4 +--- hera_cal/autos.py | 4 +--- hera_cal/datacontainer.py | 5 +---- hera_cal/delay_filter.py | 5 +---- hera_cal/flag_utils.py | 5 +---- hera_cal/frf.py | 5 +---- hera_cal/io.py | 5 +---- hera_cal/lstbin.py | 5 +---- hera_cal/noise.py | 4 +--- hera_cal/reflections.py | 1 - hera_cal/smooth_cal.py | 5 +---- hera_cal/tempcal.py | 2 -- hera_cal/utils.py | 5 +---- hera_cal/vis_clean.py | 5 +---- 16 files changed, 14 insertions(+), 55 deletions(-) diff --git a/hera_cal/__init__.py b/hera_cal/__init__.py index b98ac1067..569b31af1 100644 --- a/hera_cal/__init__.py +++ b/hera_cal/__init__.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - from . import utils from . import redcal from . import version diff --git a/hera_cal/abscal.py b/hera_cal/abscal.py index 3ece89d62..b81ca949e 100644 --- a/hera_cal/abscal.py +++ b/hera_cal/abscal.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License """ abscal.py @@ -22,8 +22,6 @@ where {i,j} index antennas and {x,y} are the polarization of the i-th and j-th antenna respectively. """ -from __future__ import print_function, division, absolute_import - import os from collections import OrderedDict as odict import copy @@ -31,7 +29,6 @@ import numpy as np import operator from functools import reduce -from six.moves import map, range, zip from scipy import signal, interpolate, spatial from scipy.optimize import brute, minimize from pyuvdata import UVCal, UVData diff --git a/hera_cal/apply_cal.py b/hera_cal/apply_cal.py index 1138dcffd..8060535df 100644 --- a/hera_cal/apply_cal.py +++ b/hera_cal/apply_cal.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License """Module for applying calibration solutions to visibility data, both in memory and on disk.""" -from __future__ import print_function, division, absolute_import - import numpy as np import argparse diff --git a/hera_cal/autos.py b/hera_cal/autos.py index bbc77b05b..cc8378dab 100644 --- a/hera_cal/autos.py +++ b/hera_cal/autos.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License """Module for extracting autocorrelations, with the option to calibrate before writing to disk.""" -from __future__ import print_function, division, absolute_import - import argparse from . import io from . import version diff --git a/hera_cal/datacontainer.py b/hera_cal/datacontainer.py index cb9ccac30..895ce6452 100644 --- a/hera_cal/datacontainer.py +++ b/hera_cal/datacontainer.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np from collections import OrderedDict as odict -from six.moves import map, zip import copy from .utils import conj_pol, comply_pol, make_bl, comply_bl, reverse_bl diff --git a/hera_cal/delay_filter.py b/hera_cal/delay_filter.py index e5aef1405..b5c2aeb87 100644 --- a/hera_cal/delay_filter.py +++ b/hera_cal/delay_filter.py @@ -1,15 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License """Module for delay filtering data and related operations.""" -from __future__ import print_function, division, absolute_import - import numpy as np from copy import deepcopy import argparse -from six.moves import range, zip from . import io from . import version diff --git a/hera_cal/flag_utils.py b/hera_cal/flag_utils.py index 8a9324b15..dab800861 100644 --- a/hera_cal/flag_utils.py +++ b/hera_cal/flag_utils.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np import copy -from six.moves import zip from scipy.interpolate import interp1d from pyuvdata import UVData diff --git a/hera_cal/frf.py b/hera_cal/frf.py index 69a9fafcb..b517e90bd 100644 --- a/hera_cal/frf.py +++ b/hera_cal/frf.py @@ -1,11 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np -from six.moves import range try: from uvtools import dspec HAVE_UVTOOLS = True diff --git a/hera_cal/io.py b/hera_cal/io.py index d451ae6bb..d85db3a86 100644 --- a/hera_cal/io.py +++ b/hera_cal/io.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np from collections import OrderedDict as odict import operator @@ -12,7 +10,6 @@ import warnings from functools import reduce import collections -from six.moves import map, range, zip from pyuvdata import UVCal, UVData from pyuvdata import utils as uvutils from astropy import units diff --git a/hera_cal/lstbin.py b/hera_cal/lstbin.py index cecf7dc2f..af0ba1233 100644 --- a/hera_cal/lstbin.py +++ b/hera_cal/lstbin.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import os from collections import OrderedDict as odict import copy @@ -13,7 +11,6 @@ import operator import gc as garbage_collector import datetime -from six.moves import map, range from . import utils from . import version diff --git a/hera_cal/noise.py b/hera_cal/noise.py index 34d799d1f..93539f8ff 100644 --- a/hera_cal/noise.py +++ b/hera_cal/noise.py @@ -1,11 +1,9 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License """Module for predicting noise on visibilties using autocorrelations and for producing noise standard deviation data files.""" -from __future__ import print_function, division, absolute_import - import numpy as np import argparse import scipy diff --git a/hera_cal/reflections.py b/hera_cal/reflections.py index 99029be69..e9e7ace5a 100644 --- a/hera_cal/reflections.py +++ b/hera_cal/reflections.py @@ -63,7 +63,6 @@ The code here models the time and delay dependent behavior through a combination of SVD and fringe-rate filtering. """ -from __future__ import print_function, division, absolute_import import numpy as np import os import copy diff --git a/hera_cal/smooth_cal.py b/hera_cal/smooth_cal.py index 31794ddbf..747f04e9c 100644 --- a/hera_cal/smooth_cal.py +++ b/hera_cal/smooth_cal.py @@ -1,14 +1,11 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import absolute_import, division, print_function - import numpy as np import scipy from collections import OrderedDict as odict from copy import deepcopy -from six.moves import range import warnings import argparse diff --git a/hera_cal/tempcal.py b/hera_cal/tempcal.py index 1d12c7586..7f53fb55e 100644 --- a/hera_cal/tempcal.py +++ b/hera_cal/tempcal.py @@ -2,8 +2,6 @@ # Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np import copy diff --git a/hera_cal/utils.py b/hera_cal/utils.py index 570c7fb8e..907b9ffac 100644 --- a/hera_cal/utils.py +++ b/hera_cal/utils.py @@ -1,13 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np import os import copy -from six.moves import map, range import astropy.constants as const from astropy.time import Time from astropy import coordinates as crd diff --git a/hera_cal/vis_clean.py b/hera_cal/vis_clean.py index db565e45e..d370896fb 100644 --- a/hera_cal/vis_clean.py +++ b/hera_cal/vis_clean.py @@ -1,13 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright 2018 the HERA Project +# Copyright 2019 the HERA Project # Licensed under the MIT License -from __future__ import print_function, division, absolute_import - import numpy as np from collections import OrderedDict as odict import datetime -from six.moves import range try: from uvtools import dspec HAVE_UVTOOLS = True