ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: update python packages

Browse Source 
- Also fix docs requirements and venv cleanup
  required for docker executor building

Type: test

Change-Id: I839423224d95c45af42f459217887f4201cbb11a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace
2021-10-30 15:30:38 -04:00
committed by Damjan Marion
parent 543a0fd32b
commit 78b4f4e19b
5 changed files with 137 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -72,7 +72,7 @@ DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
DEB_DEPENDS += python3-venv # ensurepip DEB_DEPENDS += python3-venv # ensurepip
DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil
DEB_DEPENDS += libnl-3-dev libnl-route-3-dev DEB_DEPENDS += libnl-3-dev libnl-route-3-dev
# python3.6 on 16.04 requires python36-dev DEB_DEPENDS += enchant # for docs
LIBFFI=libffi6 # works on all but 20.04 and debian-testing LIBFFI=libffi6 # works on all but 20.04 and debian-testing
@@ -116,6 +116,7 @@ RPM_DEPENDS += ccache
RPM_DEPENDS += xmlto RPM_DEPENDS += xmlto
RPM_DEPENDS += elfutils-libelf-devel RPM_DEPENDS += elfutils-libelf-devel
RPM_DEPENDS += libnl3-devel RPM_DEPENDS += libnl3-devel
RPM_DEPENDS += enchant # for docs
ifeq ($(OS_ID),fedora) ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils RPM_DEPENDS += dnf-utils

5
docs/Makefile
View File

@@ -21,9 +21,6 @@ PIP_TOOLS_VERSION ?= $(shell grep 'PIP_TOOLS_VERSION=' ${WS_ROOT}/test/Makefile
PYTHON ?= "python3" PYTHON ?= "python3"
DOC_DEB_DEPENDS = enchant
DOC_RPM_DEPENDS = enchant
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = --keep-going -n -W SPHINXOPTS = --keep-going -n -W
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
@@ -94,7 +91,7 @@ docs: clean venv ${BUILDDIR_SRC}
.PHONY: clean .PHONY: clean
clean: clean:
@rm -rf $(BUILDDIR) @rm -rf $(BUILDDIR) ${VENV_DIR}
@make -C ${SCRIPTS_DIR} clean @make -C ${SCRIPTS_DIR} clean
.PHONY: build .PHONY: build

4
test/Makefile
View File

@@ -80,9 +80,9 @@ PYTHON_INTERP=$(PYTHON)
endif endif
PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)') PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.major)')
PIP_VERSION=21.2.4 PIP_VERSION=21.3.1
# Keep in sync with requirements.txt # Keep in sync with requirements.txt
PIP_TOOLS_VERSION=6.2.0 PIP_TOOLS_VERSION=6.4.0
PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages) SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
BUILD_COV_DIR=$(TEST_BR)/coverage BUILD_COV_DIR=$(TEST_BR)/coverage

236
test/requirements-3.txt
View File

File diff suppressed because it is too large Load Diff

4
test/requirements.txt
View File

@@ -1,4 +1,4 @@
pip-tools==6.2.0 # BSD Keep this in sync with Makefile's PIP_TOOLS_VERSION pip-tools==6.4.0 # BSD Keep this in sync with Makefile's PIP_TOOLS_VERSION
cryptography!=2.0 # BSD/Apache-2.0 cryptography!=2.0 # BSD/Apache-2.0
deprecation>=2.0.6 # Apache-2.0 deprecation>=2.0.6 # Apache-2.0
@@ -19,4 +19,4 @@ sphinx-rtd-theme # MIT
noiseprotocol # MIT noiseprotocol # MIT
recommonmark # MIT recommonmark # MIT
pyyaml # MIT pyyaml # MIT
jsonschema # MIT jsonschema # MIT