Skip to content

Commit

Permalink
Merge pull request #145 from jsirois/jsirois/issues/144
Browse files Browse the repository at this point in the history
Accommodate OSX `Python` python binaries.
  • Loading branch information
wickman committed Aug 11, 2015
2 parents 4f96494 + 82c36da commit 49aec66
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
11 changes: 10 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ CHANGES
=======

----------
1.0.2.dev0
1.0.3.dev0
----------

* Bug fix: Accommodate OSX `Python` python binaries. Previously the OSX python distributions shipped
with OSX, XCode and available via https://www.python.org/downloads/ could fail to be detected using
the `PythonInterpreter` class.
Fixes `#144 <https://github.com/pantsbuild/pex/issues/144>`_.

-----
1.0.2
-----

* Bug fix: PEX-INFO values were overridden by environment `Variables` with default values that were
not explicitly set in the environment.
Fixes `#135 <https://github.com/pantsbuild/pex/issues/135>`_.
Expand Down
5 changes: 4 additions & 1 deletion pex/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ def __hash__(self):
class PythonInterpreter(object):
REGEXEN = (
re.compile(r'jython$'),
re.compile(r'python$'),

# NB: OSX ships python binaries named Python so we allow for capital-P.
re.compile(r'[Pp]ython$'),

re.compile(r'python[23].[0-9]$'),
re.compile(r'pypy$'),
re.compile(r'pypy-1.[0-9]$'),
Expand Down
2 changes: 1 addition & 1 deletion pex/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2015 Pants project contributors (see CONTRIBUTORS.md).
# Licensed under the Apache License, Version 2.0 (see LICENSE).

__version__ = '1.0.2'
__version__ = '1.0.3.dev0'

SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'

0 comments on commit 49aec66

Please sign in to comment.