Skip to content

Commit

Permalink
Merge branch 'main' into 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
duckontheweb committed Jul 22, 2022
2 parents 929eb1d + 106dfd4 commit 32f4e03
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -123,7 +122,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

### Fixed


## [v1.6.0]

### Removed

- Support for Python 3.7 ([#853](https://github.com/stac-utils/pystac/pull/853))

## [v1.5.0]

### Added
Expand Down Expand Up @@ -602,7 +609,8 @@ use `Band.create`

Initial release.

[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.5.0..main>
[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.6.0..main>
[v1.6.0]: <https://github.com/stac-utils/pystac/compare/v1.5.0..v1.6.0>
[v1.5.0]: <https://github.com/stac-utils/pystac/compare/v1.4.0..v1.5.0>
[v1.4.0]: <https://github.com/stac-utils/pystac/compare/v1.3.0..v1.4.0>
[v1.3.0]: <https://github.com/stac-utils/pystac/compare/v1.2.0..v1.3.0>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ PySTAC is a library for working with [SpatioTemporal Asset Catalog](https://stac

## Installation

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

Note that while we support Python 3.10.\*, wheels for the `orjson` library are not always immediately available for all
Expand Down
7 changes: 1 addition & 6 deletions pystac/summaries.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from copy import deepcopy
import sys
import numbers
from enum import Enum
from functools import lru_cache
Expand All @@ -13,17 +12,13 @@
Generic,
List,
Optional,
Protocol,
Union,
TypeVar,
Iterable,
TYPE_CHECKING,
)

if sys.version_info >= (3, 8):
from typing import Protocol
else:
from typing_extensions import Protocol

if TYPE_CHECKING:
from pystac.item import Item as Item_Type
from pystac.collection import Collection as Collection_Type
Expand Down
2 changes: 1 addition & 1 deletion pystac/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
from typing import Optional

__version__ = "1.5.0"
__version__ = "1.6.0"
"""Library version"""


Expand Down
6 changes: 3 additions & 3 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy==0.961
mypy==0.971
flake8==4.0.1
black==22.6.0

Expand All @@ -8,10 +8,10 @@ jsonschema==4.7.2
coverage==6.4.2
doc8==0.11.2

types-python-dateutil==2.8.18
types-python-dateutil==2.8.19
types-orjson==3.6.2

pre-commit==2.20.0

# optional dependencies
orjson==3.7.7
orjson==3.7.8
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@
packages=find_packages(exclude=["tests*"]),
package_data={"": ["py.typed", "*.jinja2"]},
py_modules=[splitext(basename(path))[0] for path in glob("pystac/*.py")],
python_requires=">=3.7",
install_requires=[
"python-dateutil>=2.7.0",
'typing_extensions >= 3.7; python_version < "3.8"',
],
python_requires=">=3.8",
install_requires=["python-dateutil>=2.7.0"],
extras_require={"validation": ["jsonschema>=3.0"], "orjson": ["orjson>=3.5"]},
license="Apache Software License 2.0",
license_files=["LICENSE"],
Expand All @@ -38,7 +35,6 @@
"License :: OSI Approved :: Apache Software License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down

0 comments on commit 32f4e03

Please sign in to comment.