Skip to content

Commit

Permalink
Extend 2.21 deprecations: remote_oauth_bearer_token_path, crossversio…
Browse files Browse the repository at this point in the history
…n=partial (#20616)

There were three deprecations originally scheduled for 2.21 (#20609),
two of will have only been deprecated for one release, and aren't a
significant burden to support, so we can ease users life for a little
longer:

| description                                          | deprecation started in | what could be removed                                                                           |
|------------------------------------------------------|------------------------|-------------------------------------------------------------------------------------------------|
| the `[GLOBAL].remote_oauth_bearer_token_path` option | 2.20.0.dev1 (#20116)   | configuration for the option, plus some a few small `if` statements, all in `global_options.py` |
| passing `crossversion="partial"` for scala artifacts | 2.20.0 (#20264) ^      | an extra enum variant, and a test                                                               |

^ NB. due to an easy-to-make misuse of `start_version` I believe people will only be getting the deprecation warnings in 2.20.0 stable, not any of the release candidates.

The third (`python_awslambda`) is removed in #20619.
  • Loading branch information
huonw authored Feb 27, 2024
1 parent e9a9322 commit ab95266
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/python/pants/backend/scala/target_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,9 @@ def compute_value(cls, raw_value: Optional[str], address: Address) -> Optional[s
computed_value = super().compute_value(raw_value, address)
if computed_value == ScalaCrossVersionMode.PARTIAL.value:
warn_or_error(
"2.21.0",
"2.23.0.dev0",
f"Scala cross version value '{computed_value}' in target: {address}",
"Use value `binary` instead",
start_version="2.20.0",
)
return computed_value

Expand Down Expand Up @@ -467,10 +466,9 @@ def validate(self, address: Address) -> set[str]:
)
if self.crossversion == ScalaCrossVersionMode.PARTIAL.value:
warn_or_error(
"2.21.0",
"2.23.0.dev0",
f"Scala cross version value '{self.crossversion}' in list of exclusions at target: {address}",
"Use value `binary` instead",
start_version="2.20.0",
)
return errors

Expand Down
2 changes: 1 addition & 1 deletion src/python/pants/option/global_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@ class BootstrapOptions:
dynamically set the relevant headers. Otherwise, no authorization will be performed.
"""
),
removal_version="2.21.0.dev0",
removal_version="2.23.0.dev0",
removal_hint=f'use `[GLOBAL].remote_oauth_bearer_token = "@/path/to/token.txt"` instead, see {doc_url("reference/global-options#remote_oauth_bearer_token")}',
)

Expand Down

0 comments on commit ab95266

Please sign in to comment.