Merge pull request #676 from dstansby/fix-warns

Fix some warnings
heliopython · Mar 23, 2019 · 1aef146 · 1aef146
2 parents 0007cc0 + a28d495
commit 1aef146
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/heliopy/data/cassini.py b/heliopy/data/cassini.py
@@ -196,9 +196,9 @@ def processing_func(f):
             f.close()
             os.remove(f.name)
             raise util.NoDataError()
-        df = pd.read_table(f, names=['Time', 'Bx', 'By', 'Bz'],
-                           delim_whitespace=True,
-                           parse_dates=[0], index_col=0)
+        df = pd.read_csv(f, names=['Time', 'Bx', 'By', 'Bz'],
+                         delim_whitespace=True,
+                         parse_dates=[0], index_col=0)
         return df
 
     return util.process(dirs, fnames, extension, local_base_dir,

diff --git a/heliopy/data/spice.py b/heliopy/data/spice.py
@@ -77,11 +77,11 @@ def make_doc_entry(self):
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2015_076_01.depm.bsp',
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2015_219_01.depm.bsp',
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2018_019_01.depm.bsp',
-                               'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_017_01.depm.bsp',
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_030_01.depm.bsp',
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_045_01.depm.bsp',
                                'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_060_01.depm.bsp',
-                               'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_063_01.depm.bsp', ],
+                               'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_063_01.depm.bsp',
+                               'https://sohowww.nascom.nasa.gov/solarsoft/stereo/gen/data/spice/depm/ahead/ahead_2019_080_01.depm.bsp', ],
                               ''),
                       _Kernel('Ulysses', 'ulysses',
                               ['https://naif.jpl.nasa.gov/pub/naif/ULYSSES/kernels/spk/ulysses_1990_2009_2050.bsp',

diff --git a/heliopy/data/wind.py b/heliopy/data/wind.py
@@ -29,7 +29,7 @@ def _docstring(identifier, description):
 
 
 def _wind(starttime, endtime, identifier, units=None,
-          warn_missing_units=True, badvalues=None):
+          warn_missing_units=False, badvalues=None):
     """
     Generic method for downloading ACE data.
     """
@@ -65,7 +65,7 @@ def mfi_h0(starttime, endtime):
 
 
 mfi_h0.__doc__ = _docstring(
-    'WI_H0_MFI', 'Composite magnetic field data')
+    'WI_H0_MFI', 'Composite magnetic field')
 
 
 def mfi_h2(starttime, endtime):
@@ -77,7 +77,7 @@ def mfi_h2(starttime, endtime):
 
 
 mfi_h2.__doc__ = _docstring(
-    'WI_H2_MFI', 'High resolution magnetic field data')
+    'WI_H2_MFI', 'High resolution magnetic field')
 
 
 def threedp_pm(starttime, endtime):
@@ -86,7 +86,7 @@ def threedp_pm(starttime, endtime):
 
 
 threedp_pm.__doc__ = _docstring(
-    'WI_PM_3DP', '1 spin resolution ion (proton and alpha) moments')
+    'WI_PM_3DP', '1 spin resolution ion (proton and alpha) moment')
 
 
 def threedp_e0_emfits(starttime, endtime):
@@ -95,7 +95,7 @@ def threedp_e0_emfits(starttime, endtime):
 
 
 threedp_e0_emfits.__doc__ = _docstring(
-    'WI_EMFITS_E0_3DP', 'electron moments')
+    'WI_EMFITS_E0_3DP', 'Electron moment')
 
 
 # Old (non-CDAS) functions start here