Update test Docker image
* Update base image (which uses a newer python) * Update linters * Update other dependencies
This commit is contained in:
parent
e4bb8a79a4
commit
2253e52ab7
4 changed files with 13 additions and 11 deletions
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
|||
PYTESTS = $(wildcard test/test_*.py)
|
||||
IMAGE = docker.io/yadm/testbed:2022-01-07
|
||||
IMAGE = docker.io/yadm/testbed:2023-07-12
|
||||
OCI = docker
|
||||
|
||||
.PHONY: all
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
FROM ubuntu:18.04
|
||||
FROM ubuntu:23.04
|
||||
MAINTAINER Tim Byrne <sultan@locehilios.com>
|
||||
|
||||
# Shellcheck and esh versions
|
||||
ARG SC_VER=0.8.0
|
||||
ARG ESH_VER=0.3.1
|
||||
ARG SC_VER=0.9.0
|
||||
ARG ESH_VER=0.3.2
|
||||
|
||||
# Install prerequisites and configure UTF-8 locale
|
||||
RUN \
|
||||
|
@ -41,8 +41,8 @@ RUN cd /opt \
|
|||
|
||||
# Upgrade pip3 and install requirements
|
||||
COPY test/requirements.txt /tmp/requirements.txt
|
||||
RUN python3 -m pip install --upgrade pip setuptools \
|
||||
&& python3 -m pip install --upgrade -r /tmp/requirements.txt \
|
||||
RUN python3 -m pip install --break-system-packages --upgrade pip setuptools \
|
||||
&& python3 -m pip install --break-system-packages --upgrade -r /tmp/requirements.txt \
|
||||
&& rm -f /tmp/requirements
|
||||
|
||||
# Install esh
|
||||
|
|
|
@ -43,7 +43,7 @@ def flake8_version():
|
|||
@pytest.fixture(scope='session')
|
||||
def yamllint_version():
|
||||
"""Version of yamllint supported"""
|
||||
return '1.25.0'
|
||||
return '1.30.0'
|
||||
|
||||
|
||||
@pytest.fixture(scope='session')
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
black==23.1.0
|
||||
envtpl
|
||||
flake8==3.8.4
|
||||
flake8==6.0.0
|
||||
isort==5.12.0
|
||||
j2cli
|
||||
pylint==2.6.0
|
||||
pytest==6.2.1
|
||||
yamllint==1.25.0
|
||||
pylint==2.17.0
|
||||
pytest==7.2.2
|
||||
yamllint==1.30.0
|
||||
|
|
Loading…
Reference in a new issue