FIX: preserve PYTHONPATH under --python=same discovery - #1612
Open
HaoZeke wants to merge 1 commit into
Open
Conversation
benchmark.py stripped host PYTHONPATH whenever ASV_PYTHONPATH was unset. That broke in-tree workflows (e.g. scipy build dirs on PYTHONPATH) with --python=same / ExistingEnvironment, and also undid ASV_PYTHONPATH after run_executable rewrote it to PYTHONPATH. Managed env isolation stays in run_executable. Fixes airspeed-velocity#1537.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
--python=samediscovery no longer strips hostPYTHONPATHfromsys.pathwhenASV_PYTHONPATHis unset (issue #1537). That was a 0.6.5 regression from #1462: SciPy (and other in-tree builds) put the meson build dir onPYTHONPATH, andExistingEnvironmentinherits it; theelsebranch then removed those paths andimport scipyfailed. Managed envs still drop barePYTHONPATHinEnvironment.run_executable. The scipy#25847ASV_PYTHONPATH = PYTHONPATHassignment remains valid for managed envs.Test plan
test/test_benchmark_path_env.py(keep PYTHONPATH; apply ASV_PYTHONPATH; prepend order)test_run_python_same,test_profile_python_same,test_checkFixes #1537