Skip to content

Commit

Permalink
Remove the "pants.pex for integration tests" code, because pants is r…
Browse files Browse the repository at this point in the history
…un from the PYTHONPATH of the test target, which will automatically include either loose sources or requirements, depending on whether the test is run in or out of the pantsbuild/pants repo.

# Rust tests will be skipped. Delete if not intended.
[ci skip-rust-tests]
  • Loading branch information
stuhood committed Jul 7, 2020
1 parent a227f72 commit dce29dc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 31 deletions.
7 changes: 0 additions & 7 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,3 @@ files(
name = 'pyproject',
sources = ['pyproject.toml'],
)

# NB: This is used for integration tests. This is generated automatically via `./pants` and
# `build-support/bin/bootstrap_pants_pex.sh`.
files(
name = 'pants_pex',
sources = ['pants.pex'],
)
23 changes: 0 additions & 23 deletions pants
Original file line number Diff line number Diff line change
Expand Up @@ -106,27 +106,4 @@ else
export PANTS_DEV=1
fi

# Integration tests depend on an up-to-date `pants.pex`. Here, we check if we're running tests
# and ensure the `pants.pex` is generated if so. We do this here, rather than via `pants-plugins`,
# because we want the file to be generated _before_ any tests run, not during that Pants invocation,
# as the dependency is marked via BUILD files so should not be constructed at runtime.
#
# Note that we have no way to distinguish between integration tests vs unit tests here, so we
# unfortunately rebuild the pants.pex for unit tests too.
#
# We do not do this when in CI because CI downloads the PEX from AWS and we never want a worker
# shard to try bootstrapping the PEX itself.
test_goal_used=false
for arg in "$@"; do
if [[ "${arg}" == 'test' || "${arg}" == 'test.*' ]]; then
test_goal_used=true
fi
done

no_regen_pex="${NO_REGEN_PEX:-${TRAVIS}}"
if [[ "${test_goal_used}" == 'true' && "${no_regen_pex}" != 'true' ]]; then
"$HERE/build-support/bin/bootstrap_pants_pex.sh"
echo -e "Finished bootstrapping pants.pex for integration tests.\n" >&2
fi

exec_pants_bare "$@"
1 change: 0 additions & 1 deletion src/python/pants/testutil/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ python_library(
sources = ['pants_run_integration_test.py'],
dependencies = [
'//:build_root',
'//:pants_pex',
'3rdparty/python:ansicolors',
'3rdparty/python:dataclasses',
'src/python/pants/base:build_environment',
Expand Down

0 comments on commit dce29dc

Please sign in to comment.