Skip to content

Commit 7eb6d40

Browse files
authored
Upgrade alpine base image, and python version (#39)
* Upgrade alpine base image, and python version * Adding Python 3.12 for unit tests * Upgrade versions in Dockerfile.test and remove python 3.9 test support
1 parent a2e10b6 commit 7eb6d40

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: ["3.9", "3.10", "3.11"]
14+
python-version: ["3.10", "3.11", "3.12"]
1515

1616
steps:
1717
- uses: actions/checkout@v4
@@ -27,9 +27,9 @@ jobs:
2727
- name: Lint with ruff
2828
run: |
2929
# stop the build if there are Python syntax errors or undefined names
30-
ruff --select=E9,F63,F7,F82 --target-version=py37 .
30+
ruff check --select=E9,F63,F7,F82 --target-version=py37 .
3131
# default set of ruff rules with GitHub Annotations
32-
ruff --target-version=py37 .
32+
ruff check --target-version=py37 .
3333
- name: Test with pytest
3434
run: |
3535
pytest

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pre-commit 2.20.0
1+
pre-commit 3.7.1

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM alpine:3.19.1
1+
FROM alpine:3.20.1
22

33
LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
4-
LABEL site.local.program.version="1.3.1"
4+
LABEL site.local.program.version="1.3.2"
55

66
RUN apk upgrade --available --no-cache --update \
77
&& apk add --no-cache --update \
8-
python3=3.11.8-r0 \
9-
py3-pip=23.3.1-r0 \
8+
python3=3.12.3-r1 \
9+
py3-pip=24.0-r2 \
1010
# Cleanup APK
1111
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

Dockerfile.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM alpine:3.19.1
1+
FROM alpine:3.20.1
22

33
LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
4-
LABEL site.local.program.version="1.3.1"
4+
LABEL site.local.program.version="1.3.2"
55

66
RUN apk upgrade --available --no-cache --update \
77
&& apk add --no-cache --update \
8-
python3=3.11.8-r0 \
9-
py3-pip=23.3.1-r0 \
8+
python3=3.12.3-r1 \
9+
py3-pip=24.0-r2 \
1010
# Cleanup APK
1111
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
1212

src/app/modbus_server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Author: Michael Oberdorf IT-Consulting
55
Datum: 2020-03-30
66
Last modified by: Michael Oberdorf
7-
Last modified at: 2024-02-27
7+
Last modified at: 2024-07-19
88
*************************************************************************** """
99
import argparse
1010
import json
@@ -25,7 +25,7 @@
2525

2626
# default configuration file path
2727
default_config_file = "/app/modbus_server.json"
28-
VERSION = "1.3.1"
28+
VERSION = "1.3.2"
2929

3030
log = logging.getLogger()
3131

0 commit comments

Comments
 (0)