From 8d8b91a9f6930eb81b119d88e5b22924e6b7292f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 28 Feb 2020 16:23:38 +0000 Subject: [PATCH] Remove commented line of code and move comment --- cibuildwheel/macos.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 0285b598..fac7809f 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -133,8 +133,13 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef installation_bin_path, env['PATH'], ]) - # Fix issue with site.py setting the wrong `sys.prefix`, `sys.exec_prefix`, `sys.path`, ... for PyPy: https://foss.heptapod.net/pypy/pypy/issues/3175 - # Be safe and avoid other issues by just always removing the '__PYVENV_LAUNCHER__' environment variable (cfr. https://github.com/python/cpython/pull/9516) + + # Fix issue with site.py setting the wrong `sys.prefix`, `sys.exec_prefix`, + # `sys.path`, ... for PyPy: https://foss.heptapod.net/pypy/pypy/issues/3175 + # Also fix an issue with the shebang of installed scripts inside the + # testing virtualenv- see https://github.com/theacodes/nox/issues/44 and + # https://github.com/pypa/virtualenv/issues/620 + # Also see https://github.com/python/cpython/pull/9516 env.pop('__PYVENV_LAUNCHER__', None) env = environment.as_dictionary(prev_environment=env) @@ -204,9 +209,6 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef os.path.join(venv_dir, 'bin'), virtualenv_env['PATH'], ]) - # Fix some weird issue with the shebang of installed scripts - # See https://github.com/theacodes/nox/issues/44 and https://github.com/pypa/virtualenv/issues/620 - # virtualenv_env.pop('__PYVENV_LAUNCHER__', None) # No need for this anymore, as '__PYVENV_LAUNCHER__' is already removed from `env` above # check that we are using the Python from the virtual environment call(['which', 'python'], env=virtualenv_env)