Skip to content

Commit

Permalink
Absolute imports (#483)
Browse files Browse the repository at this point in the history
Use absolute imports everywhere, except for `__init__.py` files as well
as in `test_*.py` files.
  • Loading branch information
CasperWA committed Sep 1, 2020
1 parent 742b9f3 commit f14c67f
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 32 deletions.
4 changes: 2 additions & 2 deletions optimade/models/baseinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from typing import Dict, List, Optional
from pydantic import BaseModel, AnyHttpUrl, Field, validator, root_validator

from .jsonapi import Resource
from .utils import SemanticVersion
from optimade.models.jsonapi import Resource
from optimade.models.utils import SemanticVersion


__all__ = ("AvailableApiVersion", "BaseInfoAttributes", "BaseInfoResource")
Expand Down
4 changes: 2 additions & 2 deletions optimade/models/entries.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from typing import Optional, Dict, List
from pydantic import BaseModel, Field, validator # pylint: disable=no-name-in-module

from .jsonapi import Relationships, Attributes, Resource
from .optimade_json import Relationship, DataType
from optimade.models.jsonapi import Relationships, Attributes, Resource
from optimade.models.optimade_json import Relationship, DataType


__all__ = (
Expand Down
4 changes: 2 additions & 2 deletions optimade/models/index_metadb.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from pydantic import Field, BaseModel # pylint: disable=no-name-in-module
from typing import Union, Dict

from .jsonapi import BaseResource
from .baseinfo import BaseInfoAttributes, BaseInfoResource
from optimade.models.jsonapi import BaseResource
from optimade.models.baseinfo import BaseInfoAttributes, BaseInfoResource


__all__ = (
Expand Down
4 changes: 2 additions & 2 deletions optimade/models/links.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
)
from typing import Union, Optional

from .jsonapi import Link, Attributes
from .entries import EntryResource
from optimade.models.jsonapi import Link, Attributes
from optimade.models.entries import EntryResource


__all__ = (
Expand Down
4 changes: 2 additions & 2 deletions optimade/models/optimade_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

from datetime import datetime

from . import jsonapi
from .utils import SemanticVersion
from optimade.models import jsonapi
from optimade.models.utils import SemanticVersion


__all__ = (
Expand Down
2 changes: 1 addition & 1 deletion optimade/models/references.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
)
from typing import List, Optional

from .entries import EntryResource, EntryResourceAttributes
from optimade.models.entries import EntryResource, EntryResourceAttributes


__all__ = ("Person", "ReferenceResourceAttributes", "ReferenceResource")
Expand Down
16 changes: 8 additions & 8 deletions optimade/models/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

from pydantic import Field, root_validator

from .jsonapi import Response
from .baseinfo import BaseInfoResource
from .entries import EntryInfoResource, EntryResource
from .index_metadb import IndexInfoResource
from .links import LinksResource
from .optimade_json import Success, ResponseMeta, OptimadeError
from .references import ReferenceResource
from .structures import StructureResource
from optimade.models.jsonapi import Response
from optimade.models.baseinfo import BaseInfoResource
from optimade.models.entries import EntryInfoResource, EntryResource
from optimade.models.index_metadb import IndexInfoResource
from optimade.models.links import LinksResource
from optimade.models.optimade_json import Success, ResponseMeta, OptimadeError
from optimade.models.references import ReferenceResource
from optimade.models.structures import StructureResource


__all__ = (
Expand Down
4 changes: 2 additions & 2 deletions optimade/models/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

from pydantic import Field, BaseModel, validator, root_validator, conlist

from .entries import EntryResourceAttributes, EntryResource
from .utils import CHEMICAL_SYMBOLS, EXTRA_SYMBOLS
from optimade.models.entries import EntryResourceAttributes, EntryResource
from optimade.models.utils import CHEMICAL_SYMBOLS, EXTRA_SYMBOLS


EXTENDED_CHEMICAL_SYMBOLS = CHEMICAL_SYMBOLS + EXTRA_SYMBOLS
Expand Down
2 changes: 1 addition & 1 deletion optimade/server/mappers/links.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .entries import BaseResourceMapper
from optimade.server.mappers.entries import BaseResourceMapper

__all__ = ("LinksMapper",)

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/mappers/references.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .entries import BaseResourceMapper
from optimade.server.mappers.entries import BaseResourceMapper

__all__ = ("ReferenceMapper",)

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/mappers/structures.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .entries import BaseResourceMapper
from optimade.server.mappers.entries import BaseResourceMapper

__all__ = ("StructureMapper",)

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/query_params.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from fastapi import Query
from pydantic import EmailStr # pylint: disable=no-name-in-module

from .config import CONFIG
from optimade.server.config import CONFIG


class EntryListingQueryParams:
Expand Down
6 changes: 5 additions & 1 deletion optimade/server/routers/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
StructureResource,
)

from .utils import meta_values, retrieve_queryable_properties, get_base_url
from optimade.server.routers.utils import (
meta_values,
retrieve_queryable_properties,
get_base_url,
)


router = APIRouter(redirect_slashes=True)
Expand Down
2 changes: 1 addition & 1 deletion optimade/server/routers/links.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from optimade.server.mappers import LinksMapper
from optimade.server.query_params import EntryListingQueryParams

from .utils import get_entries
from optimade.server.routers.utils import get_entries

router = APIRouter(redirect_slashes=True)

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/routers/references.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from optimade.server.mappers import ReferenceMapper
from optimade.server.query_params import EntryListingQueryParams, SingleEntryQueryParams

from .utils import get_entries, get_single_entry
from optimade.server.routers.utils import get_entries, get_single_entry


router = APIRouter(redirect_slashes=True)
Expand Down
2 changes: 1 addition & 1 deletion optimade/server/routers/structures.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from optimade.server.mappers import StructureMapper
from optimade.server.query_params import EntryListingQueryParams, SingleEntryQueryParams

from .utils import get_entries, get_single_entry
from optimade.server.routers.utils import get_entries, get_single_entry

router = APIRouter(redirect_slashes=True)

Expand Down
2 changes: 1 addition & 1 deletion optimade/server/routers/versions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from fastapi import Request, APIRouter
from fastapi.responses import Response

from .utils import BASE_URL_PREFIXES
from optimade.server.routers.utils import BASE_URL_PREFIXES

router = APIRouter(redirect_slashes=True)

Expand Down
4 changes: 2 additions & 2 deletions optimade/validator/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

from optimade.models import InfoResponse, EntryInfoResponse, IndexInfoResponse

from .data import MANDATORY_FILTER_EXAMPLES, OPTIONAL_FILTER_EXAMPLES
from .validator_model_patches import (
from optimade.validator.data import MANDATORY_FILTER_EXAMPLES, OPTIONAL_FILTER_EXAMPLES
from optimade.validator.validator_model_patches import (
ValidatorLinksResponse,
ValidatorEntryResponseOne,
ValidatorEntryResponseMany,
Expand Down

0 comments on commit f14c67f

Please sign in to comment.