summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Joy <najoy@cisco.com>2023-01-31 16:51:58 -0800
committerDave Wallace <dwallacelf@gmail.com>2023-02-10 02:15:26 +0000
commit0a192ea93df9d1cd4d7777bcc5418a2f9e861a6c (patch)
treef91bfb6f7b7d3f23102a3fc1567aa3699fd730ea
parent25b6e44424e3945eb37226d214baf38735730121 (diff)
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 <najoy@cisco.com>
-rwxr-xr-xtest/run.py19
1 files changed, 1 insertions, 18 deletions
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],
]