From c2e6dbb2ab3b4c4d2e218ac6f653baefa665260b Mon Sep 17 00:00:00 2001 From: Ryan Kingsbury Date: Tue, 27 Jun 2023 16:37:49 -0400 Subject: [PATCH] Run ruff check --fix on project --- src/maggma/api/API.py | 1 - src/maggma/api/query_operator/sorting.py | 4 ++-- src/maggma/builders/projection_builder.py | 2 +- src/maggma/core/builder.py | 2 +- src/maggma/core/store.py | 2 +- src/maggma/stores/aws.py | 2 +- src/maggma/stores/compound_stores.py | 2 +- tests/api/test_aggregation_resource.py | 3 +-- tests/api/test_query_operators.py | 3 +-- tests/api/test_submission_resource.py | 6 ++---- tests/cli/test_init.py | 1 - tests/cli/test_multiprocessing.py | 1 - tests/stores/test_aws.py | 3 --- tests/stores/test_shared_stores.py | 2 +- tests/stores/test_ssh_tunnel.py | 1 - 15 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/maggma/api/API.py b/src/maggma/api/API.py index b1188d96d..51042ce29 100644 --- a/src/maggma/api/API.py +++ b/src/maggma/api/API.py @@ -8,7 +8,6 @@ from monty.json import MSONable from starlette.responses import RedirectResponse -from maggma import __version__ from maggma.api.resource import Resource diff --git a/src/maggma/api/query_operator/sorting.py b/src/maggma/api/query_operator/sorting.py index ff6cf14a4..9f20054ca 100644 --- a/src/maggma/api/query_operator/sorting.py +++ b/src/maggma/api/query_operator/sorting.py @@ -1,6 +1,6 @@ -from typing import Optional, List +from typing import Optional -from fastapi import HTTPException, Query +from fastapi import Query from maggma.api.query_operator import QueryOperator from maggma.api.utils import STORE_PARAMS diff --git a/src/maggma/builders/projection_builder.py b/src/maggma/builders/projection_builder.py index 2ab574711..71cee1220 100644 --- a/src/maggma/builders/projection_builder.py +++ b/src/maggma/builders/projection_builder.py @@ -1,7 +1,7 @@ from copy import deepcopy from datetime import datetime from itertools import chain -from typing import Dict, Iterable, List, Set, Union +from typing import Dict, Iterable, List, Union from pydash import get diff --git a/src/maggma/core/builder.py b/src/maggma/core/builder.py index db113b4ca..d46f8a17f 100644 --- a/src/maggma/core/builder.py +++ b/src/maggma/core/builder.py @@ -5,7 +5,7 @@ import logging from abc import ABCMeta, abstractmethod -from typing import Any, Dict, Iterable, List, Optional, Union +from typing import Any, Dict, Iterable, List, Union from monty.json import MontyDecoder, MSONable diff --git a/src/maggma/core/store.py b/src/maggma/core/store.py index a62e61e66..315cd9c02 100644 --- a/src/maggma/core/store.py +++ b/src/maggma/core/store.py @@ -7,7 +7,7 @@ from abc import ABCMeta, abstractmethod, abstractproperty from datetime import datetime from enum import Enum -from typing import Callable, Dict, Iterator, List, Optional, Tuple, Union +from typing import Dict, Iterator, List, Optional, Tuple, Union from monty.dev import deprecated from monty.json import MontyDecoder, MSONable diff --git a/src/maggma/stores/aws.py b/src/maggma/stores/aws.py index 25b65b50c..3d1c170d8 100644 --- a/src/maggma/stores/aws.py +++ b/src/maggma/stores/aws.py @@ -8,7 +8,7 @@ from concurrent.futures import wait from concurrent.futures.thread import ThreadPoolExecutor from hashlib import sha1 -from typing import Any, Dict, Iterator, List, Optional, Tuple, Union +from typing import Dict, Iterator, List, Optional, Tuple, Union from json import dumps import msgpack # type: ignore diff --git a/src/maggma/stores/compound_stores.py b/src/maggma/stores/compound_stores.py index afd7c7169..9a76ce6cd 100644 --- a/src/maggma/stores/compound_stores.py +++ b/src/maggma/stores/compound_stores.py @@ -1,7 +1,7 @@ """ Special stores that combine underlying Stores together """ from datetime import datetime from itertools import groupby -from typing import Any, Dict, Iterator, List, Optional, Tuple, Union +from typing import Dict, Iterator, List, Optional, Tuple, Union from pydash import set_ from pymongo import MongoClient diff --git a/tests/api/test_aggregation_resource.py b/tests/api/test_aggregation_resource.py index 4451632eb..b323ee859 100644 --- a/tests/api/test_aggregation_resource.py +++ b/tests/api/test_aggregation_resource.py @@ -1,8 +1,7 @@ from random import randint -from urllib.parse import urlencode import pytest -from fastapi import FastAPI, Body +from fastapi import FastAPI from pydantic import BaseModel, Field from starlette.testclient import TestClient diff --git a/tests/api/test_query_operators.py b/tests/api/test_query_operators.py index b022c330b..1ce9f914b 100644 --- a/tests/api/test_query_operators.py +++ b/tests/api/test_query_operators.py @@ -4,12 +4,11 @@ NumericQuery, PaginationQuery, SparseFieldsQuery, - NumericQuery, SortQuery, ) from pydantic import BaseModel, Field -from fastapi import HTTPException, Query +from fastapi import HTTPException from datetime import datetime from monty.serialization import loadfn, dumpfn diff --git a/tests/api/test_submission_resource.py b/tests/api/test_submission_resource.py index 98766957a..0b5d857ab 100644 --- a/tests/api/test_submission_resource.py +++ b/tests/api/test_submission_resource.py @@ -1,16 +1,14 @@ from random import randint -from urllib.parse import urlencode -from pydantic.utils import get_model import json import pytest -from fastapi import FastAPI, Body +from fastapi import FastAPI from pydantic import BaseModel, Field from starlette.testclient import TestClient from datetime import datetime from maggma.api.query_operator.core import QueryOperator -from maggma.api.resource import SubmissionResource, post_resource +from maggma.api.resource import SubmissionResource from maggma.api.query_operator import PaginationQuery from maggma.stores import MemoryStore diff --git a/tests/cli/test_init.py b/tests/cli/test_init.py index 74756f929..351ccc69a 100644 --- a/tests/cli/test_init.py +++ b/tests/cli/test_init.py @@ -1,4 +1,3 @@ -import os import shutil from datetime import datetime from pathlib import Path diff --git a/tests/cli/test_multiprocessing.py b/tests/cli/test_multiprocessing.py index 2c1464d01..6757221a2 100644 --- a/tests/cli/test_multiprocessing.py +++ b/tests/cli/test_multiprocessing.py @@ -1,4 +1,3 @@ -import asyncio import time from concurrent.futures import ThreadPoolExecutor diff --git a/tests/stores/test_aws.py b/tests/stores/test_aws.py index 58afbdfd4..087e4ed75 100644 --- a/tests/stores/test_aws.py +++ b/tests/stores/test_aws.py @@ -1,12 +1,9 @@ import time -import zlib from datetime import datetime import boto3 -import msgpack import pytest from botocore.exceptions import ClientError -from monty.msgpack import default, object_hook from moto import mock_s3 from maggma.stores import MemoryStore, MongoStore, S3Store diff --git a/tests/stores/test_shared_stores.py b/tests/stores/test_shared_stores.py index 9aaab854c..404438cf2 100644 --- a/tests/stores/test_shared_stores.py +++ b/tests/stores/test_shared_stores.py @@ -182,7 +182,7 @@ def test_multistore_update(multistore, mongostore): mongostore_facade.update([large_doc, {"e": 1001}], key="e") mongostore_facade.safe_update = True - assert mongostore_facade.safe_update == True + assert mongostore_facade.safe_update is True mongostore_facade.update([large_doc, {"e": 1001}], key="e") assert mongostore_facade.query_one({"e": 1001}) is not None diff --git a/tests/stores/test_ssh_tunnel.py b/tests/stores/test_ssh_tunnel.py index 1c4a353f8..59f4ff716 100644 --- a/tests/stores/test_ssh_tunnel.py +++ b/tests/stores/test_ssh_tunnel.py @@ -1,4 +1,3 @@ -import asyncio import paramiko import pymongo