Include isort (#11)

* Add isort as part of dev dependencies

* Apply isort to all files

* Update anyio and pandas dependencies

* Specify import location of Backend to resolve circular import

Author: glatterf42

ixmp4/__init__.py

@@ -1,23 +1,17 @@
 # flake8: noqa
 import importlib.metadata
 
-from ixmp4.core import (
-    Platform as Platform,
-    Region as Region,
-    Unit as Unit,
-    Run as Run,
-    Variable as Variable,
-    Model as Model,
-    Scenario as Scenario,
-)
-
-from ixmp4.core.exceptions import (
-    NotFound as NotFound,
-    NotUnique as NotUnique,
-    IxmpError as IxmpError,
-    InconsistentIamcType as InconsistentIamcType,
-)
-
+from ixmp4.core import Model as Model
+from ixmp4.core import Platform as Platform
+from ixmp4.core import Region as Region
+from ixmp4.core import Run as Run
+from ixmp4.core import Scenario as Scenario
+from ixmp4.core import Unit as Unit
+from ixmp4.core import Variable as Variable
+from ixmp4.core.exceptions import InconsistentIamcType as InconsistentIamcType
+from ixmp4.core.exceptions import IxmpError as IxmpError
+from ixmp4.core.exceptions import NotFound as NotFound
+from ixmp4.core.exceptions import NotUnique as NotUnique
 from ixmp4.data.abstract import DataPoint as DataPoint
 
 __version__ = importlib.metadata.version("ixmp4")

ixmp4/cli/__init__.py

@@ -11,15 +11,15 @@
 """
 
 from typing import Optional
-import typer
 
+import typer
 
-from ixmp4.core.exceptions import InvalidCredentials
-from ixmp4.conf.auth import ManagerAuth
-from ixmp4.conf import settings
 from ixmp4.cli import platforms
-from . import utils
+from ixmp4.conf import settings
+from ixmp4.conf.auth import ManagerAuth
+from ixmp4.core.exceptions import InvalidCredentials
 
+from . import utils
 
 app = typer.Typer()
 app.add_typer(platforms.app, name="platforms")

ixmp4/cli/server.py

@@ -1,12 +1,12 @@
-from typing import Optional
 import json
+from typing import Optional
 
-import uvicorn  # type: ignore[import]
 import typer
-
+import uvicorn  # type: ignore[import]
 from fastapi.openapi.utils import get_openapi
-from ixmp4.server import v1
+
 from ixmp4.conf import settings
+from ixmp4.server import v1
 
 from . import utils
 

ixmp4/cli/utils.py

@@ -1,4 +1,5 @@
 from functools import partial
+
 import typer
 
 echo = typer.echo

ixmp4/conf/__init__.py

@@ -1,4 +1,5 @@
 from dotenv import load_dotenv
+
 from ixmp4.conf.settings import Settings
 
 load_dotenv()

ixmp4/conf/auth.py

@@ -1,6 +1,6 @@
 import logging
-from uuid import uuid4
 from datetime import datetime, timedelta
+from uuid import uuid4
 
 import httpx
 import jwt

ixmp4/conf/base.py

@@ -1,4 +1,5 @@
 from typing import Protocol
+
 import pydantic
 
 

ixmp4/conf/credentials.py

@@ -1,5 +1,6 @@
 from contextlib import suppress
 from pathlib import Path
+
 import toml
 
 

ixmp4/conf/manager.py

@@ -1,18 +1,18 @@
 import enum
-import httpx
-import re
-import os
 import logging
+import os
+import re
 from functools import lru_cache
 
+import httpx
 import pandas as pd
 from pydantic import Field
 
-from ixmp4.core.exceptions import PlatformNotFound, ManagerApiError
+from ixmp4.core.exceptions import ManagerApiError, PlatformNotFound
 
 from .auth import BaseAuth
-from .user import User
 from .base import Config, PlatformInfo
+from .user import User
 
 logger = logging.getLogger(__name__)
 

ixmp4/conf/toml.py

@@ -1,12 +1,13 @@
+import json
 from pathlib import Path
 from typing import Any
+
 import toml
-import json
 
 from ixmp4.core.exceptions import PlatformNotFound, PlatformNotUnique
 
-from .user import User
 from .base import Config, PlatformInfo
+from .user import User
 
 
 class TomlPlatformInfo(PlatformInfo):

ixmp4/core/base.py

@@ -1,5 +1,5 @@
-from ixmp4.data.backend import Backend
 from ixmp4.data.abstract import BaseModel
+from ixmp4.data.backend import Backend
 
 
 class BaseFacade(object):

ixmp4/core/decorators.py

@@ -1,4 +1,5 @@
 import functools
+
 import pandera as pa
 from pandera.errors import SchemaError as PanderaSchemaError
 

ixmp4/core/exceptions.py

@@ -1,4 +1,4 @@
-from typing import Dict, ClassVar
+from typing import ClassVar, Dict
 
 registry: dict = dict()
 

ixmp4/core/iamc/variable.py

@@ -1,10 +1,11 @@
-from typing import Iterable, ClassVar
-
 from datetime import datetime
+from typing import ClassVar, Iterable
+
 import pandas as pd
 
-from ixmp4.data.abstract import Variable as VariableModel, Docs as DocsModel
-from ixmp4.core.base import BaseModelFacade, BaseFacade
+from ixmp4.core.base import BaseFacade, BaseModelFacade
+from ixmp4.data.abstract import Docs as DocsModel
+from ixmp4.data.abstract import Variable as VariableModel
 
 
 class Variable(BaseModelFacade):

ixmp4/core/model.py

@@ -1,10 +1,11 @@
-from typing import Iterable, ClassVar
-
 from datetime import datetime
+from typing import ClassVar, Iterable
+
 import pandas as pd
 
-from ixmp4.data.abstract import Model as ModelModel, Docs as DocsModel
-from ixmp4.core.base import BaseModelFacade, BaseFacade
+from ixmp4.core.base import BaseFacade, BaseModelFacade
+from ixmp4.data.abstract import Docs as DocsModel
+from ixmp4.data.abstract import Model as ModelModel
 
 
 class Model(BaseModelFacade):

ixmp4/core/platform.py

@@ -30,15 +30,16 @@
 from ixmp4.conf import settings
 from ixmp4.conf.auth import BaseAuth
 from ixmp4.core.exceptions import PlatformNotFound
-from ixmp4.data.backend import SqlAlchemyBackend, RestBackend, Backend
+from ixmp4.data.backend import Backend, RestBackend, SqlAlchemyBackend
 
-from .run import Run as RunModel, RunRepository
+from .iamc import IamcRepository
+from .meta import MetaRepository
 from .model import ModelRepository
+from .region import RegionRepository
+from .run import Run as RunModel
+from .run import RunRepository
 from .scenario import ScenarioRepository
 from .unit import UnitRepository
-from .region import RegionRepository
-from .meta import MetaRepository
-from .iamc import IamcRepository
 
 
 class Platform(object):

ixmp4/core/region.py

@@ -1,9 +1,12 @@
-from typing import Iterable, Optional, Union
 from datetime import datetime
+from typing import Iterable, Optional, Union
+
 import pandas as pd
 
-from ixmp4.data.abstract import Region as RegionModel, Docs as DocsModel
-from .base import BaseModelFacade, BaseFacade
+from ixmp4.data.abstract import Docs as DocsModel
+from ixmp4.data.abstract import Region as RegionModel
+
+from .base import BaseFacade, BaseModelFacade
 
 
 class Region(BaseModelFacade):

ixmp4/core/scenario.py

@@ -1,10 +1,11 @@
-from typing import Iterable, ClassVar
-
 from datetime import datetime
+from typing import ClassVar, Iterable
+
 import pandas as pd
 
-from ixmp4.data.abstract import Scenario as ScenarioModel, Docs as DocsModel
-from ixmp4.core.base import BaseModelFacade, BaseFacade
+from ixmp4.core.base import BaseFacade, BaseModelFacade
+from ixmp4.data.abstract import Docs as DocsModel
+from ixmp4.data.abstract import Scenario as ScenarioModel
 
 
 class Scenario(BaseModelFacade):

ixmp4/core/unit.py

@@ -1,9 +1,11 @@
-from typing import Iterable
 from datetime import datetime
+from typing import Iterable
+
 import pandas as pd
 
-from ixmp4.data.abstract import Unit as UnitModel, Docs as DocsModel
-from ixmp4.core.base import BaseModelFacade, BaseFacade
+from ixmp4.core.base import BaseFacade, BaseModelFacade
+from ixmp4.data.abstract import Docs as DocsModel
+from ixmp4.data.abstract import Unit as UnitModel
 
 
 def to_dimensionless(name):

ixmp4/data/abstract/base.py

@@ -1,8 +1,8 @@
-from typing import Protocol, Iterable, _ProtocolMeta, ClassVar
+from typing import ClassVar, Iterable, Protocol, _ProtocolMeta
 
 import pandas as pd
 
-from ixmp4.core.exceptions import IxmpError, NotUnique, NotFound, DeletionPrevented
+from ixmp4.core.exceptions import DeletionPrevented, IxmpError, NotFound, NotUnique
 from ixmp4.data import types
 
 

ixmp4/data/abstract/docs.py

@@ -1,8 +1,9 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
-from . import base
 from ixmp4.data import types
 
+from . import base
+
 
 class Docs(base.BaseModel, Protocol):
     """Abstract documentation model for one object of any dimension."""

ixmp4/data/abstract/iamc/__init__.py

@@ -1,11 +1,8 @@
 # flake8: noqa
-from .variable import Variable, VariableRepository
-from .measurand import Measurand, MeasurandRepository
-from .timeseries import TimeSeries, TimeSeriesRepository
-from .datapoint import (
+from .datapoint import (  # AnnualDataPoint,; SubAnnualDataPoint,; CategoricalDataPoint,
     DataPoint,
-    #    AnnualDataPoint,
-    #    SubAnnualDataPoint,
-    #    CategoricalDataPoint,
     DataPointRepository,
 )
+from .measurand import Measurand, MeasurandRepository
+from .timeseries import TimeSeries, TimeSeriesRepository
+from .variable import Variable, VariableRepository

ixmp4/data/abstract/iamc/datapoint.py

@@ -1,9 +1,10 @@
 import enum
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
 import pandas as pd
 
 from ixmp4.data import types
+
 from .. import base
 
 

ixmp4/data/abstract/iamc/measurand.py

@@ -1,4 +1,4 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
 import pandas as pd
 

ixmp4/data/abstract/iamc/timeseries.py

@@ -1,4 +1,4 @@
-from typing import Protocol, Iterable, Mapping, TypeVar, Generic
+from typing import Generic, Iterable, Mapping, Protocol, TypeVar
 
 import pandas as pd
 

ixmp4/data/abstract/meta.py

@@ -1,12 +1,12 @@
 from enum import Enum
-from typing import Iterable, Protocol, ClassVar
+from typing import ClassVar, Iterable, Protocol
 
 import pandas as pd
-from pydantic import StrictBool, StrictInt, StrictFloat, StrictStr
+from pydantic import StrictBool, StrictFloat, StrictInt, StrictStr
 
 from ixmp4.data import types
-from . import base
 
+from . import base
 
 # as long as all of these are `Strict` the order does not matter
 StrictMetaValue = StrictBool | StrictInt | StrictFloat | StrictStr

ixmp4/data/abstract/model.py

@@ -1,11 +1,11 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
 import pandas as pd
 
-from .docs import DocsRepository
-
 from ixmp4.data import types
+
 from . import base
+from .docs import DocsRepository
 
 
 class Model(base.BaseModel, Protocol):

ixmp4/data/abstract/region.py

@@ -1,7 +1,9 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
+
 import pandas as pd
 
 from ixmp4.data import types
+
 from . import base
 from .docs import DocsRepository
 

ixmp4/data/abstract/scenario.py

@@ -1,12 +1,11 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
 import pandas as pd
 
-
-from .docs import DocsRepository
-
 from ixmp4.data import types
+
 from . import base
+from .docs import DocsRepository
 
 
 class Scenario(base.BaseModel, Protocol):

ixmp4/data/abstract/unit.py

@@ -1,4 +1,4 @@
-from typing import Protocol, Iterable
+from typing import Iterable, Protocol
 
 import pandas as pd