Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/rde/1.0-refac…
Browse files Browse the repository at this point in the history
…tors

While resolving merge conflicts, reorder imports and make slight edits
to docstring text for consistency
  • Loading branch information
lossyrob committed May 5, 2021
2 parents f6ee841 + b005962 commit 63f83f4
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 24 deletions.
5 changes: 5 additions & 0 deletions pystac/extensions/datacube.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""Implements the Datacube extension.
https://github.com/stac-extensions/datacube
"""

from abc import ABC
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, Union, cast

Expand Down
7 changes: 6 additions & 1 deletion pystac/extensions/eo.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
from pystac.collection import RangeSummary
"""Implements the Electro-Optical (EO) extension.
https://github.com/stac-extensions/eo
"""

import re
from typing import Any, Dict, Generic, List, Optional, Set, Tuple, TypeVar, cast

import pystac
from pystac.collection import RangeSummary
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
Expand Down
15 changes: 10 additions & 5 deletions pystac/extensions/file.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""Implements the File extension.
https://github.com/stac-extensions/file
"""

import enum
from pystac.serialization.identify import (
OldExtensionShortIDs,
STACJSONDescription,
STACVersionID,
)
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast

import pystac
Expand All @@ -13,6 +13,11 @@
SummariesExtension,
)
from pystac.extensions.hooks import ExtensionHooks
from pystac.serialization.identify import (
OldExtensionShortIDs,
STACJSONDescription,
STACVersionID,
)
from pystac.utils import map_opt

T = TypeVar("T", pystac.Item, pystac.Asset)
Expand Down
5 changes: 5 additions & 0 deletions pystac/extensions/item_assets.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""Implements the Item Assets Definition extension.
https://github.com/stac-extensions/item-assets
"""

from typing import Any, Dict, List, Optional, Set

import pystac
Expand Down
5 changes: 4 additions & 1 deletion pystac/extensions/label.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
"""STAC Model classes for Label extension.
"""Implements the Label extension.
https://github.com/stac-extensions/label
"""

from enum import Enum
from pystac.extensions.base import ExtensionManagementMixin
from typing import Any, Dict, Iterable, List, Optional, Set, Union, cast
Expand Down
7 changes: 6 additions & 1 deletion pystac/extensions/pointcloud.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
from pystac.extensions.hooks import ExtensionHooks
"""Implements the Point Cloud extension.
https://github.com/stac-extensions/pointcloud
"""

from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast

import pystac
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
)
from pystac.extensions.hooks import ExtensionHooks
from pystac.utils import map_opt

T = TypeVar("T", pystac.Item, pystac.Asset)
Expand Down
11 changes: 8 additions & 3 deletions pystac/extensions/projection.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
"""Implements the Projection extension.
https://github.com/stac-extensions/projection
"""

from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast

import pystac
from pystac.extensions.hooks import ExtensionHooks
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
)
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast

import pystac

T = TypeVar("T", pystac.Item, pystac.Asset)

Expand Down
4 changes: 2 additions & 2 deletions pystac/extensions/sar.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Implement the STAC Synthetic-Aperture Radar (SAR) Extension.
"""Implements the Synthetic-Aperture Radar (SAR) extension.
https://github.com/radiantearth/stac-spec/tree/dev/extensions/sar
https://github.com/stac-extensions/sar
"""

import enum
Expand Down
6 changes: 3 additions & 3 deletions pystac/extensions/sat.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
"""Implement the Satellite (SAT) Extension.
"""Implements the Satellite extension.
https://github.com/radiantearth/stac-spec/tree/dev/extensions/sat
https://github.com/stac-extensions/sat
"""

import enum
from pystac.extensions.hooks import ExtensionHooks
from typing import Generic, Optional, Set, TypeVar, cast

import pystac
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
)
from pystac.extensions.hooks import ExtensionHooks
from pystac.utils import map_opt

T = TypeVar("T", pystac.Item, pystac.Asset)
Expand Down
4 changes: 2 additions & 2 deletions pystac/extensions/scientific.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Implement the scientific extension.
"""Implements the scientific extension.
https://github.com/radiantearth/stac-spec/tree/dev/extensions/scientific
https://github.com/stac-extensions/scientific
For a description of Digital Object Identifiers (DOIs), see the DOI Handbook:
Expand Down
7 changes: 6 additions & 1 deletion pystac/extensions/timestamps.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
"""Implements the Timestamps extension.
https://github.com/stac-extensions/timestamps
"""

from datetime import datetime as Datetime
from pystac.extensions.hooks import ExtensionHooks
from typing import Generic, Optional, Set, TypeVar, cast

import pystac
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
)
from pystac.extensions.hooks import ExtensionHooks
from pystac.utils import datetime_to_str, map_opt, str_to_datetime

T = TypeVar("T", pystac.Item, pystac.Asset)
Expand Down
6 changes: 2 additions & 4 deletions pystac/extensions/version.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""Implement the version extension.
"""Implements the Version extension.
https://github.com/radiantearth/stac-spec/tree/dev/extensions/version
Note that the version/schema.json does not know about the links.
https://github.com/stac-extensions/version
"""

from pystac.utils import get_required, map_opt
Expand Down
7 changes: 6 additions & 1 deletion pystac/extensions/view.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
from pystac.extensions.hooks import ExtensionHooks
"""Implement the View Geometry extension.
https://github.com/stac-extensions/view
"""

from typing import Generic, Optional, Set, TypeVar, cast

import pystac
from pystac.extensions.base import (
ExtensionManagementMixin,
PropertiesExtension,
)
from pystac.extensions.hooks import ExtensionHooks

T = TypeVar("T", pystac.Item, pystac.Asset)

Expand Down

0 comments on commit 63f83f4

Please sign in to comment.