From 6f5859c850e49aac2dcfc9bf37dd5666cf6a4fee Mon Sep 17 00:00:00 2001
From: Jeff Klenzing <jklenzing@gmail.com>
Date: Fri, 5 Mar 2021 17:24:25 -0500
Subject: [PATCH 1/3] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 340e2aa..179e1f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ install:
   - cd ..
   - git clone https://github.com/pysat/pysat.git
   - cd pysat
-  - git checkout develop-3
+  - git checkout v3-0-rc1
   - python setup.py install
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
 

From 2d151db045fbb2ba6d0150bbb49c876b41676a79 Mon Sep 17 00:00:00 2001
From: Jeff Klenzing <jklenzing@gmail.com>
Date: Fri, 5 Mar 2021 17:31:03 -0500
Subject: [PATCH 2/3] BUG: test data dir

---
 pysatIncubator/tests/test_instruments.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pysatIncubator/tests/test_instruments.py b/pysatIncubator/tests/test_instruments.py
index 958c46f..243e574 100644
--- a/pysatIncubator/tests/test_instruments.py
+++ b/pysatIncubator/tests/test_instruments.py
@@ -46,8 +46,8 @@ 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
@@ -55,7 +55,7 @@ def setup_class(self):
 
     def teardown_class(self):
         """Runs after every method to clean up previous testing."""
-        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
 

From d60bd5b453e490918598c79e5a8bcbfe56bda19a Mon Sep 17 00:00:00 2001
From: Jeff Klenzing <jklenzing@gmail.com>
Date: Mon, 12 Apr 2021 11:52:46 -0400
Subject: [PATCH 3/3] TST: install pysat from pip

---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 179e1f7..3f441f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 dist: xenial
 matrix:
   include:
-    - python: 3.6
     - python: 3.7
 
 services: xvfb
@@ -33,11 +32,7 @@ install:
   - pip install coveralls
   - pip install pytest-flake8
   # Custom pysat install
-  - cd ..
-  - git clone https://github.com/pysat/pysat.git
-  - cd pysat
-  - git checkout v3-0-rc1
-  - python setup.py install
+  - pip install pysat>=3.0
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
 
   # Install pysatMagVect after pysat
@@ -45,7 +40,6 @@ install:
 
   # set up data directory
   - mkdir /home/travis/build/pysatData
-  - cd ../pysatIncubator
   # install pysatIncubator
   - python setup.py install