REV: post-review comments

.travis.yml

@@ -44,7 +44,6 @@ install:
   # Once pysat 3.0 is released, remove the custom pysat install and change
   # this to:
   # - while read requirement; do conda install --yes $requirement; done < requirements.txt1
-  - conda install --yes scipy pandas xarray netCDF4 portalocker
   # Check for custom numpy version install
   - if [ -z ${NUMPY_VER} ]; then
       conda install numpy;
@@ -63,13 +62,14 @@ install:
   # Prepare modified pysat install
   - cd ..
   - echo 'cloning pysat'
-  - git clone https://github.com/pysat/pysat.git >/dev/null
+  - git clone --single-branch --branch develop-3 https://github.com/pysat/pysat.git
   - echo 'installing pysat'
   - cd ./pysat
   # set up data directory
   - mkdir /home/travis/build/pysatData
   # install pysat
-  - git checkout develop-3
+  # Install the pysat requirements
+  - while read requirement; do conda install --yes $requirement; done < requirements.txt
   - python setup.py install >/dev/null
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
 

pysatMissions/instruments/_core.py

@@ -7,4 +7,4 @@ def _clean(self):
     """Cleaning function.  Simple pass since data is generated locally.
     """
 
-    pass
+    return

pysatMissions/instruments/pysat_ephem.py

@@ -16,6 +16,7 @@
 import pandas as pds
 import pysat
 
+from pysat import logger
 from pysat.instruments.methods import testing as ps_meth
 from pysatMissions.instruments import _core as mcore
 from pysatMissions.methods import magcoord as mm_magcoord
@@ -50,6 +51,9 @@ def init(self):
     self.custom.attach(mm_sc.add_ram_pointing_sc_attitude_vectors)
     self.acknowledgements = ''
     self.references = ''
+    logger.info(self.acknowledgements)
+
+    return
 
 
 def load(fnames, tag=None, inst_id=None, obs_long=0., obs_lat=0., obs_alt=0.,

pysatMissions/instruments/pysat_sgp4.py

@@ -10,6 +10,7 @@
 import pandas as pds
 
 import pysat
+from pysat import logger
 from pysat.instruments.methods import testing as ps_meth
 from pysatMissions.instruments import _core as mcore
 
@@ -32,8 +33,9 @@ def init(self):
 
     self.acknowledgements = ''
     self.references = ''
+    logger.info(self.acknowledgements)
 
-    pass
+    return
 
 
 def load(fnames, tag=None, inst_id=None, obs_long=0., obs_lat=0., obs_alt=0.,

pysatMissions/tests/test_instruments.py

@@ -27,9 +27,9 @@
 for method in method_list:
     if hasattr(getattr(InstTestClass, method), 'pytestmark'):
         # Get list of names of pytestmarks
-        Nargs = len(getattr(InstTestClass, method).pytestmark)
+        n_args = len(getattr(InstTestClass, method).pytestmark)
         names = [getattr(InstTestClass, method).pytestmark[j].name
-                 for j in range(0, Nargs)]
+                 for j in range(0, n_args)]
         # Add instruments from your library
         if 'all_inst' in names:
             mark = pytest.mark.parametrize("inst_name", instruments['names'])

setup.cfg

@@ -8,6 +8,10 @@ description = 'Mission Planning toolkit for pysat'
 keywords =
   pysat
   ionosphere
+  cubesat
+  satellite
+  ephemeris
+  orbit
 classifiers =
   Development Status :: 3 - Alpha
   Topic :: Scientific/Engineering :: Physics