Merge branch 'main' into downloading_asset_example-719

Author: kevinlacaille

CHANGES.txt

@@ -1,3 +1,12 @@
+2.0a5 (2022-10-20)
+
+- Implement python api data client asset download and supporting functions (#707).
+- `planet data filter` cli command outputs a valid empty filter if all
+  subfilters are removed (#654).
+- 'planet orders request' cli command now provides supported bundles for a
+  given item type, bundle and item type are case-insensitive, and bundle and
+  item type are moved to positional arguments (#680).
+
 2.0a3 (2022-09-07)
 
 - A change in behavior of httpx affected download of order assets in 2.0a2.
@@ -12,7 +21,7 @@
 - Help for planet-subscriptions-describe and update commands has been
   corrected, resolving the issue reported in #658.
 
-2.0a2 (2022-07-04)
+2.0a2 (2022-08-04)
 
 - Upgrade httpx to 0.23, change how quota exceptions are caught
 - Increase reliability of communication with Planet servers and avoid clobbering them

RELEASE.md

@@ -2,28 +2,30 @@
 
 *Planet maintainers only*
 
-Releasing is a two-step process: (1) releasing on Github and test.pypi and (2) releasing to pypi. Releasing on Github will automatically trigger a release on test.pypi via a Github Action. Following manual confirmation of a successful and satisfactory release on test.pypi, release on pypi is triggered manually with the Github Action "Automatically Publish on TestPyPi".
+Releasing is a two-step process: (1) releasing on Github and test.pypi and (2) releasing to pypi. Releasing on Github will automatically trigger a release on test.pypi via a Github Action. Following manual confirmation of a successful and satisfactory release on test.pypi, release on pypi is triggered manually with the Github Action "Automatically Publish on TestPyPi". There is also an option to publish to test.pypi and pypi from your local machine.
 
 #### Release Naming Conventions
 
 The following are the release naming conventions:
 
-1. Current dev version: Bumped version of last release with `dev` added to the end
+1. Current Dev Version is obtained from `planet/__version__.py`
+1. Release Version: Remove `dev` from Current Dev Version
+1. Next Dev Version: Bumped version of last release with `dev` added to the end.
     * **PROPOSAL**: Version number is determined by [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
-1. Release version: Remove `dev` from current dev version
 
-Example:
-* If
- * Previous Release Version ==  `1.0.0`
-* Then
- * Current Dev Version: `1.0.1dev`
- * Release Version: `1.0.1`
- * Next Dev Version: `1.0.2dev`
+
+##### Example:
+
+**IF** Current Dev Version ==  `1.0.0dev` **THEN**
+  * Release Version: `1.0.0`
+  * Next Dev Version: `1.0.1dev`
 
 ## Release Workflow
 
-#### Step 1: Release on Github
+The release on Github and PyPi performed from a release branch while the release branch PR is in progress. After the releases, the version in the PR is updated before it is merged. Thus, the version in `main` is not the same as the version of the release.
+
 *NOTE: This section refers to version names given in Release Naming Conventions section above.*
+
 1. Create a release branch named `release-{Release Version}`
 1. Make the following changes for the release
   * Update `CHANGES.txt` (**PROPOSAL**: change this to `docs/CHANGELOG.md`)
@@ -32,21 +34,24 @@ Example:
     * Sort according to importance
     * **PROPOSAL**: Adhere to [Keep a Changelog](https://keepachangelog.com/)
   * Update `planet/__version__.py` to Release Version
-1. Create a PR for the release branch (named after release branch), wait for CI to pass
+1. Create a PR for the release branch (named after release branch, description is changelog entry), wait for CI to pass
 1. Create a new github release:
-  * Set Tag to the version number specified in `planet/__version__.py`, aka Release Version
+  * Set Tag Release Version
+  * **!!!** Set Target to the release branch **!!!**
   * Copy Description from the new entry in `docs/CHANGELOG.md`
   * Select "This is a pre-release" if applicable
   * Select "Create a discussion for this release"
-1. Update `planet/__version__.py` to Next Dev Version
-1. Merge PR for release branch
-
-###### Step 2: Release on pypi
-
-1. Verify the test release on [test.pypi.org](https://test.pypi.org/project/planet/)
-1. Run the Github Action "Publish on PyPi"
+1. Verify the successful run of the Github Action "Autopublish to TestPyPi" and validate the test release on [test.pypi.org](https://test.pypi.org/project/planet/)
+1. Run the Github Action "Publish on PyPi", **!!!** Set Branch to the release branch **!!!**
+1. Verify the successful run of the Github Action "Publish on PyPi" and validate the release on [pypi.org](https://pypi.org/project/planet/)
+1. Push a commit to the PR updating `planet/__version__.py` to Next Dev Version
+1. Merge PR
+1. Announce the release through the following avenues:
+ * *Planet Internal:* #python slack channel
+ * Changelog
+ * Twitter
 
-###### Local publishing
+### Local publishing
 
 Publishing to testpypi and pypi can also be performed locally with:
 

planet/__version__.py

@@ -1 +1 @@
-__version__ = '2.0a3'
+__version__ = '2.0a6dev'