Skip to content

Commit 32f4e03

Browse files
committed
Merge branch 'main' into 1.0
2 parents 929eb1d + 106dfd4 commit 32f4e03

File tree

7 files changed

+19
-22
lines changed

7 files changed

+19
-22
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
python-version:
24-
- "3.7"
2524
- "3.8"
2625
- "3.9"
2726
- "3.10"
@@ -123,7 +122,6 @@ jobs:
123122
fail-fast: false
124123
matrix:
125124
python-version:
126-
- "3.7"
127125
- "3.8"
128126
- "3.9"
129127
- "3.10"

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010

1111
### Fixed
1212

13+
14+
## [v1.6.0]
15+
16+
### Removed
17+
18+
- Support for Python 3.7 ([#853](https://github.com/stac-utils/pystac/pull/853))
19+
1320
## [v1.5.0]
1421

1522
### Added
@@ -602,7 +609,8 @@ use `Band.create`
602609

603610
Initial release.
604611

605-
[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.5.0..main>
612+
[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.6.0..main>
613+
[v1.6.0]: <https://github.com/stac-utils/pystac/compare/v1.5.0..v1.6.0>
606614
[v1.5.0]: <https://github.com/stac-utils/pystac/compare/v1.4.0..v1.5.0>
607615
[v1.4.0]: <https://github.com/stac-utils/pystac/compare/v1.3.0..v1.4.0>
608616
[v1.3.0]: <https://github.com/stac-utils/pystac/compare/v1.2.0..v1.3.0>

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ PySTAC is a library for working with [SpatioTemporal Asset Catalog](https://stac
1111

1212
## Installation
1313

14-
PySTAC requires Python >= 3.7. This project follows the recommendations of
14+
PySTAC requires Python >= 3.8. This project follows the recommendations of
1515
[NEP-29](https://numpy.org/neps/nep-0029-deprecation_policy.html) in deprecating support
16-
for Python versions. This means that users can expect support for Python 3.7 to be
17-
removed from the `main` branch after Dec 26, 2021 and therefore from the next release
16+
for Python versions. This means that users can expect support for Python 3.8 to be
17+
removed from the `main` branch after Apr 14, 2023 and therefore from the next release
1818
after that date.
1919

2020
Note that while we support Python 3.10.\*, wheels for the `orjson` library are not always immediately available for all

pystac/summaries.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from copy import deepcopy
2-
import sys
32
import numbers
43
from enum import Enum
54
from functools import lru_cache
@@ -13,17 +12,13 @@
1312
Generic,
1413
List,
1514
Optional,
15+
Protocol,
1616
Union,
1717
TypeVar,
1818
Iterable,
1919
TYPE_CHECKING,
2020
)
2121

22-
if sys.version_info >= (3, 8):
23-
from typing import Protocol
24-
else:
25-
from typing_extensions import Protocol
26-
2722
if TYPE_CHECKING:
2823
from pystac.item import Item as Item_Type
2924
from pystac.collection import Collection as Collection_Type

pystac/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from typing import Optional
33

4-
__version__ = "1.5.0"
4+
__version__ = "1.6.0"
55
"""Library version"""
66

77

requirements-test.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==0.961
1+
mypy==0.971
22
flake8==4.0.1
33
black==22.6.0
44

@@ -8,10 +8,10 @@ jsonschema==4.7.2
88
coverage==6.4.2
99
doc8==0.11.2
1010

11-
types-python-dateutil==2.8.18
11+
types-python-dateutil==2.8.19
1212
types-orjson==3.6.2
1313

1414
pre-commit==2.20.0
1515

1616
# optional dependencies
17-
orjson==3.7.7
17+
orjson==3.7.8

setup.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@
2222
packages=find_packages(exclude=["tests*"]),
2323
package_data={"": ["py.typed", "*.jinja2"]},
2424
py_modules=[splitext(basename(path))[0] for path in glob("pystac/*.py")],
25-
python_requires=">=3.7",
26-
install_requires=[
27-
"python-dateutil>=2.7.0",
28-
'typing_extensions >= 3.7; python_version < "3.8"',
29-
],
25+
python_requires=">=3.8",
26+
install_requires=["python-dateutil>=2.7.0"],
3027
extras_require={"validation": ["jsonschema>=3.0"], "orjson": ["orjson>=3.5"]},
3128
license="Apache Software License 2.0",
3229
license_files=["LICENSE"],
@@ -38,7 +35,6 @@
3835
"License :: OSI Approved :: Apache Software License",
3936
"Natural Language :: English",
4037
"Programming Language :: Python :: 3",
41-
"Programming Language :: Python :: 3.7",
4238
"Programming Language :: Python :: 3.8",
4339
"Programming Language :: Python :: 3.9",
4440
"Programming Language :: Python :: 3.10",

0 commit comments

Comments
 (0)