From 8c9b8dada548a81b6560d1404f63b9479d427c94 Mon Sep 17 00:00:00 2001 From: "Kevin W. Beam" Date: Wed, 27 Nov 2024 14:49:08 -0700 Subject: [PATCH] Let ruff cleanup & sort imports --- src/nsidc/metgen/aws.py | 1 - src/nsidc/metgen/cli.py | 5 +---- src/nsidc/metgen/config.py | 3 +-- src/nsidc/metgen/metgen.py | 14 +++++--------- src/nsidc/metgen/netcdf_reader.py | 7 +++---- tests/test_aws.py | 4 +--- tests/test_cli.py | 4 +--- tests/test_config.py | 7 ++----- tests/test_metgen.py | 6 ++---- tests/test_netcdf_reader.py | 4 +--- 10 files changed, 17 insertions(+), 38 deletions(-) diff --git a/src/nsidc/metgen/aws.py b/src/nsidc/metgen/aws.py index 595970b..0b0012d 100644 --- a/src/nsidc/metgen/aws.py +++ b/src/nsidc/metgen/aws.py @@ -1,6 +1,5 @@ import boto3 - KINESIS_PARTITION_KEY = "metgenc-duck" diff --git a/src/nsidc/metgen/cli.py b/src/nsidc/metgen/cli.py index 0b5da9f..8ded02e 100644 --- a/src/nsidc/metgen/cli.py +++ b/src/nsidc/metgen/cli.py @@ -2,10 +2,7 @@ import click -from nsidc.metgen import config -from nsidc.metgen import metgen -from nsidc.metgen import constants - +from nsidc.metgen import config, constants, metgen LOGGER = logging.getLogger("metgenc") diff --git a/src/nsidc/metgen/config.py b/src/nsidc/metgen/config.py index 2556223..f2515cd 100644 --- a/src/nsidc/metgen/config.py +++ b/src/nsidc/metgen/config.py @@ -4,8 +4,7 @@ import os.path from pathlib import Path -from nsidc.metgen import aws -from nsidc.metgen import constants +from nsidc.metgen import aws, constants class ValidationError(Exception): diff --git a/src/nsidc/metgen/metgen.py b/src/nsidc/metgen/metgen.py index 4a6f171..b41d8ab 100644 --- a/src/nsidc/metgen/metgen.py +++ b/src/nsidc/metgen/metgen.py @@ -2,27 +2,23 @@ import dataclasses import datetime as dt import hashlib -from importlib.resources import open_text import json -import jsonschema import logging import os.path import sys -from typing import Callable +import uuid +from importlib.resources import open_text from pathlib import Path from string import Template -import uuid +from typing import Callable +import jsonschema from funcy import all, filter, partial, rcompose, take from pyfiglet import Figlet from returns.maybe import Maybe from rich.prompt import Confirm, Prompt -from nsidc.metgen import aws -from nsidc.metgen import config -from nsidc.metgen import constants -from nsidc.metgen import netcdf_reader - +from nsidc.metgen import aws, config, constants, netcdf_reader # ------------------------------------------------------------------- CONSOLE_FORMAT = "%(message)s" diff --git a/src/nsidc/metgen/netcdf_reader.py b/src/nsidc/metgen/netcdf_reader.py index fec7954..ac563a6 100644 --- a/src/nsidc/metgen/netcdf_reader.py +++ b/src/nsidc/metgen/netcdf_reader.py @@ -1,11 +1,10 @@ import json import os.path -import xarray as xr from datetime import timezone -from dateutil.parser import parse -from pyproj import CRS -from pyproj import Transformer +import xarray as xr +from dateutil.parser import parse +from pyproj import CRS, Transformer from nsidc.metgen import constants diff --git a/tests/test_aws.py b/tests/test_aws.py index 0c668e4..efc8635 100644 --- a/tests/test_aws.py +++ b/tests/test_aws.py @@ -3,12 +3,10 @@ from tempfile import TemporaryFile import boto3 -from moto import mock_aws import pytest - +from moto import mock_aws from nsidc.metgen import aws - # Unit tests for the 'aws' module functions. # # The test boundary is the aws module's interface with the AWS library's boto3 diff --git a/tests/test_cli.py b/tests/test_cli.py index b22d1c7..cf92b8a 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1,11 +1,9 @@ from unittest.mock import patch -from click.testing import CliRunner import pytest - +from click.testing import CliRunner from nsidc.metgen.cli import cli - # Unit tests for the 'cli' module functions. # # The test boundary is the cli module's interface with the metgen module, so in diff --git a/tests/test_config.py b/tests/test_config.py index 93f02bc..917f3c7 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,12 +1,9 @@ -from configparser import ConfigParser, ExtendedInterpolation import dataclasses +from configparser import ConfigParser, ExtendedInterpolation from unittest.mock import patch import pytest - -from nsidc.metgen import config -from nsidc.metgen import constants - +from nsidc.metgen import config, constants # Unit tests for the 'config' module functions. # diff --git a/tests/test_metgen.py b/tests/test_metgen.py index 21689a7..f6a619a 100644 --- a/tests/test_metgen.py +++ b/tests/test_metgen.py @@ -1,11 +1,9 @@ import datetime as dt from unittest.mock import patch -from funcy import identity, partial import pytest - -from nsidc.metgen import config -from nsidc.metgen import metgen +from funcy import identity, partial +from nsidc.metgen import config, metgen # Unit tests for the 'metgen' module functions. # diff --git a/tests/test_netcdf_reader.py b/tests/test_netcdf_reader.py index 0335194..b6d7e9c 100644 --- a/tests/test_netcdf_reader.py +++ b/tests/test_netcdf_reader.py @@ -1,7 +1,5 @@ import pytest - -from nsidc.metgen import constants -from nsidc.metgen import netcdf_reader +from nsidc.metgen import constants, netcdf_reader # Unit tests for the 'netcdf_reader' module functions. #