diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2021-11-13 20:21:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 20:21:51 +0100 |
| commit | e5ef1fe8c91ab966df0eb8aa57999ac0e02d5ec6 (patch) | |
| tree | 3e2cf85b39178a65a92c1ff6a54ede6d7dbca9e3 | |
| parent | f964727ddb27c90cc4157ec6736e5e77d6e40332 (diff) | |
| parent | bd03c464c3d4b70b6a5d3061f8f015787a0095a4 (diff) | |
| download | numpy-e5ef1fe8c91ab966df0eb8aa57999ac0e02d5ec6.tar.gz | |
Merge pull request #20282 from abatomunkuev/issue#20239
MAINT: Fix runtests.py overriding $PYTHONPATH environment variable
| -rwxr-xr-x | runtests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/runtests.py b/runtests.py index 621d8b421..ac057a358 100755 --- a/runtests.py +++ b/runtests.py @@ -192,7 +192,12 @@ def main(argv): site_dir, site_dir_noarch = build_project(args) sys.path.insert(0, site_dir) sys.path.insert(0, site_dir_noarch) - os.environ['PYTHONPATH'] = site_dir + os.pathsep + site_dir_noarch + os.environ['PYTHONPATH'] = \ + os.pathsep.join(( + site_dir, + site_dir_noarch, + os.environ.get('PYTHONPATH', '') + )) else: _temp = __import__(PROJECT_MODULE) site_dir = os.path.sep.join(_temp.__file__.split(os.path.sep)[:-2]) @@ -493,7 +498,8 @@ def build_project(args): os.makedirs(site_dir) if not os.path.exists(site_dir_noarch): os.makedirs(site_dir_noarch) - env['PYTHONPATH'] = site_dir + os.pathsep + site_dir_noarch + env['PYTHONPATH'] = \ + os.pathsep.join((site_dir, site_dir_noarch, env.get('PYTHONPATH', ''))) log_filename = os.path.join(ROOT_DIR, 'build.log') |