ENH: Fixed linting issues

ARM-DOE · Sep 13, 2024 · 8ad3643 · 8ad3643
1 parent 337a840
commit 8ad3643
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 57 deletions.
diff --git a/act/discovery/__init__.py b/act/discovery/__init__.py
@@ -8,7 +8,17 @@
 
 __getattr__, __dir__, __all__ = lazy.attach(
     __name__,
-    submodules=['arm', 'asos', 'airnow', 'cropscape', 'improve', 'noaapsl', 'neon', 'surfrad', 'nasa'],
+    submodules=[
+        'arm',
+        'asos',
+        'airnow',
+        'cropscape',
+        'improve',
+        'noaapsl',
+        'neon',
+        'surfrad',
+        'nasa',
+    ],
     submod_attrs={
         'arm': ['download_arm_data', 'get_arm_doi'],
         'asos': ['get_asos_data'],
@@ -18,6 +28,6 @@
         'noaapsl': ['download_noaa_psl_data'],
         'neon': ['get_neon_site_products', 'get_neon_product_avail', 'download_neon_data'],
         'surfrad': ['download_surfrad_data'],
-        'nasa' : ["download_mplnet_data", "get_mplnet_meta"]
+        'nasa': ["download_mplnet_data", "get_mplnet_meta"],
     },
 )
diff --git a/act/discovery/nasa.py b/act/discovery/nasa.py
@@ -9,21 +9,17 @@
 import re
 import shutil
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib import urlopen
-
-
-def download_mplnet_data(version=None,
-                         level=None,
-                         product=None,
-                         site=None,
-                         year=None,
-                         month=None,
-                         day=None,
-                         outdir=None,
-                         ):
+
+def download_mplnet_data(
+    version=None,
+    level=None,
+    product=None,
+    site=None,
+    year=None,
+    month=None,
+    day=None,
+    outdir=None,
+):
     """
     Function to download data from the NASA MPL Network Data
     https://mplnet.gsfc.nasa.gov/mplnet_web_services.cgi?download
@@ -83,12 +79,18 @@ def download_mplnet_data(version=None,
     print("The MPLNET Data Policy can be found at:\n\thttps://mplnet.gsfc.nasa.gov/data-policy\n")
 
     # Generate the data acknowledgement statement, might require site information.
-    print("Please Include the Following Acknowledgements in Any Publication \nor" +
-          " presentation of MPLNET data, regardless of co-authorship status:")
-    print("\n\tThe MPLNET project is funded by the NASA Radiation Sciences Program" +
-          " \n\tand Earth Observing System.")
-    print("\n\tWe thank the MPLNET (PI) for (its/theirs) effort in establishing" +
-          " \n\tand maintaining sites.\n")
+    print(
+        "Please Include the Following Acknowledgements in Any Publication \nor"
+        + " presentation of MPLNET data, regardless of co-authorship status:"
+    )
+    print(
+        "\n\tThe MPLNET project is funded by the NASA Radiation Sciences Program"
+        + " \n\tand Earth Observing System."
+    )
+    print(
+        "\n\tWe thank the MPLNET (PI) for (its/theirs) effort in establishing"
+        + " \n\tand maintaining sites.\n"
+    )
 
     # Define the base URL
     base_url = "https://mplnet.gsfc.nasa.gov/download?"
@@ -115,14 +117,12 @@ def download_mplnet_data(version=None,
         base_url += "&site=" + str(site)
 
     if year is None:
-        raise ValueError(
-            "Year of desired data download is required to download MPLNET data")
+        raise ValueError("Year of desired data download is required to download MPLNET data")
     else:
         base_url += "&year=" + str(year)
 
     if month is None:
-        raise ValueError(
-            "Month of desired data download is required to download MPLNet data")
+        raise ValueError("Month of desired data download is required to download MPLNet data")
     else:
         base_url += "&month=" + str(month)
 
@@ -145,15 +145,14 @@ def download_mplnet_data(version=None,
     # Make a Request
     files = []
     with requests.get(base_url, stream=True) as r:
-        fname = re.findall("filename=(.+)",
-                           r.headers['Content-Disposition']
-                           )
+        fname = re.findall("filename=(.+)", r.headers['Content-Disposition'])
         # Check for successful file check
         if fname[0][1:-1] == "MPLNET_download_fail.txt":
-            raise ValueError("Failed MPLNET Download\n" +
-                             " File could not be found for the desired input parameters" +
-                             " for MPLNET Download API"
-                             )
+            raise ValueError(
+                "Failed MPLNET Download\n"
+                + " File could not be found for the desired input parameters"
+                + " for MPLNET Download API"
+            )
         else:
             output_filename = os.path.join(output_dir, fname[0][1:-1])
             print("[DOWNLOADING] ", fname[0][1:-1])
@@ -164,12 +163,9 @@ def download_mplnet_data(version=None,
     return files
 
 
-def get_mplnet_meta(sites=None,
-                    method=None,
-                    year=None,
-                    month=None,
-                    day=None,
-                    print_to_screen=False):
+def get_mplnet_meta(
+    sites=None, method=None, year=None, month=None, day=None, print_to_screen=False
+):
     """
     Returns a list of meta data from the NASA MPL Network Data
     https://mplnet.gsfc.nasa.gov/mplnet_web_services.cgi?metadata
@@ -212,9 +208,7 @@ def get_mplnet_meta(sites=None,
     base_url = "https://mplnet.gsfc.nasa.gov/operations/sites?api&format=galion"
 
     if sites is None:
-        raise ValueError(
-            "Site Parameter is required to download MPLNET Meta Data"
-        )
+        raise ValueError("Site Parameter is required to download MPLNET Meta Data")
     else:
         base_url += "&sites=" + str(sites)
 

diff --git a/examples/discovery/download_mplnet.py b/examples/discovery/download_mplnet.py
@@ -7,22 +7,12 @@
 
 """
 
-import os
-import glob
-
 import act
 
 # Determine MPLNET site of interest
-meta = act.discovery.get_mplnet_meta(sites="active",
-                                     method="data",
-                                     print_to_screen=True
-                                     )
+meta = act.discovery.get_mplnet_meta(sites="active", method="data", print_to_screen=True)
 
 # Download MPLNET data for site of interest
-output = act.discovery.download_mplnet_data(version=3,
-                                            level=2,
-                                            product="NRB",
-                                            site="GSFC",
-                                            year="2022",
-                                            month="09",
-                                            day="01")
+output = act.discovery.download_mplnet_data(
+    version=3, level=2, product="NRB", site="GSFC", year="2022", month="09", day="01"
+)