From d544ab70bceaeafb379c18a418ecc7395efa6eb8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Feb 2024 12:25:38 +0100 Subject: [PATCH 1/7] Fix typo in README Signed-off-by: Steffen Vogel --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 238f6f9e8..521b6e80e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ VILLASnode is a client/server application to connect simulation equipment and so - LabView, - and FPGA models -by using protcols such as: +by using protocols such as: - IEEE 802.2 Ethernet / IP / UDP, - ZeroMQ & nanomsg, From 2f15e151b40e51224b24a456de21063d23511347 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Feb 2024 09:35:21 +0100 Subject: [PATCH 2/7] deps: Do now show Git warning about detached HEAD state Signed-off-by: Steffen Vogel --- packaging/deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/deps.sh b/packaging/deps.sh index 44ddebb81..130c96381 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -62,7 +62,7 @@ should_build() { ## Build configuration # Use shallow git clones to speed up downloads -GIT_OPTS+=" --depth=1" +GIT_OPTS+=" --depth=1 --config advice.detachedHead=false" # Install destination PREFIX=${PREFIX:-/usr/local} From 9b3a33f31b45456633a04c0bb94d19add5445f75 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Feb 2024 09:34:41 +0100 Subject: [PATCH 3/7] Remove unused C++20 include which breaks build on C++17 compilers Signed-off-by: Steffen Vogel --- include/villas/nodes/modbus.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/villas/nodes/modbus.hpp b/include/villas/nodes/modbus.hpp index e0f9b61c7..dcee555fc 100644 --- a/include/villas/nodes/modbus.hpp +++ b/include/villas/nodes/modbus.hpp @@ -8,7 +8,6 @@ #pragma once #include -#include #include #include #include From e30e361c3131a5ea5f4567fd652981e6183b55c5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 13 Feb 2024 13:12:50 +0000 Subject: [PATCH 4/7] devcontainer: Do not use unsupported variable substitution Signed-off-by: Steffen Vogel --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7cdc83470..72b2dd9ef 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,7 @@ "image": "registry.git.rwth-aachen.de/acs/public/villas/node/dev-vscode", // Uncomment to build the devcontainer locally // "build": { - // "dockerfile": "${workspaceFolder}/packaging/docker/Dockerfile.fedora", + // "dockerfile": "../packaging/docker/Dockerfile.fedora", // "target": "dev-vscode", // "context": ".." // }, From dd72179a35496743ea4e8257f76347254e407ac1 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 13 Feb 2024 13:13:06 +0000 Subject: [PATCH 5/7] python: Fix formatting Signed-off-by: Steffen Vogel --- python/examples/Shmem_CIGRE_MV.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/examples/Shmem_CIGRE_MV.py b/python/examples/Shmem_CIGRE_MV.py index fc65c551b..3bfe69c91 100644 --- a/python/examples/Shmem_CIGRE_MV.py +++ b/python/examples/Shmem_CIGRE_MV.py @@ -3,6 +3,7 @@ Author: Steffen Vogel SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University SPDX-License-Identifier: Apache-2.0 """ # noqa: E501 + import time from villas.node.node import Node as VILLASnode From b4fcd0c5664da7738553520b5c9463df9ab3359b Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 13 Feb 2024 13:13:21 +0000 Subject: [PATCH 6/7] decvontainer: Fix formatting Signed-off-by: Steffen Vogel --- .devcontainer/devcontainer.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 72b2dd9ef..215a9e07b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,8 +13,11 @@ // "context": ".." // }, "remoteUser": "villas", - "runArgs": [ "--privileged", "--security-opt", "seccomp=unconfined"], - + "runArgs": [ + "--privileged", + "--security-opt", + "seccomp=unconfined" + ], "customizations": { "vscode": { "extensions": [ From 0be29ffcab87f3184b77d9ca41b89dae2ae730a2 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 13 Feb 2024 13:14:39 +0000 Subject: [PATCH 7/7] python: Pin dependencies Signed-off-by: Steffen Vogel --- python/pyproject.toml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 65f4edc34..24c78d910 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -20,13 +20,16 @@ classifiers = [ 'Operating System :: POSIX :: Linux', 'Programming Language :: Python :: 3', ] -dependencies = ['linuxfd', 'requests'] +dependencies = [ + 'linuxfd==1.5', + 'requests==2.31.0', +] optional-dependencies.dev = [ - 'black', - 'flake8', - 'mypy', - 'pytest', - 'types-requests', + 'black==24.2.0', + 'flake8==7.0.0', + 'mypy==1.8.0', + 'pytest==8.0.0', + 'types-requests==2.31.0.20240125', ] [project.urls]