Archives/TheLocehiliosan_yadm
1
0
Fork 0
mirror of https://github.com/TheLocehiliosan/yadm synced 2024-10-27 20:34:27 +00:00
Code Issues Releases Wiki Activity

Update test Docker image

Browse Source 
* Update base image (which uses a newer python)
* Update linters
* Update other dependencies
This commit is contained in:
Tim Byrne 2023-07-08 14:25:26 -05:00
parent e4bb8a79a4
commit 2253e52ab7
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
PYTESTS = $(wildcard test/test_*.py) PYTESTS = $(wildcard test/test_*.py)
IMAGE = docker.io/yadm/testbed:2022-01-07 IMAGE = docker.io/yadm/testbed:2023-07-12
OCI = docker OCI = docker
.PHONY: all .PHONY: all

10
test/Dockerfile
View File

@ -1,9 +1,9 @@
FROM ubuntu:18.04 FROM ubuntu:23.04
MAINTAINER Tim Byrne <sultan@locehilios.com> MAINTAINER Tim Byrne <sultan@locehilios.com>
# Shellcheck and esh versions # Shellcheck and esh versions
ARG SC_VER=0.8.0 ARG SC_VER=0.9.0
ARG ESH_VER=0.3.1 ARG ESH_VER=0.3.2
# Install prerequisites and configure UTF-8 locale # Install prerequisites and configure UTF-8 locale
RUN \ RUN \
@ -41,8 +41,8 @@ RUN cd /opt \
# Upgrade pip3 and install requirements # Upgrade pip3 and install requirements
COPY test/requirements.txt /tmp/requirements.txt COPY test/requirements.txt /tmp/requirements.txt
RUN python3 -m pip install --upgrade pip setuptools \ RUN python3 -m pip install --break-system-packages --upgrade pip setuptools \
&& python3 -m pip install --upgrade -r /tmp/requirements.txt \ && python3 -m pip install --break-system-packages --upgrade -r /tmp/requirements.txt \
&& rm -f /tmp/requirements && rm -f /tmp/requirements
# Install esh # Install esh

2
test/conftest.py
View File

@ -43,7 +43,7 @@ def flake8_version():
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def yamllint_version(): def yamllint_version():
"""Version of yamllint supported""" """Version of yamllint supported"""
return '1.25.0' return '1.30.0'
@pytest.fixture(scope='session') @pytest.fixture(scope='session')

10
test/requirements.txt
View File

@ -1,6 +1,8 @@
black==23.1.0
envtpl envtpl
flake8==3.8.4 flake8==6.0.0
isort==5.12.0
j2cli j2cli
pylint==2.6.0 pylint==2.17.0
pytest==6.2.1 pytest==7.2.2
yamllint==1.25.0 yamllint==1.30.0