From 48748797b7a76c01ed8e7eef0f34725061017ceb Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 13 May 2015 16:59:11 +0100 Subject: [PATCH] setup.py: fix for OSX On Unix, pip will change current working directory to whereever it has extracted the downloaded package. On Mac OSX, it does not appear to do that. To get around this difference, specify paths in setup.py relative to the location of setup.py, rather than the current working directory. --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 408e2e8f..a59619b4 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,10 @@ try: except ImportError: from distutils.core import setup -sys.path.insert(0, './wlauto/core/') + +wlauto_dir = os.path.join(os.path.dirname(__file__), 'wlauto') + +sys.path.insert(0, os.path.join(wlauto_dir, 'core')) from version import get_wa_version # happends if falling back to distutils @@ -38,7 +41,7 @@ except OSError: packages = [] data_files = {} source_dir = os.path.dirname(__file__) -for root, dirs, files in os.walk('wlauto'): +for root, dirs, files in os.walk(wlauto_dir): rel_dir = os.path.relpath(root, source_dir) data = [] if '__init__.py' in files: