Skip to content

Commit 63f83f4

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/rde/1.0-refactors
While resolving merge conflicts, reorder imports and make slight edits to docstring text for consistency
2 parents f6ee841 + b005962 commit 63f83f4

File tree

13 files changed

+65
-24
lines changed

13 files changed

+65
-24
lines changed

pystac/extensions/datacube.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
"""Implements the Datacube extension.
2+
3+
https://github.com/stac-extensions/datacube
4+
"""
5+
16
from abc import ABC
27
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, Union, cast
38

pystac/extensions/eo.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
from pystac.collection import RangeSummary
1+
"""Implements the Electro-Optical (EO) extension.
2+
3+
https://github.com/stac-extensions/eo
4+
"""
5+
26
import re
37
from typing import Any, Dict, Generic, List, Optional, Set, Tuple, TypeVar, cast
48

59
import pystac
10+
from pystac.collection import RangeSummary
611
from pystac.extensions.base import (
712
ExtensionManagementMixin,
813
PropertiesExtension,

pystac/extensions/file.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
"""Implements the File extension.
2+
3+
https://github.com/stac-extensions/file
4+
"""
5+
16
import enum
2-
from pystac.serialization.identify import (
3-
OldExtensionShortIDs,
4-
STACJSONDescription,
5-
STACVersionID,
6-
)
77
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast
88

99
import pystac
@@ -13,6 +13,11 @@
1313
SummariesExtension,
1414
)
1515
from pystac.extensions.hooks import ExtensionHooks
16+
from pystac.serialization.identify import (
17+
OldExtensionShortIDs,
18+
STACJSONDescription,
19+
STACVersionID,
20+
)
1621
from pystac.utils import map_opt
1722

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

pystac/extensions/item_assets.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
"""Implements the Item Assets Definition extension.
2+
3+
https://github.com/stac-extensions/item-assets
4+
"""
5+
16
from typing import Any, Dict, List, Optional, Set
27

38
import pystac

pystac/extensions/label.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
"""STAC Model classes for Label extension.
1+
"""Implements the Label extension.
2+
3+
https://github.com/stac-extensions/label
24
"""
5+
36
from enum import Enum
47
from pystac.extensions.base import ExtensionManagementMixin
58
from typing import Any, Dict, Iterable, List, Optional, Set, Union, cast

pystac/extensions/pointcloud.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
from pystac.extensions.hooks import ExtensionHooks
1+
"""Implements the Point Cloud extension.
2+
3+
https://github.com/stac-extensions/pointcloud
4+
"""
5+
26
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast
37

48
import pystac
59
from pystac.extensions.base import (
610
ExtensionManagementMixin,
711
PropertiesExtension,
812
)
13+
from pystac.extensions.hooks import ExtensionHooks
914
from pystac.utils import map_opt
1015

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

pystac/extensions/projection.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
"""Implements the Projection extension.
2+
3+
https://github.com/stac-extensions/projection
4+
"""
5+
6+
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast
7+
8+
import pystac
19
from pystac.extensions.hooks import ExtensionHooks
210
from pystac.extensions.base import (
311
ExtensionManagementMixin,
412
PropertiesExtension,
513
)
6-
from typing import Any, Dict, Generic, List, Optional, Set, TypeVar, cast
7-
8-
import pystac
914

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

pystac/extensions/sar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"""Implement the STAC Synthetic-Aperture Radar (SAR) Extension.
1+
"""Implements the Synthetic-Aperture Radar (SAR) extension.
22
3-
https://github.com/radiantearth/stac-spec/tree/dev/extensions/sar
3+
https://github.com/stac-extensions/sar
44
"""
55

66
import enum

pystac/extensions/sat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
"""Implement the Satellite (SAT) Extension.
1+
"""Implements the Satellite extension.
22
3-
https://github.com/radiantearth/stac-spec/tree/dev/extensions/sat
3+
https://github.com/stac-extensions/sat
44
"""
55

66
import enum
7-
from pystac.extensions.hooks import ExtensionHooks
87
from typing import Generic, Optional, Set, TypeVar, cast
98

109
import pystac
1110
from pystac.extensions.base import (
1211
ExtensionManagementMixin,
1312
PropertiesExtension,
1413
)
14+
from pystac.extensions.hooks import ExtensionHooks
1515
from pystac.utils import map_opt
1616

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

pystac/extensions/scientific.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
"""Implement the scientific extension.
1+
"""Implements the scientific extension.
22
3-
https://github.com/radiantearth/stac-spec/tree/dev/extensions/scientific
3+
https://github.com/stac-extensions/scientific
44
55
For a description of Digital Object Identifiers (DOIs), see the DOI Handbook:
66

0 commit comments

Comments
 (0)