Skip to content

Commit

Permalink
Revert "Temporarily disable the Toolchain plugin to facilitate landin…
Browse files Browse the repository at this point in the history
…g Python 3.9 (pantsbuild#11466)"

This reverts commit a8c0f7b.
  • Loading branch information
asherf committed Jan 15, 2021
1 parent 2dc94ca commit 7ba23d0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions pants.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ backend_packages.add = [
"pants.backend.python.typecheck.mypy",
"pants.backend.python.mixed_interpreter_constraints",
"internal_plugins.releases",
# "toolchain.pants.auth",
# "toolchain.pants.buildsense",
# "toolchain.pants.common",
"toolchain.pants.auth",
"toolchain.pants.buildsense",
"toolchain.pants.common",
]

#plugins = [
# "toolchain.pants.plugin==0.3.0",
#]
plugins = [
"toolchain.pants.plugin==0.3.0",
]

build_file_prelude_globs = ["pants-plugins/python_integration_tests_macro.py"]

Expand Down Expand Up @@ -142,5 +142,5 @@ interpreter_constraints = [">=3.7,<3.9"]
[sourcefile-validation]
config = "@build-support/regexes/config.yaml"

#[toolchain-setup]
#repo = "pants"
[toolchain-setup]
repo = "pants"
14 changes: 7 additions & 7 deletions pants.travis-ci.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ junit_xml_dir = "dist/test-results/"
[coverage-py]
report = ["raw", "xml"]

#[auth]
#from_env_var = "TOOLCHAIN_AUTH_TOKEN"
#org = "pantsbuild"
#ci_env_variables = ["TRAVIS", "TRAVIS_JOB_ID", "TRAVIS_BUILD_ID", "TRAVIS_PULL_REQUEST", "TRAVIS_BUILD_WEB_URL"]
#
#[buildsense]
#enable = true
[auth]
from_env_var = "TOOLCHAIN_AUTH_TOKEN"
org = "pantsbuild"
ci_env_variables = ["TRAVIS", "TRAVIS_JOB_ID", "TRAVIS_BUILD_ID", "TRAVIS_PULL_REQUEST", "TRAVIS_BUILD_WEB_URL"]

[buildsense]
enable = true

0 comments on commit 7ba23d0

Please sign in to comment.