From e1bbab85ede982a64a3f6889c1390a76b0df4654 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Tue, 18 Jul 2023 10:13:50 -0600 Subject: [PATCH 1/7] Set version and change log for start of maint-2.1 branch --- CHANGES.txt | 3 +++ planet/__version__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index c937aa5d..ed735daa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +2.1.1 (TBD) + + 2.1.0 (2023-07-17) Added: diff --git a/planet/__version__.py b/planet/__version__.py index a33997dd..06754e28 100644 --- a/planet/__version__.py +++ b/planet/__version__.py @@ -1 +1 @@ -__version__ = '2.1.0' +__version__ = '2.1.1dev' From 13f704049e2b1c15778a324f8120d27027a3a850 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Tue, 18 Jul 2023 12:04:42 -0600 Subject: [PATCH 2/7] Remove uneeded upper version pin for click --- CHANGES.txt | 4 ++++ setup.py | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index ed735daa..35026e16 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,9 @@ 2.1.1 (TBD) +Changed: +- The upper version pin for click has been removed. This project ignores type + errors involving click.command() and click.group() since 2.1.0 and does not + need to avoid click 8.1.4 or 8.1.5. 2.1.0 (2023-07-17) diff --git a/setup.py b/setup.py index c7f0b69b..a9beff6d 100644 --- a/setup.py +++ b/setup.py @@ -24,9 +24,7 @@ continue install_requires = [ - # click 8.1.4 breaks our mypy check, see - # https://github.com/pallets/click/issues/2558. - 'click>8.0,<8.1.4', + 'click>8.0', 'geojson', 'httpx>=0.23.0', 'jsonschema', From d52c6d5ce4853673ef1caeacf967c72a7cf8e973 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Tue, 18 Jul 2023 15:03:56 -0600 Subject: [PATCH 3/7] click >= 8 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a9beff6d..c8a8c29e 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ continue install_requires = [ - 'click>8.0', + 'click>=8.0', 'geojson', 'httpx>=0.23.0', 'jsonschema', From 346789cbb2be9e510d1727af70cd0d4b49c14f03 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Wed, 19 Jul 2023 12:49:58 -0600 Subject: [PATCH 4/7] Import Literal from typing_extensions Resolves #996 --- CHANGES.txt | 5 ++++- noxfile.py | 2 +- planet/clients/subscriptions.py | 4 +++- planet/subscription_request.py | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 35026e16..d4543836 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,9 @@ -2.1.1 (TBD) +2.1.1 (2023-07-20) Changed: +- Version 2.1.0 was not compatible with Python 3.7 because of an import of + typing.Literal. It is now imported exclusively from typing_extensions and + Python 3.7, while EOL, will be supported for a while longer (#). - The upper version pin for click has been removed. This project ignores type errors involving click.command() and click.group() since 2.1.0 and does not need to avoid click 8.1.4 or 8.1.5. diff --git a/noxfile.py b/noxfile.py index 0e5990a3..13ab37a6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -37,7 +37,7 @@ def coverage(session): session.run('coverage', 'report') -@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12"]) +@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]) def test(session): session.run('python', '-m', 'ensurepip', '--upgrade') session.install('-U', 'setuptools') diff --git a/planet/clients/subscriptions.py b/planet/clients/subscriptions.py index de91daeb..bf92193b 100644 --- a/planet/clients/subscriptions.py +++ b/planet/clients/subscriptions.py @@ -1,7 +1,9 @@ """Planet Subscriptions API Python client.""" import logging -from typing import AsyncIterator, Literal, Optional, Sequence +from typing import AsyncIterator, Optional, Sequence + +from typing_extensions import Literal from planet.exceptions import APIError, ClientError from planet.http import Session diff --git a/planet/subscription_request.py b/planet/subscription_request.py index ca6bff2a..648c93e6 100644 --- a/planet/subscription_request.py +++ b/planet/subscription_request.py @@ -13,7 +13,9 @@ # the License. """Functionality for preparing subscription requests.""" from datetime import datetime -from typing import Any, Dict, Optional, List, Literal, Mapping, Sequence +from typing import Any, Dict, Optional, List, Mapping, Sequence + +from typing_extensions import Literal from . import geojson, specs from .exceptions import ClientError From 50435fa25f0a29eca54b0a42a07a67331ef2ed65 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Wed, 19 Jul 2023 12:56:42 -0600 Subject: [PATCH 5/7] Run test GHA with Python 3.7 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f07deb13..e80a09bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,7 +53,7 @@ jobs: strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - name: Checkout code From 02403bd28060ad690fadfdfb09d2a2f740a6c7c4 Mon Sep 17 00:00:00 2001 From: Jayant Chhillar Date: Thu, 20 Jul 2023 23:22:21 +0530 Subject: [PATCH 6/7] updated cli docs --- docs/cli/cli-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cli/cli-guide.md b/docs/cli/cli-guide.md index 9f354363..01c2d397 100644 --- a/docs/cli/cli-guide.md +++ b/docs/cli/cli-guide.md @@ -26,5 +26,5 @@ with Planet’s tools. ## CLI Set-up Getting your CLI set up with your Planet account is covered in the -[Quick Start Guide](../getting-started/quick-start-guide.md), so be sure +[Quick Start Guide](../get-started/quick-start-guide.md), so be sure to do that before going into any of the next sections. From 001457aac4974a8ed07b5e97bd76949a47cce59d Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Thu, 20 Jul 2023 13:30:49 -0600 Subject: [PATCH 7/7] This is 2.1.1 --- planet/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planet/__version__.py b/planet/__version__.py index 06754e28..55fa725b 100644 --- a/planet/__version__.py +++ b/planet/__version__.py @@ -1 +1 @@ -__version__ = '2.1.1dev' +__version__ = '2.1.1'