From 0a192ea93df9d1cd4d7777bcc5418a2f9e861a6c Mon Sep 17 00:00:00 2001 From: Naveen Joy Date: Tue, 31 Jan 2023 16:51:58 -0800 Subject: tests: use existing pip compiled req file for building the run.py venv pip compiled requirements file named requirements-3.txt exists in the test directory. No need to auto-generate it again Type: improvement Change-Id: Ib2b51c983af8d0e4b000e4544012b6cd94405519 Signed-off-by: Naveen Joy --- test/run.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'test') diff --git a/test/run.py b/test/run.py index 93391a7e9cc..da461e8de7a 100755 --- a/test/run.py +++ b/test/run.py @@ -48,12 +48,9 @@ vpp_plugin_path = vpp_test_plugin_path = ld_library_path = None pip_version = "22.0.4" pip_tools_version = "6.6.0" -# Test requirement files -test_requirements_file = os.path.join(test_dir, "requirements.txt") -# Auto-generated requirement file +# Compiled pip requirements file pip_compiled_requirements_file = os.path.join(test_dir, "requirements-3.txt") - # Gracefully exit after executing cleanup scripts # upon receiving a SIGINT or SIGTERM def handler(signum, frame): @@ -116,11 +113,6 @@ class ExtendedEnvBuilder(venv.EnvBuilder): os.environ[ "CUSTOM_COMPILE_COMMAND" ] = "make test-refresh-deps (or update requirements.txt)" - # Cleanup previously auto-generated pip req. file - try: - os.unlink(pip_compiled_requirements_file) - except OSError: - pass # Set the venv python executable & binary install path env_exe = context.env_exe bin_path = context.bin_path @@ -129,15 +121,6 @@ class ExtendedEnvBuilder(venv.EnvBuilder): test_req = [ ["pip", "install", "pip===%s" % pip_version], ["pip", "install", "pip-tools===%s" % pip_tools_version], - [ - "piptools", - "compile", - "-q", - "--generate-hashes", - test_requirements_file, - "--output-file", - pip_compiled_requirements_file, - ], ["piptools", "sync", pip_compiled_requirements_file], ["pip", "install", "-e", papi_python_src_dir], ] -- cgit 1.2.3-korg