Skip to content

Commit

Permalink
Fix pyproject.toml isort config
Browse files Browse the repository at this point in the history
  • Loading branch information
lafrech committed Apr 16, 2024
1 parent 0f252a8 commit cd39c36
Show file tree
Hide file tree
Showing 127 changed files with 275 additions and 147 deletions.
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ select = [
]

[tool.ruff.lint.isort]
section-order = ["future", "standard-library", "testing", "db", "marshmallow", "science", "third-party", "core", "first-party", "local-folder"]
section-order = ["future", "standard-library", "testing", "db", "pallets", "marshmallow", "science", "third-party", "core", "first-party", "local-folder"]

[tool.ruff.lint.isort.sections]
testing = ["pytest", "pytest-postgresql"]
testing = ["pytest", "pytest_postgresql"]
db = ["psycopg", "sqlalchemy", "alembic"]
pallets = ["werkzeug", "flask", "flask-httpauth"]
marshmallow = ["marshmallow", "marshmallow-sqlalchemy", "webargs", "apispec", "flask-smorest"]
pallets = ["werkzeug", "flask", "flask_httpauth"]
marshmallow = ["marshmallow", "marshmallow_sqlalchemy", "webargs", "apispec", "flask_smorest"]
science = ["numpy", "pandas"]
core = ["bemserver-core"]
core = ["bemserver_core"]

[tool.pytest.ini_options]
norecursedirs = ".git .tox docs env venv"
Expand Down
3 changes: 2 additions & 1 deletion src/bemserver_api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import importlib

import flask
from bemserver_core import BEMServerCore
from werkzeug.middleware.profiler import ProfilerMiddleware

from bemserver_core import BEMServerCore

from . import database
from .extensions import ( # noqa
Api,
Expand Down
6 changes: 4 additions & 2 deletions src/bemserver_api/extensions/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

import sqlalchemy as sqla

from bemserver_core.authorization import BEMServerAuthorizationError, CurrentUser
from bemserver_core.model.users import User
from flask_httpauth import HTTPBasicAuth

from flask_smorest import abort

from bemserver_core.authorization import BEMServerAuthorizationError, CurrentUser
from bemserver_core.model.users import User

from bemserver_api.database import db


Expand Down
5 changes: 2 additions & 3 deletions src/bemserver_api/extensions/smorest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
from copy import deepcopy
from functools import wraps

import flask_smorest
import marshmallow as ma
import marshmallow_sqlalchemy as msa
from apispec.ext.marshmallow import MarshmallowPlugin
from apispec.ext.marshmallow.common import resolve_schema_cls

import flask_smorest
import marshmallow_sqlalchemy as msa

from . import integrity_error
from .authentication import auth
from .ma_fields import Timezone
Expand Down
3 changes: 2 additions & 1 deletion src/bemserver_api/resources/analysis/completeness/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
"""Completeness resources"""

from flask_smorest import abort

from bemserver_core.exceptions import TimeseriesNotFoundError
from bemserver_core.model import Timeseries, TimeseriesDataState
from bemserver_core.process.completeness import compute_completeness
from flask_smorest import abort

from bemserver_api import Blueprint

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
"""Energy consumption resources"""

from flask_smorest import abort

from bemserver_core.exceptions import BEMServerCoreDimensionalityError
from bemserver_core.model import Building, Site
from bemserver_core.process.energy_consumption import (
compute_energy_consumption_breakdown_for_building,
compute_energy_consumption_breakdown_for_site,
)
from flask_smorest import abort

from bemserver_api import Blueprint

Expand Down
4 changes: 3 additions & 1 deletion src/bemserver_api/resources/building_properties/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Building properties resources"""

from bemserver_core.model import BuildingProperty
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import BuildingProperty

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
2 changes: 1 addition & 1 deletion src/bemserver_api/resources/building_properties/schemas.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Building properties API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import BuildingProperty

from bemserver_api import AutoSchema, Schema
Expand Down
6 changes: 4 additions & 2 deletions src/bemserver_api/resources/building_property_data/routes.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
"""Building property data resources"""

from bemserver_core.exceptions import PropertyTypeInvalidError
from bemserver_core.model import BuildingPropertyData
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.exceptions import PropertyTypeInvalidError
from bemserver_core.model import BuildingPropertyData

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Building property data API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import BuildingPropertyData

from bemserver_api import AutoSchema, Schema
Expand Down
4 changes: 3 additions & 1 deletion src/bemserver_api/resources/buildings/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Building resources"""

from bemserver_core.model import Building
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import Building

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
2 changes: 1 addition & 1 deletion src/bemserver_api/resources/buildings/schemas.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Buildings API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import Building

from bemserver_api import AutoSchema, Schema
Expand Down
4 changes: 3 additions & 1 deletion src/bemserver_api/resources/campaign_scopes/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Campaign scopes resources"""

from bemserver_core.model import CampaignScope
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import CampaignScope

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
2 changes: 1 addition & 1 deletion src/bemserver_api/resources/campaign_scopes/schemas.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Campaign scopes API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import CampaignScope

from bemserver_api import AutoSchema, Schema
Expand Down
4 changes: 3 additions & 1 deletion src/bemserver_api/resources/campaigns/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Campaign resources"""

from bemserver_core.model import Campaign
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import Campaign

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
2 changes: 1 addition & 1 deletion src/bemserver_api/resources/campaigns/schemas.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Campaigns API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import Campaign

from bemserver_api import AutoSchema, Schema
Expand Down
3 changes: 2 additions & 1 deletion src/bemserver_api/resources/energies/routes.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"""Energies resources"""

from bemserver_core.model import Energy
from flask.views import MethodView

from bemserver_core.model import Energy

from bemserver_api import Blueprint

from .schemas import EnergySchema
Expand Down
1 change: 1 addition & 0 deletions src/bemserver_api/resources/energies/schemas.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Energies API schemas"""

import marshmallow_sqlalchemy as msa

from bemserver_core.model import Energy

from bemserver_api import AutoSchema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Energy consumption timeseries by buildings resources"""

from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Energy consumption timeseries by buildings API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding

from bemserver_api import AutoSchema, Schema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Energy consumption timeseries by sites resources"""

from bemserver_core.model import EnergyConsumptionTimeseriesBySite
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EnergyConsumptionTimeseriesBySite

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Energy consumption timeseries by sites API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyConsumptionTimeseriesBySite

from bemserver_api import AutoSchema, Schema
Expand Down
3 changes: 2 additions & 1 deletion src/bemserver_api/resources/energy_end_uses/routes.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"""Energy end uses resources"""

from bemserver_core.model import EnergyEndUse
from flask.views import MethodView

from bemserver_core.model import EnergyEndUse

from bemserver_api import Blueprint

from .schemas import EnergyEndUseSchema
Expand Down
1 change: 1 addition & 0 deletions src/bemserver_api/resources/energy_end_uses/schemas.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Energy end uses API schemas"""

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyEndUse

from bemserver_api import AutoSchema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"""Energy end uses resources"""

from bemserver_core.model import EnergyProductionTechnology
from flask.views import MethodView

from bemserver_core.model import EnergyProductionTechnology

from bemserver_api import Blueprint

from .schemas import EnergyProductionTechnologySchema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Energy production technologies API schemas"""

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyProductionTechnology

from bemserver_api import AutoSchema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Energy production timeseries by buildings resources"""

from bemserver_core.model import EnergyProductionTimeseriesByBuilding
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EnergyProductionTimeseriesByBuilding

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Energy production timeseries by buildings API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyProductionTimeseriesByBuilding

from bemserver_api import AutoSchema, Schema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Energy production timeseries by sites resources"""

from bemserver_core.model import EnergyProductionTimeseriesBySite
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EnergyProductionTimeseriesBySite

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""Energy production timeseries by sites API schemas"""

import marshmallow as ma

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EnergyProductionTimeseriesBySite

from bemserver_api import AutoSchema, Schema
Expand Down
4 changes: 3 additions & 1 deletion src/bemserver_api/resources/event_categories/routes.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Event categories resources"""

from bemserver_core.model import EventCategory
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EventCategory

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
1 change: 1 addition & 0 deletions src/bemserver_api/resources/event_categories/schemas.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Event categories API schemas"""

import marshmallow_sqlalchemy as msa

from bemserver_core.model import EventCategory

from bemserver_api import AutoSchema
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Even categories by users resources"""

from bemserver_core.model import EventCategoryByUser
from flask.views import MethodView

from flask_smorest import abort

from bemserver_core.model import EventCategoryByUser

from bemserver_api import Blueprint
from bemserver_api.database import db

Expand Down
Loading

0 comments on commit cd39c36

Please sign in to comment.