pytest: requirements.txt: Resync with the rest of the project
PATCH 1/2 pytest: requirements.txt: Resync with the rest of the project
In order to build the docker container, which contains a download cache of python modules, we need to have our versions be in sync in each requirements file. Update some of the cases where which are older than the rest of the project.
--- test/py/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
test/py/requirements.txt +3 -3
@@ -1,14 +1,14 @@ atomicwrites==1.4.1 attrs==19.3.0 concurrencytest==0.1.2 -coverage==4.5.4 +coverage==6.2 extras==1.0.0 filelock==3.0.12 fixtures==3.0.0 importlib-metadata==0.23 linecache2==1.0.0 more-itertools==7.2.0 -packaging==23.2 +packaging==24.1 pbr==5.4.3 pluggy==0.13.0 py==1.11.0
@@ -20,7 +20,7 @@ pytest==6.2.5 pytest-xdist==2.5.0 python-mimeparse==1.6.0 python-subunit==1.3.0 -requests==2.32.2 +requests==2.32.3 setuptools==70.3.0 six==1.16.0 testtools==2.3.0
Signature · 1 line
2.34.1
PATCH 2/2 Dockerfile: Update to namespace for some labels
Using "MAINTAINER" and "Description" have been replaced with org.opencontainers.image namespace variables.
--- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/docker/Dockerfile +2 -2
@@ -3,8 +3,8 @@ # to build U-Boot and run our test suites. FROM ubuntu:jammy-20240227 -MAINTAINER Tom Rini <[email protected]> -LABEL Description=" This image is for building U-Boot inside a container" +LABEL org.opencontainers.image.authors="Tom Rini <[email protected]>" +LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" # Make sure apt is happy ENV DEBIAN_FRONTEND=noninteractive
Signature · 1 line
2.34.1
Re: [PATCH 2/2] Dockerfile: Update to namespace for some labels
Quoted 8 lines · Tom Rini
Using "MAINTAINER" and "Description" have been replaced with org.opencontainers.image namespace variables.
Signed-off-by Tom Rini <[email protected]>--- tools/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 19 lines
tools/docker/Dockerfile +2
-3@@ -3,8 +3,8 @@ # to build U-Boot and run our test suites. FROM ubuntu:jammy-20240227 -MAINTAINER Tom Rini <[email protected]> -LABEL Description=" This image is for building U-Boot inside a container" +LABEL org.opencontainers.image.authors="Tom Rini <[email protected]>" +LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" # Make sure apt is happy ENV DEBIAN_FRONTEND=noninteractive --2.34.1
Quoted 11 lines · Tom Rini
In order to build the docker container, which contains a download cache of python modules, we need to have our versions be in sync in each requirements file. Update some of the cases where which are older than the rest of the project.
Signed-off-by Tom Rini <[email protected]>--- test/py/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 6 lines · Tom Rini
In order to build the docker container, which contains a download cache of python modules, we need to have our versions be in sync in each requirements file. Update some of the cases where which are older than the rest of the project.
Applied to u-boot/master, thanks!
Signature · 1 line
Tom