From 62f3aa1dadfe006174eabfd65bfa089c7331b0dc Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 16 Jul 2020 14:30:07 +0200 Subject: [PATCH] Make virtualenv inside the project work --- .gitignore | 1 + run_project_tests.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index f87f562f5..fea337e97 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ packagecache /docs/hotdoc-private* *.pyc +/*venv* diff --git a/run_project_tests.py b/run_project_tests.py index 793c844e7..9487a0415 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -1115,16 +1115,15 @@ def check_format(): '.build', '.md', } + skip_dirs = { + '.dub', # external deps are here + '.pytest_cache', + 'meson-logs', 'meson-private', + '.eggs', '_cache', # e.g. .mypy_cache + 'venv', # virtualenvs have DOS line endings + } for (root, _, filenames) in os.walk('.'): - if '.dub' in root: # external deps are here - continue - if '.pytest_cache' in root: - continue - if 'meson-logs' in root or 'meson-private' in root: - continue - if '__CMake_build' in root: - continue - if '.eggs' in root or '_cache' in root: # e.g. .mypy_cache + if any([x in root for x in skip_dirs]): continue for fname in filenames: file = Path(fname) @@ -1248,6 +1247,7 @@ if __name__ == '__main__': options.extra_args += ['--cross-file', options.cross_file] print('Meson build system', meson_version, 'Project Tests') + print('Using python', sys.version.split('\n')[0]) setup_commands(options.backend) detect_system_compiler(options) print_tool_versions()