stop setting PANTS_CONFIG_OVERRIDE

instead, pass --config-override, the new hotness Testing Done: https://travis-ci.org/pantsbuild/pants/builds/47719612 Reviewed at https://rbcommons.com/s/twitter/r/1633/
dish59742 · Jan 21, 2015 · 8f28986 · 8f28986
1 parent b08bac2
commit 8f28986
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/build-support/bin/ci.sh b/build-support/bin/ci.sh
@@ -126,13 +126,13 @@ packages: [
   ]
 EOF
     ) && \
-    export PANTS_CONFIG_OVERRIDE=${config} && \
-    ./pants.pex binary ${INTERPRETER_ARGS[@]} \
+    ./pants.pex binary ${INTERPRETER_ARGS[@]} --config-override=${config} \
       src/python/pants:_pants_transitional_publishable_binary_ && \
     mv dist/_pants_transitional_publishable_binary_.pex dist/self.pex && \
-    ./dist/self.pex binary ${INTERPRETER_ARGS[@]} \
+    ./dist/self.pex binary --config-override=${config} ${INTERPRETER_ARGS[@]} \
       src/python/pants:_pants_transitional_publishable_binary_ && \
-    ./dist/self.pex setup-py --recursive src/python/pants:pants-packaged
+    ./dist/self.pex --config-override=${config} setup-py --recursive \
+      src/python/pants:pants-packaged
   ) || die "Failed to create pants distributions."
 fi
 

diff --git a/build-support/bin/release.sh b/build-support/bin/release.sh
@@ -63,7 +63,7 @@ function run_local_pants() {
 # To solve that problem, we override pants.ini with an empty list of
 # additional backends option.
 function execute_packaged_pants_without_internal_backends() {
-  PANTS_CONFIG_OVERRIDE=pants.no.internal.backend.ini pants "$@"
+  pants --config-override=pants.no.internal.backend.ini "$@"
 }
 
 function pkg_name() {

diff --git a/tests/python/pants_test/pants_run_integration_test.py b/tests/python/pants_test/pants_run_integration_test.py
@@ -67,15 +67,12 @@ def run_pants_with_workdir(self, command, workdir, config=None, stdin_data=None,
     env = os.environ.copy()
     env.update(extra_env or {})
 
-    # TODO: We can replace the env var with a '--config-override={0}'.format(ini_file_name) arg,
-    # once we're rid of the special-case handling of this env var in pants_exe.
-    env['PANTS_CONFIG_OVERRIDE'] = ini_file_name
-
     pants_script = os.path.join(get_buildroot(), self.PANTS_SCRIPT_NAME)
     pants_command = [pants_script,
                      '--no-lock',
                      '--kill-nailguns',
                      '--no-pantsrc',
+                     '--config-override={0}'.format(ini_file_name),
                      '--print-exception-stacktrace'] + command
 
     proc = subprocess.Popen(pants_command, env=env, stdin=subprocess.PIPE,