diff --git a/.travis.yml b/.travis.yml
index b3d7081e7..e21279ef0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,4 +41,4 @@ jobs:
- stage: behind Earthdata
script:
- export EARTHDATA_PASSWORD=$NSIDC_LOGIN
- - pytest icepyx/tests/test_behind_NSIDC_API_login.py
+ - pytest --verbose icepyx/tests/test_behind_NSIDC_API_login.py
diff --git a/doc/source/user_guide/documentation/classes_dev_uml.svg b/doc/source/user_guide/documentation/classes_dev_uml.svg
index 8079985cc..3e3f519f8 100644
--- a/doc/source/user_guide/documentation/classes_dev_uml.svg
+++ b/doc/source/user_guide/documentation/classes_dev_uml.svg
@@ -340,6 +340,25 @@
icepyx.core.spatial.Spatial
+<<<<<<< HEAD
+
+Spatial
+
+_ext_type : str
+_gdf_spat : GeoDataFrame, DataFrame
+_geom_file : NoneType
+_spatial_ext
+_xdateln
+extent
+extent_as_gdf
+extent_file
+extent_type
+
+__init__(spatial_extent)
+__str__()
+fmt_for_CMR()
+fmt_for_EGI()
+=======
Spatial
@@ -357,6 +376,7 @@
__str__()
fmt_for_CMR()
fmt_for_EGI()
+>>>>>>> development
diff --git a/icepyx/tests/test_behind_NSIDC_API_login.py b/icepyx/tests/test_behind_NSIDC_API_login.py
index 47d0a10d2..df14338d1 100644
--- a/icepyx/tests/test_behind_NSIDC_API_login.py
+++ b/icepyx/tests/test_behind_NSIDC_API_login.py
@@ -13,13 +13,25 @@
# or is this an NSIDC level test so long as we verify the right info is submitted?
-@pytest.fixture(scope="module")
-def reg():
- live_reg = ipx.Query(
- "ATL06", [-55, 68, -48, 71], ["2019-02-22", "2019-02-28"], version="006"
- )
- yield live_reg
- del live_reg
+@pytest.fixture(
+ scope="module",
+ params=[
+ dict(
+ product="ATL14",
+ spatial_extent=[20, 79, 28, 80],
+ date_range=["2019-03-29", "2022-03-22"],
+ version="002",
+ ),
+ dict(
+ product="ATL06",
+ spatial_extent=[-55, 68, -48, 71],
+ date_range=["2019-02-22", "2019-02-28"],
+ version="006",
+ ),
+ ],
+)
+def reg(request):
+ return ipx.Query(**request.param)
@pytest.fixture(scope="module")
@@ -37,8 +49,9 @@ def test_get_custom_options_output(session):
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())
+ for key in exp.keys():
+ assert key in obs.keys()
+ assert exp[key] == obs[key]
########## query module ##########