Skip to content

Upgrade alpine base image, and python version #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand All @@ -27,9 +27,9 @@ jobs:
- name: Lint with ruff
run: |
# stop the build if there are Python syntax errors or undefined names
ruff --select=E9,F63,F7,F82 --target-version=py37 .
ruff check --select=E9,F63,F7,F82 --target-version=py37 .
# default set of ruff rules with GitHub Annotations
ruff --target-version=py37 .
ruff check --target-version=py37 .
- name: Test with pytest
run: |
pytest
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pre-commit 2.20.0
pre-commit 3.7.1
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.19.1
FROM alpine:3.20.1

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

RUN apk upgrade --available --no-cache --update \
&& apk add --no-cache --update \
python3=3.11.8-r0 \
py3-pip=23.3.1-r0 \
python3=3.12.3-r1 \
py3-pip=24.0-r2 \
# Cleanup APK
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.19.1
FROM alpine:3.20.1

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

RUN apk upgrade --available --no-cache --update \
&& apk add --no-cache --update \
python3=3.11.8-r0 \
py3-pip=23.3.1-r0 \
python3=3.12.3-r1 \
py3-pip=24.0-r2 \
# Cleanup APK
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

Expand Down
4 changes: 2 additions & 2 deletions src/app/modbus_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Author: Michael Oberdorf IT-Consulting
Datum: 2020-03-30
Last modified by: Michael Oberdorf
Last modified at: 2024-02-27
Last modified at: 2024-07-19
*************************************************************************** """
import argparse
import json
Expand All @@ -25,7 +25,7 @@

# default configuration file path
default_config_file = "/app/modbus_server.json"
VERSION = "1.3.1"
VERSION = "1.3.2"

log = logging.getLogger()

Expand Down
Loading