Skip to content

Commit

Permalink
Upgrade pex to 0.8.6.
Browse files Browse the repository at this point in the history
This picks up a fix to honor custom sys.excepthooks - which pants
supplies to handle untrapped errors with more user-friendly display.

Testing Done:
```console
$ rm pants.pex && ./pants
$ ./pants compile not/a/target

Exception message: Path to BUILD file does not exist at: /home/jsirois/dev/3rdparty/jsirois-pants/not/a
```

CI went green here:
  https://travis-ci.org/pantsbuild/pants/builds/50862096

Bugs closed: 1026, 1112

Reviewed at https://rbcommons.com/s/twitter/r/1778/
  • Loading branch information
jsirois committed Feb 15, 2015
1 parent 5ad9092 commit 6d4d1f5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mock==1.0.1
mox==0.5.3
# Until https://github.com/pantsbuild/pex/issues/28 is addressed, we cannot
# do pex<0.9.0.
pex>=0.8.5,<0.8.999999
pex>=0.8.6,<0.8.999999
psutil==1.1.3
lockfile==0.10.2
Pygments==1.4
Expand Down
1 change: 1 addition & 0 deletions src/python/pants/bin/pants_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def _run(exiter):
result = goal_runner.run()
exiter.do_exit(result)


def main():
exiter = _Exiter()
try:
Expand Down
3 changes: 2 additions & 1 deletion tests/python/pants_test/pants_run_integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ def run_pants_with_workdir(self, command, workdir, config=None, stdin_data=None,
proc = subprocess.Popen(pants_command, env=env, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
(stdout_data, stderr_data) = proc.communicate(stdin_data)
return PantsResult(pants_command, proc.returncode, stdout_data.decode("utf-8"), stderr_data.decode("utf-8"))
return PantsResult(pants_command, proc.returncode, stdout_data.decode("utf-8"),
stderr_data.decode("utf-8"))

def run_pants(self, command, config=None, stdin_data=None, extra_env=None, **kwargs):
"""Runs pants in a subprocess.
Expand Down
4 changes: 2 additions & 2 deletions tests/python/pants_test/tasks/test_ivy_resolve_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_ivy_resolve_gives_correct_exception_on_cycles(self):
pants_run = self.run_pants_with_workdir([
'compile', 'testprojects/src/java/com/pants/testproject/cycle1'], workdir)
self.assert_failure(pants_run)
self.assertTrue('CycleException' in pants_run.stderr_data)
self.assertIn('Cycle detected', pants_run.stderr_data)

def test_java_compile_with_ivy_report(self):
# Ensure the ivy report file gets generated
Expand Down Expand Up @@ -52,7 +52,7 @@ def test_ivy_args(self):
'examples/src/scala::'
])
self.assert_failure(pants_run)
self.assertTrue('Unrecognized option: -blablabla' in pants_run.stdout_data)
self.assertIn('Unrecognized option: -blablabla', pants_run.stdout_data)

def test_ivy_confs_success(self):
pants_run = self.run_pants([
Expand Down

0 comments on commit 6d4d1f5

Please sign in to comment.