From fa9a502a387a26ba116840d35ae4a30f672e78ad Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 17 Feb 2018 19:31:37 -0800 Subject: [PATCH] [3.7] Improves the ability to build in CI (GH-5729) --- Lib/test/support/script_helper.py | 9 ++++++++- Lib/test/test_cmd_line.py | 10 +++++----- PCbuild/find_python.bat | 6 +++--- PCbuild/get_externals.bat | 4 ++-- PCbuild/python.props | 4 +++- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Lib/test/support/script_helper.py b/Lib/test/support/script_helper.py index b3ac848f08252b..5a81697708fd10 100644 --- a/Lib/test/support/script_helper.py +++ b/Lib/test/support/script_helper.py @@ -36,6 +36,11 @@ def interpreter_requires_environment(): """ global __cached_interp_requires_environment if __cached_interp_requires_environment is None: + # If PYTHONHOME is set, assume that we need it + if 'PYTHONHOME' in os.environ: + __cached_interp_requires_environment = True + return True + # Try running an interpreter with -E to see if it works or not. try: subprocess.check_call([sys.executable, '-E', @@ -166,7 +171,9 @@ def spawn_python(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw): kw is extra keyword args to pass to subprocess.Popen. Returns a Popen object. """ - cmd_line = [sys.executable, '-E'] + cmd_line = [sys.executable] + if not interpreter_requires_environment(): + cmd_line.append('-E') cmd_line.extend(args) # Under Fedora (?), GNU readline can output junk on stderr when initialized, # depending on the TERM setting. Setting TERM=vt100 is supposed to disable diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index a6b663403f4f52..fe89e3c0ee3424 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -63,6 +63,8 @@ def test_verbose(self): rc, out, err = assert_python_ok('-vv') self.assertNotIn(b'stack overflow', err) + @unittest.skipIf(interpreter_requires_environment(), + 'Cannot run -E tests when PYTHON env vars are required.') def test_xoptions(self): def get_xoptions(*args): # use subprocess module directly because test.support.script_helper adds @@ -278,11 +280,7 @@ def test_empty_PYTHONPATH_issue16309(self): def test_displayhook_unencodable(self): for encoding in ('ascii', 'latin-1', 'utf-8'): - # We are testing a PYTHON environment variable here, so we can't - # use -E, -I, or script_helper (which uses them). So instead we do - # poor-man's isolation by deleting the PYTHON vars from env. - env = {key:value for (key,value) in os.environ.copy().items() - if not key.startswith('PYTHON')} + env = os.environ.copy() env['PYTHONIOENCODING'] = encoding p = subprocess.Popen( [sys.executable, '-i'], @@ -704,6 +702,8 @@ def test_pythondevmode_env(self): self.assertEqual(proc.returncode, 0, proc) +@unittest.skipIf(interpreter_requires_environment(), + 'Cannot run -I tests when PYTHON env vars are required.') class IgnoreEnvironmentTest(unittest.TestCase): def run_ignoring_vars(self, predicate, **env_vars): diff --git a/PCbuild/find_python.bat b/PCbuild/find_python.bat index ba3a0f5a10daa3..17ce7ac609c1d1 100644 --- a/PCbuild/find_python.bat +++ b/PCbuild/find_python.bat @@ -31,10 +31,10 @@ @if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") & (set _Py_Python_Source=found in externals directory) & goto :found @rem If HOST_PYTHON is recent enough, use that -@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -c "import sys; assert sys.version_info[:2] >= (3, 6)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found +@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 6)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found @rem If py.exe finds a recent enough version, use that one -@py -3.6 -V >nul 2>&1 && (set PYTHON=py -3.6) && (set _Py_Python_Source=found with py.exe) && goto :found +@py -3.6 -EV >nul 2>&1 && (set PYTHON=py -3.6) && (set _Py_Python_Source=found with py.exe) && goto :found @if NOT exist "%_Py_EXTERNALS_DIR%" mkdir "%_Py_EXTERNALS_DIR%" @set _Py_NUGET=%NUGET% @@ -50,7 +50,7 @@ @rem If it fails, retry with any available copy of Python @powershell.exe -Command Invoke-WebRequest %_Py_NUGET_URL% -OutFile '%_Py_NUGET%' @if errorlevel 1 ( - @%_Py_HOST_PYTHON% "%~dp0\urlretrieve.py" "%_Py_NUGET_URL%" "%_Py_NUGET%" + @%_Py_HOST_PYTHON% -E "%~dp0\urlretrieve.py" "%_Py_NUGET_URL%" "%_Py_NUGET%" ) ) @echo Installing Python via nuget... diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index ed9ff759a370f7..d2af042d4aaebd 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -65,7 +65,7 @@ for %%e in (%libraries%) do ( git clone --depth 1 https://github.com/%ORG%/cpython-source-deps --branch %%e "%EXTERNALS_DIR%\%%e" ) else ( echo.Fetching %%e... - %PYTHON% "%PCBUILD%\get_external.py" -O %ORG% %%e + %PYTHON% -E "%PCBUILD%\get_external.py" -O %ORG% -e "%EXTERNALS_DIR%" %%e ) ) @@ -84,7 +84,7 @@ for %%b in (%binaries%) do ( git clone --depth 1 https://github.com/%ORG%/cpython-bin-deps --branch %%b "%EXTERNALS_DIR%\%%b" ) else ( echo.Fetching %%b... - %PYTHON% "%PCBUILD%\get_external.py" -b -O %ORG% %%b + %PYTHON% -E "%PCBUILD%\get_external.py" -b -O %ORG% -e "%EXTERNALS_DIR%" %%b ) ) diff --git a/PCbuild/python.props b/PCbuild/python.props index 39b7b8a6b6f35c..f9433133a87bec 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -43,7 +43,9 @@ $(BuildPath)instrumented\ - $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`)) + $(EXTERNALS_DIR) + $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) + $(ExternalsDir)\ $(ExternalsDir)sqlite-3.21.0.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\