Remove qwdata example and NADP fix

Author: thodson-usgs

dataretrieval/nadp.py

@@ -30,10 +30,8 @@
 """
 
 import io
-import os
 import re
 import zipfile
-from os.path import basename
 
 import requests
 
@@ -118,7 +116,7 @@ def get_annual_MDN_map(measurement_type, year, path):
     if path:
         z.extractall(path)
 
-    return f"{path}{os.sep}{basename(filename)}"
+    return str(path)
 
 
 def get_annual_NTN_map(measurement_type, measurement=None, year=None, path="."):
@@ -174,7 +172,7 @@ def get_annual_NTN_map(measurement_type, measurement=None, year=None, path="."):
     if path:
         z.extractall(path)
 
-    return f"{path}{os.sep}{basename(filename)}"
+    return str(path)
 
 
 def get_zip(url, filename):

docs/source/examples/readme_examples.rst

@@ -29,15 +29,6 @@ Examples from the Readme file on retrieving NWIS data
     <BLANKLINE>
     [5 rows x 21 columns]
 
-    >>> # get water quality samples (qwdata)
-    >>> df2 = nwis.get_record(sites=site, service='qwdata', start='2018-12-01', end='2019-01-01')
-
-    >>> print(df2)
-                              agency_cd   site_no   sample_dt sample_tm  sample_end_dt  sample_end_tm  ... p80154 p82398 p84164  p91157  p91158  p91159
-    datetime                                                                                           ...
-    2018-12-10 17:30:00+00:00      USGS  03339000  2018-12-10     11:30            NaN            NaN  ...     16     50   3060  0.0165  0.0141  0.0024
-    <BLANKLINE>
-    [1 rows x 33 columns]
 
     >>> # get basic info about the site
     >>> df3 = nwis.get_record(sites=site, service='site')

tests/nadp_test.py

@@ -19,13 +19,13 @@ def test_get_annual_MDN_map_zip(self, tmp_path):
         z_path = nadp.get_annual_MDN_map(
             measurement_type="conc", year="2010", path=tmp_path
         )
-        exp_path = os.path.join(tmp_path, "Hg_conc_2010.zip")
-        # assert path matches expectation
-        assert z_path == str(exp_path)
-        # assert unpacked zip exists as a directory
-        assert os.path.exists(exp_path[:-4])
+        # assert path matches expectation (now returns the path directory)
+        assert z_path == str(tmp_path)
+        # assert unpacked directory exists
+        exp_dir = os.path.join(tmp_path, "Hg_conc_2010")
+        assert os.path.exists(exp_dir)
         # assert tif exists in directory
-        assert os.path.exists(os.path.join(z_path[:-4], "conc_Hg_2010.tif"))
+        assert os.path.exists(os.path.join(exp_dir, "conc_Hg_2010.tif"))
 
 
 class TestNTNmap:
@@ -36,10 +36,10 @@ def test_get_annual_NTN_map_zip(self, tmp_path):
         z_path = nadp.get_annual_NTN_map(
             measurement_type="Precip", year="2015", path=tmp_path
         )
-        exp_path = os.path.join(tmp_path, "Precip_2015.zip")
         # assert path matches expectation
-        assert z_path == str(exp_path)
-        # assert unpacked zip exists as a directory
-        assert os.path.exists(exp_path[:-4])
+        assert z_path == str(tmp_path)
+        # assert unpacked directory exists
+        exp_dir = os.path.join(tmp_path, "Precip_2015")
+        assert os.path.exists(exp_dir)
         # assert tif exists in directory
-        assert os.path.exists(os.path.join(z_path[:-4], "Precip_2015.tif"))
+        assert os.path.exists(os.path.join(exp_dir, "Precip_2015.tif"))