From 6425e1d96f798c147def06fb92062ad0df123f0c Mon Sep 17 00:00:00 2001 From: micbou Date: Tue, 11 Dec 2018 07:20:26 +0100 Subject: [PATCH] Fix run_tests.py dependencies --- run_tests.py | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/run_tests.py b/run_tests.py index 68b37e27..2eccc49a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,40 +1,37 @@ #!/usr/bin/env python -import os -import subprocess -import os.path as p +import argparse import glob +import os +import os.path as p +import subprocess import sys DIR_OF_THIS_SCRIPT = p.dirname( p.abspath( __file__ ) ) DIR_OF_THIRD_PARTY = p.join( DIR_OF_THIS_SCRIPT, 'third_party' ) -DIR_OF_YCMD_THIRD_PARTY = p.join( DIR_OF_THIRD_PARTY, 'ycmd', 'third_party' ) -python_path = [] -for folder in os.listdir( DIR_OF_THIRD_PARTY ): - python_path.append( p.abspath( p.join( DIR_OF_THIRD_PARTY, folder ) ) ) -for folder in os.listdir( DIR_OF_YCMD_THIRD_PARTY ): - # We skip python-future because it needs to be inserted in sys.path AFTER - # the standard library imports but we can't do that with PYTHONPATH because - # the std lib paths are always appended to PYTHONPATH. We do it correctly in - # prod in ycmd/utils.py because we have access to the right sys.path. - # So for dev, we rely on python-future being installed correctly with - # pip install -r test_requirements.txt - # - # Pip knows how to install this correctly so that it doesn't matter where in - # sys.path the path is. - if folder == 'python-future': - continue - python_path.append( p.abspath( p.join( DIR_OF_YCMD_THIRD_PARTY, folder ) ) ) +# We don't include python-future (not to be confused with pythonfutures) because +# it needs to be inserted in sys.path AFTER the standard library imports but we +# can't do that with PYTHONPATH because the std lib paths are always appended to +# PYTHONPATH. We do it correctly inside Vim because we have access to the right +# sys.path. So for dev, we rely on python-future being installed correctly with +# +# pip install -r python/test_requirements.txt +# +# Pip knows how to install this correctly so that it doesn't matter where in +# sys.path the path is. +python_path = [ p.join( DIR_OF_THIRD_PARTY, 'pythonfutures' ), + p.join( DIR_OF_THIRD_PARTY, 'requests-futures' ), + p.join( DIR_OF_THIRD_PARTY, 'requests_deps', 'chardet' ), + p.join( DIR_OF_THIRD_PARTY, 'requests_deps', 'certifi' ), + p.join( DIR_OF_THIRD_PARTY, 'requests_deps', 'idna' ), + p.join( DIR_OF_THIRD_PARTY, 'requests_deps', 'requests' ), + p.join( DIR_OF_THIRD_PARTY, 'requests_deps', 'urllib3', 'src' ), + p.join( DIR_OF_THIRD_PARTY, 'ycmd' ) ] if os.environ.get( 'PYTHONPATH' ): python_path.append( os.environ[ 'PYTHONPATH' ] ) os.environ[ 'PYTHONPATH' ] = os.pathsep.join( python_path ) -sys.path.insert( 1, p.abspath( p.join( DIR_OF_YCMD_THIRD_PARTY, - 'argparse' ) ) ) - -import argparse - def RunFlake8(): print( 'Running flake8' )