From ed23591d29f5044bf8e71b5d196ac912b3601e50 Mon Sep 17 00:00:00 2001 From: Isaac Barlet Date: Tue, 6 Aug 2024 22:25:33 -0400 Subject: [PATCH] H vs h updates --- docs/_build/html/_sources/user_guide/defaults.rst.txt | 2 +- goes2go/NEW.py | 3 --- goes2go/__init__.py | 8 ++++---- goes2go/data.py | 4 ++-- tests/test_abi.py | 6 ++---- tests/test_glm.py | 6 ++---- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/docs/_build/html/_sources/user_guide/defaults.rst.txt b/docs/_build/html/_sources/user_guide/defaults.rst.txt index fc5e2a8..fbf7b0e 100644 --- a/docs/_build/html/_sources/user_guide/defaults.rst.txt +++ b/docs/_build/html/_sources/user_guide/defaults.rst.txt @@ -33,7 +33,7 @@ The default is return_as = "xarray" [nearesttime] - within = "1H" + within = "1h" return_as = "xarray" The ``[default]`` section are global settings used by each download method. These can be overwritten for each method. For instance, *s3_refresh* is set to false for ``[timerange]`` because it's unlikely you will need to refresh the file listing. Also, ``[latest]`` and ``[nearesttime]`` are by default returned as an xarray object instead of a list of files downloaded. diff --git a/goes2go/NEW.py b/goes2go/NEW.py index ea00adc..a1f0e8e 100644 --- a/goes2go/NEW.py +++ b/goes2go/NEW.py @@ -7,15 +7,12 @@ ========== """ -import itertools import logging import re from pathlib import Path -import numpy as np import pandas as pd import s3fs -import toml from goes2go import config from goes2go.data import _goes_file_df, goes_latest, goes_nearesttime, goes_timerange, goes_single_point_timerange diff --git a/goes2go/__init__.py b/goes2go/__init__.py index 46e6ede..813fe33 100644 --- a/goes2go/__init__.py +++ b/goes2go/__init__.py @@ -24,7 +24,7 @@ # TODO: Move some of the tools.py to these accessors. try: import goes2go.accessors -except: +except Exception: warnings.warn("goes2go xarray accessors could not be imported.") @@ -80,7 +80,7 @@ def _expand(self): return_as = "xarray" ["nearesttime"] -within = "1H" +within = "1h" return_as = "xarray" """ @@ -89,7 +89,7 @@ def _expand(self): try: # Load the goes2go config file config = toml.load(_config_file) -except: +except Exception: try: # Create the goes2go config file _config_path.mkdir(parents=True, exist_ok=True) @@ -106,7 +106,7 @@ def _expand(self): # Load the new goes2go config file config = toml.load(_config_file) - except (FileNotFoundError, PermissionError, IOError): + except (OSError, FileNotFoundError, PermissionError): print( f" ╭─goes2go─────────────────────────────────────────────╮\n" f" │ WARNING: Unable to create config file │\n" diff --git a/goes2go/data.py b/goes2go/data.py index b2fb13e..0c246ea 100644 --- a/goes2go/data.py +++ b/goes2go/data.py @@ -383,7 +383,7 @@ def goes_timerange( start = pd.to_datetime(start) if isinstance(end, str): end = pd.to_datetime(end) - # If `recent` is a string (like recent='1H'), parse with Pandas + # If `recent` is a string (like recent='1h'), parse with Pandas if isinstance(recent, str): recent = pd.to_timedelta(recent) @@ -520,7 +520,7 @@ def goes_single_point_timerange( start = pd.to_datetime(start) if isinstance(end, str): end = pd.to_datetime(end) - # If `recent` is a string (like recent='1H'), parse with Pandas + # If `recent` is a string (like recent='1h'), parse with Pandas if isinstance(recent, str): recent = pd.to_timedelta(recent) diff --git a/tests/test_abi.py b/tests/test_abi.py index 8bbf566..24d662a 100644 --- a/tests/test_abi.py +++ b/tests/test_abi.py @@ -1,11 +1,9 @@ ## Brian Blaylock ## October 18, 2021 -""" -Some simple tests for the ABI data -""" +"""Some simple tests for the ABI data.""" -from goes2go.data import goes_nearesttime, goes_latest, goes_timerange +from goes2go.data import goes_nearesttime, goes_latest def test_nearesttime(): diff --git a/tests/test_glm.py b/tests/test_glm.py index 9cb560d..ade17de 100644 --- a/tests/test_glm.py +++ b/tests/test_glm.py @@ -1,11 +1,9 @@ ## Brian Blaylock ## October 18, 2021 -""" -Some simple tests for the GLM data -""" +"""Some simple tests for the GLM data.""" -from goes2go.data import goes_latest, goes_nearesttime, goes_timerange +from goes2go.data import goes_latest, goes_nearesttime def test_nearesttime():