Merge branch 'development' into pypi

icesat2py · Dec 21, 2023 · 3ae95de · 3ae95de
2 parents 9886767 + 6943f2f
commit 3ae95de
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,5 +32,5 @@ jobs:
 
     - stage: behind Earthdata
       script:
-        - export NSIDC_LOGIN=$NSIDC_LOGIN
+        - export EARTHDATA_PASSWORD=$NSIDC_LOGIN
         - pytest icepyx/tests/test_behind_NSIDC_API_login.py
diff --git a/icepyx/tests/ATL06v05_options.json b/icepyx/tests/ATL06v05_options.json
diff --git a/icepyx/tests/ATL06v06_options.json b/icepyx/tests/ATL06v06_options.json
diff --git a/icepyx/tests/test_behind_NSIDC_API_login.py b/icepyx/tests/test_behind_NSIDC_API_login.py
@@ -1,4 +1,5 @@
 import json
+import os
 import pytest
 
 import icepyx as ipx
@@ -23,6 +24,7 @@ def reg():
 
 @pytest.fixture(scope="module")
 def session(reg):
+    os.environ = {"EARTHDATA_USERNAME": "icepyx_devteam"}
     ed_obj = reg.session
     yield ed_obj
     ed_obj.close()
@@ -32,8 +34,8 @@ def session(reg):
 
 
 def test_get_custom_options_output(session):
-    obs = is2ref._get_custom_options(session, "ATL06", "005")
-    with open("./icepyx/tests/ATL06v05_options.json") as exp_json:
+    obs = is2ref._get_custom_options(session, "ATL06", "006")
+    with open("./icepyx/tests/ATL06v06_options.json") as exp_json:
         exp = json.load(exp_json)
         assert all(keys in obs.keys() for keys in exp.keys())
         assert all(obs[key] == exp[key] for key in exp.keys())

diff --git a/icepyx/tests/test_is2ref.py b/icepyx/tests/test_is2ref.py
@@ -1,5 +1,4 @@
 import pytest
-import warnings
 
 import icepyx.core.is2ref as is2ref