From bfd467d6f37c5580876783104ed04dc94b0c0434 Mon Sep 17 00:00:00 2001 From: Daniel Mizyrycki Date: Sun, 22 May 2016 00:23:49 -0700 Subject: [PATCH] gh #68: Make --platform/--interpreter multi-options pass python2 and pypy tests --- .travis.yml | 4 +++- pex/installer.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dcfa530a..0e9b2ee2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # which should provide faster startup times and beefier # "machines". # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/ -sudo: false +sudo: required language: python python: 2.7 @@ -21,5 +21,7 @@ env: - TOXENV=isort-check install: - pip install tox + - sudo apt-get install python3-setuptools + - sudo python3 -m easy_install wheel script: - tox -v diff --git a/pex/installer.py b/pex/installer.py index 80e7e0840..b2588f590 100644 --- a/pex/installer.py +++ b/pex/installer.py @@ -91,7 +91,7 @@ def bootstrap_script(self): if not path: assert not self._strict # This should be caught by validation continue - bootstrap_modules.append(self.SETUP_BOOTSTRAP_MODULE % {'path': path, 'module': module}) + bootstrap_modules.append(self.SETUP_BOOTSTRAP_MODULE % {'path': str(path), 'module': module}) return '\n'.join( [self.SETUP_BOOTSTRAP_HEADER] + bootstrap_modules + [self.SETUP_BOOTSTRAP_FOOTER])