Merge ac08efc into fd08a22

.travis.yml

@@ -51,18 +51,24 @@ install:
       conda install numpy==$NUMPY_VER;
     fi
   # Dependencies not available through conda, install through pip
-  - pip install apexpy
   - pip install aacgmv2
   - pip install pyEphem
   - pip install sgp4
 
   # Get dependencies not provided by conda from pip (testing dependencies)
   - pip install -r test_requirements.txt
 
+  # Custom apexpy install
+  - cd ..
+  - echo 'cloning apexpy'
+  - git clone --single-branch --branch main https://github.com/aburrell/apexpy.git
+  - cd ./apexpy
+  - python setup.py install >/dev/null
+
   # Prepare modified pysat install
   - cd ..
   - echo 'cloning pysat'
-  - git clone --single-branch --branch develop-3 https://github.com/pysat/pysat.git
+  - git clone --single-branch --branch v3-0-rc1 https://github.com/pysat/pysat.git
   - echo 'installing pysat'
   - cd ./pysat
   # set up data directory

pysatMissions/tests/test_instruments.py

@@ -12,8 +12,6 @@
 from pysat.tests.instrument_test_class import InstTestClass
 
 
-saved_path = pysat.data_dir
-
 # Developers for instrument libraries should update the following line to
 # point to their own subpackage location
 # e.g.,
@@ -54,15 +52,15 @@ def setup_class(self):
         # Make sure to use a temporary directory so that the user's setup is not
         # altered
         self.tempdir = tempfile.TemporaryDirectory()
-        self.saved_path = pysat.data_dir
-        pysat.utils.set_data_dir(self.tempdir.name, store=False)
+        self.saved_path = pysat.params['data_dirs']
+        pysat.params.data['data_dirs'] = [self.tempdir.name]
         # Developers for instrument libraries should update the following line
         # to point to their own subpackage location, e.g.,
         # self.inst_loc = mypackage.instruments
         self.inst_loc = pysatMissions.instruments
 
     def teardown_class(self):
         """Runs once to clean up testing from this class."""
-        pysat.utils.set_data_dir(self.saved_path, store=False)
+        pysat.params.data['data_dirs'] = self.saved_path
         self.tempdir.cleanup()
         del self.inst_loc, self.saved_path, self.tempdir