From cc1b3a1a94596bc855757e4ea08b3488d0d20248 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sun, 9 Aug 2015 21:22:12 -0600 Subject: [PATCH 1/2] Accomodate OSX `Python` python binaries. --- pex/interpreter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pex/interpreter.py b/pex/interpreter.py index 0ae3b5dc0..c3ea95c53 100644 --- a/pex/interpreter.py +++ b/pex/interpreter.py @@ -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]$'), From 82c36daea414870d5275e8087a1c398752e522fe Mon Sep 17 00:00:00 2001 From: John Sirois Date: Mon, 10 Aug 2015 08:48:01 -0600 Subject: [PATCH 2/2] Bump the pre-release version and update the change log. --- CHANGES.rst | 11 ++++++++++- pex/version.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4bd766da0..241701309 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 `_. + +----- +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 `_. diff --git a/pex/version.py b/pex/version.py index a44de6450..4b53cf13b 100644 --- a/pex/version.py +++ b/pex/version.py @@ -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'