Merge branch 'main' into carl/jwt-validator-commands

Author: carl-alexander-adams

docs/changelog.md

@@ -1,9 +1,12 @@
 # Changelog
 
-## 2.1.0 - 2025-??-??
+## 2.1.0 - 2025-07-09
 - Initial public release targeting integration with the
   [Planet Client for Python](https://github.com/planetlabs/planet-client-python).
 
+## 2.0.11 - 2025-07-09
+- Final 2.0 series development release.
+
 ## [Unreleased: 2.0.*]
 - All releases in the 2.0.X series are development releases, even if not
   tagged as such. This work included some shakedowns of the release pipelines.

src/planet_auth/oidc/api_clients/token_api_client.py

@@ -292,7 +292,7 @@ def get_token_from_password(
                 authorization (login).
             requested_audiences: A list of strings specifying the audiences
                 to request.
-            auth_enricher: Function to layer un the application of client credentials.
+            auth_enricher: Function to layer in the application of client credentials.
             extra: Dict of extra parameters to pass to the token endpoint.
 
         Returns:

src/planet_auth_utils/plauth_factory.py

@@ -269,22 +269,24 @@ def initialize_auth_client_context(
         application developer, and are given the highest priority.  Internally, the
         priority used for the source of any particular configuration values is, from
         highest to lowest priority, as follows:
-            - Arguments to this function.
-            - Environment variables.
-            - Values from configuration file.
-            - Built-in defaults.
+
+        - Arguments to this function.
+        - Environment variables.
+        - Values from configuration file.
+        - Built-in defaults.
 
         In constructing the returned Auth context, the following priority is applied, from
         highest to lowest:
-            - A user selected auth profile, as specified by `auth_profile_opt`. This may either
-              specify a built-in profile name, or a fully custom profile defined by files in
-              a `~/.planet/<profile name>` directory.
-            - A user selected OAuth service account, as specified by `auth_client_id_opt` and `auth_client_secret_opt`.
-            - A user specified API key, as specified by `auth_api_key_opt`
-            - A user selected auth profile, as determined from either environment variables or config files.
-            - A user selected OAuth service account, as determined from either environment variables or config files.
-            - A user selected API key, as determined from either environment variables or config files.
-            - A built-in default auth profile, which may require interactive user authentication.
+
+        - A user selected auth profile, as specified by `auth_profile_opt`. This may either
+          specify a built-in profile name, or a fully custom profile defined by files in
+          a `~/.planet/<profile name>` directory.
+        - A user selected OAuth service account, as specified by `auth_client_id_opt` and `auth_client_secret_opt`.
+        - A user specified API key, as specified by `auth_api_key_opt`
+        - A user selected auth profile, as determined from either environment variables or config files.
+        - A user selected OAuth service account, as determined from either environment variables or config files.
+        - A user selected API key, as determined from either environment variables or config files.
+        - A built-in default auth profile, which may require interactive user authentication.
 
         Example:
             ```python

version.txt

@@ -1 +1 @@
-2.0.11
+2.1.0