diff options
author | Aloys Augustin <aloaugus@cisco.com> | 2020-05-25 18:07:24 +0200 |
---|---|---|
committer | Ole Trøan <otroan@employees.org> | 2020-05-25 20:27:29 +0000 |
commit | ef29fa43cef738ba359922b65d38873147e48a22 (patch) | |
tree | 302b9f9c7257a06ca02c9c75be60e0b0a8dc39ca /test/Makefile | |
parent | 3b9540966f877ae67d374cab334c31bd6e3f8c8b (diff) |
tests: update pip and pip-tools
This fixes an issue where the pinned requirements file can be modified
when running the tests.
Change-Id: Ic89d1844d1fd8d00f62211a9b051a26ac34ee316
Type: fix
Signed-off-by: Aloys Augustin <aloaugus@cisco.com>
Diffstat (limited to 'test/Makefile')
-rw-r--r-- | test/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/Makefile b/test/Makefile index 7d9d4e92e89..067d6efc6fe 100644 --- a/test/Makefile +++ b/test/Makefile @@ -99,14 +99,15 @@ PYTHON_INTERP=$(PYTHON) endif PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)') -PIP_VERSION=19.1.1 -PIP_TOOLS_VERSION=3.8.0 # Keep in sync with requirements.txt +PIP_VERSION=20.1.1 +# Keep in sync with requirements.txt +PIP_TOOLS_VERSION=5.1.2 PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages) BUILD_COV_DIR=$(TEST_BR)/coverage -PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION).done -PIP_INSTALL_DONE=$(VENV_RUN_DIR)/pip-install-$(PYTHON_VERSION).done +PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION)-$(PIP_TOOLS_VERSION).done +PIP_INSTALL_DONE=$(VENV_RUN_DIR)/pip-install-$(PYTHON_VERSION)-$(PIP_VERSION).done PIP_PATCH_DONE=$(VENV_RUN_DIR)/pip-patch-$(PYTHON_VERSION).done PAPI_INSTALL_DONE=$(VENV_RUN_DIR)/papi-install-$(PYTHON_VERSION).done PAPI_PYTHON_SRC_DIR=$(WS_ROOT)/src/vpp-api/python |