From c55fd827252fb1288c1f1d1c7e0af78b551336e1 Mon Sep 17 00:00:00 2001
From: Eric Arellano <14852634+Eric-Arellano@users.noreply.github.com>
Date: Fri, 15 Jan 2021 19:04:02 -0700
Subject: [PATCH] Revert "Temporarily disable the Toolchain plugin to
 facilitate landing Python 3.9 (#11466)" (#11473)

This reverts commit a8c0f7b4c27b494c32b34da92018632edd8d770a.

We decided that we are going to put on hold releasing Pants with Python 3.9 for a week so that we can focus on remote caching.

[ci skip-rust]
[ci skip-build-wheels]
---
 pants.toml           | 16 ++++++++--------
 pants.travis-ci.toml | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pants.toml b/pants.toml
index 67813027a5c..d126e746514 100644
--- a/pants.toml
+++ b/pants.toml
@@ -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.4.0",
+]
 
 build_file_prelude_globs = ["pants-plugins/python_integration_tests_macro.py"]
 
@@ -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"
diff --git a/pants.travis-ci.toml b/pants.travis-ci.toml
index f7da7073f36..9d17845e06e 100644
--- a/pants.travis-ci.toml
+++ b/pants.travis-ci.toml
@@ -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
\ No newline at end of file