Merge pull request #855 from sirosen/release-3.17.0

Release v3.17.0

Author: sirosen

Makefile

@@ -23,7 +23,6 @@ showvars:
 	@echo "CLI_VERSION=$(CLI_VERSION)"
 prepare-release:
 	tox -e prepare-release
-	$(EDITOR) changelog.adoc
 tag-release:
 	git tag -s "$(CLI_VERSION)" -m "v$(CLI_VERSION)"
 	-git push $(shell git rev-parse --abbrev-ref @{push} | cut -d '/' -f1) refs/tags/$(CLI_VERSION)

RELEASING.adoc

@@ -5,19 +5,47 @@
   - Make sure you have a gpg key setup for use with git.
       https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work[git-scm.com guide for detail]
 
+  - The github `gh` CLI is used for example commands. You can perform the same
+    steps with the web UI if you prefer.
+
 == Procedure
 
   - Make sure your repo is on `main` and up to date; `git checkout main; git pull`
+
   - Read `changelog.d/` and decide if the release is MINOR or PATCH
+
+  - (optional) Set the version in the `CLI_VERSION` env var, for use in the
+    following steps:
+
+        CLI_VERSION=...
+
+  - Create a release branch; `git checkout -b release-$CLI_VERSION`
+
   - Update the version in `src/globus_cli/version.py`
-  - Update version and changelog; `make prepare-release`
+
+  - Update changelog;
+
+        make prepare-release
+        $(EDITOR) changelog.adoc
+
   - Add changed files;
       `git add changelog.d/ changelog.adoc src/globus_cli/version.py`
+
   - Commit; `git commit -m 'Bump version and changelog for release'`
-  - Push to main; `git push origin main`
+
+  - Push the release branch; `git push -u origin release-$CLI_VERSION`
+
+  - Open a PR for review
+    `gh pr create --base main --title "Release v$CLI_VERSION"`
+
+  * After any changes and approval, merge the PR, checkout `main`, and pull;
+      `git checkout main; git pull`
+
   - Tag the release; `make tag-release`
       _This will run a workflow to publish to test-pypi_
+
   - Create a GitHub release with a copy of the changelog
       _This will run a workflow to publish to pypi_
+
   - Ensure that `docs.globus.org` gets updated with new docs/changelog
       Procedure is set in that repo.

changelog.adoc

@@ -2,6 +2,44 @@
 
 // scriv-insert-here
 
+== 3.17.0 (2023-08-25)
+
+Bugfixes:
+
+* When the `--recursive` option is not given when using `globus transfer` the
+  `recursive` flag will be omitted from the transfer item rather than being sent as
+  `False`. If there is a need to explicitly use `False` to enforce the item is not a
+  directory, use the `--no-recursive` option.
+
+* Fix a bug that prevented running `globus endpoint set-subscription-id ... null`.
+
+* Fix handling of the URL for GCS Collections. In certain cases,
+  `globus collection` commands could fail to deduce the GCS Manager URL
+
+Enhancements:
+
+* Add `globus flows run resume` for resuming a *run* of a *flow*
+
+* Add `globus flows run list` for listing *runs* visible to the current user
+
+* Add `globus flows run cancel` for canceling a *run* of a *flow*
+
+* Improve `globus flows run resume` to be capable of detecting missing consents
+  and prompt for reauthentication via `globus session consent`. The consent
+  check can also be skipped with `--skip-inactive-reason-check`.
+
+* Add `globus flows run show-logs` for showing a **run**'s log entries
+
+* Add `globus flows run show-definition` for showing the *flow* definition and
+  input schema used to start a given *run*.
+
+* Add support for an `--orderby` option to `globus flows list`
+
+* More exhaustively check for interactive usage (detect sessions with
+  alternative prompts).
+
+* Display the `status` of Timers jobs when listed or shown.
+
 == 3.16.0 (2023-07-21)
 
 Enhancements:

changelog.d/20230719_160535_sirosen_implement_run_resume.md

@@ -7,7 +7,7 @@
 
 # single source of truth for package version,
 # see https://packaging.python.org/en/latest/single_source_version/
-__version__ = "3.16.0"
+__version__ = "3.17.0"
 
 # app name to send as part of SDK requests
 app_name = f"Globus CLI v{__version__}"