Skip to content

Commit

Permalink
Simplify Pants's internal use of local environments (#17045)
Browse files Browse the repository at this point in the history
There's no need for us to set up local environments, now that local environments are only to _override_ values from the subsystems. (Before, we were going to deprecate the subsystems.)

We may in the future want to add a macos_arm64 environment. That is safe for us to do without adding other local environments thanks to #16983.

See #17043 for an alternative way we could be leveraging environments locally.

[ci skip-rust]
  • Loading branch information
Eric-Arellano authored Sep 28, 2022
1 parent d5dc1a1 commit 08e2cc5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
11 changes: 0 additions & 11 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ files(name="files", sources=["BUILD_ROOT", "pants.toml"])

python_test_utils(name="test_utils")

_local_environment(
name="default_env",
)

_local_environment(
name="macos_local_env",
compatible_platforms=["macos_arm64", "macos_x86_64"],
# Avoid system Python interpreters, which tend to be broken on macOS.
python_bootstrap_search_path=["<PYENV>"],
)

# Used for experimenting with the new Docker support.
_docker_environment(
name="docker_env",
Expand Down
5 changes: 1 addition & 4 deletions pants.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,7 @@ root_patterns = [
]

[environments-preview.names]
default_env = "//:default_env"
# TODO(#7735): Define `//:macos_local_env` after figuring out why our Build Wheels Mac job is
# failing when this is set:
# https://github.com/pantsbuild/pants/runs/8082954359?check_suite_focus=true#step:9:657
# We don't define any local environments because the options system covers our cases adequately.
docker = "//:docker_env"

[tailor]
Expand Down

0 comments on commit 08e2cc5

Please sign in to comment.