Fix merge conflicts

Author: TedBrookings

fgpyo/util/inspect.py

@@ -1,22 +1,15 @@
-import functools
 import sys
 import typing
-from enum import Enum
-from functools import partial
-from pathlib import PurePath
 from typing import Any
-from typing import Callable
 from typing import Dict
 from typing import Iterable
 from typing import List
 from typing import Literal
-from typing import Optional
 from typing import Mapping
+from typing import Protocol
 from typing import Tuple
 from typing import Type
 from typing import Union
-from typing import Literal
-from typing import Protocol
 if sys.version_info >= (3, 12):
     from typing import TypeAlias
 else:

fgpyo/util/tests/test_inspect.py

@@ -1,21 +1,20 @@
+import attr
+import pytest
 from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Set
 from typing import Tuple
 
-import attr
-import pytest
-
 from fgpyo.util.inspect import attr_from
 from fgpyo.util.inspect import attribute_has_default
 from fgpyo.util.inspect import attribute_is_optional
 from fgpyo.util.inspect import dict_parser
+from fgpyo.util.inspect import get_fields
+from fgpyo.util.inspect import get_fields_dict
 from fgpyo.util.inspect import list_parser
 from fgpyo.util.inspect import set_parser
 from fgpyo.util.inspect import tuple_parser
-from fgpyo.util.inspect import get_fields
-from fgpyo.util.inspect import get_fields_dict
 
 
 @attr.s(auto_attribs=True, frozen=True)