You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2026/01/22 15:17:17 UTC
(nifi-minifi-cpp) 02/04: MINIFICPP-2697 Upgrade m2crypto
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit e53db5388c90c66c0631009240802b05c1ac48ac
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Thu Jan 22 15:31:43 2026 +0100
MINIFICPP-2697 Upgrade m2crypto
Upgrade m2crypto to the latest version, to make the tests work with Python 3.13.
Plus, some minor improvements to the help string of the test runner scripts.
Closes #2080
Signed-off-by: Marton Szasz <sz...@apache.org>
---
behave_framework/pyproject.toml | 2 +-
docker/DockerVerify.sh | 8 ++++----
docker/RunBehaveTests.sh | 8 ++++----
docker/requirements.txt | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/behave_framework/pyproject.toml b/behave_framework/pyproject.toml
index f5d2c3174..263750d9f 100644
--- a/behave_framework/pyproject.toml
+++ b/behave_framework/pyproject.toml
@@ -8,7 +8,7 @@ dependencies = [
"docker==7.1.0",
"PyYAML==6.0.3",
"humanfriendly==10.0",
- "m2crypto==0.41.0",
+ "m2crypto==0.46.2",
"pyopenssl==25.0.0",
"pyjks==20.0.0"
]
diff --git a/docker/DockerVerify.sh b/docker/DockerVerify.sh
index de2c91aba..52b68f31f 100755
--- a/docker/DockerVerify.sh
+++ b/docker/DockerVerify.sh
@@ -35,10 +35,10 @@ print_help()
printf '%s\n' "Runs the provided behave tests in a containerized environment"
printf 'Usage: %s [--image-tag-prefix <arg>] [-h|--help] <minifi_version> <feature_path-1> [<feature_path-2>] ... [<feature_path-n>] ...\n' "$0"
printf '\t%s\n' "<minifi_version>: the version of minifi"
- printf '\t%s\n' "<tags_to_run>: include these tags"
- printf '\t%s\n' "--tags_to_exclude: optional tags that should be skipped (no default)"
- printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (no default)"
- printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously. (default: 3)"
+ printf '\t%s\n' "<tags_to_run>: comma-separated list of tags to include, e.g: CORE,ENABLE_KAFKA,ENABLE_SPLUNK"
+ printf '\t%s\n' "--tags_to_exclude: optional comma-separated list of tags that should be skipped (default: none)"
+ printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (default: none)"
+ printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously (default: 3)"
printf '\t%s\n' "--fips: enables FIPS mode by default"
printf '\t%s\n' "-h, --help: Prints help"
}
diff --git a/docker/RunBehaveTests.sh b/docker/RunBehaveTests.sh
index 32a7d7a68..b48bbf60c 100755
--- a/docker/RunBehaveTests.sh
+++ b/docker/RunBehaveTests.sh
@@ -35,10 +35,10 @@ print_help()
printf '%s\n' "Runs the provided behave tests in a containerized environment"
printf 'Usage: %s [--image-tag-prefix <arg>] [-h|--help] <minifi_version> <tags_to_run> ...\n' "$0"
printf '\t%s\n' "<minifi_version>: the version of minifi"
- printf '\t%s\n' "<tags_to_run>: include these tags"
- printf '\t%s\n' "--tags_to_exclude: optional tags that should be skipped (no default)"
- printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (no default)"
- printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously. (default: 3)"
+ printf '\t%s\n' "<tags_to_run>: comma-separated list of tags to include, e.g: CORE,ENABLE_KAFKA,ENABLE_SPLUNK"
+ printf '\t%s\n' "--tags_to_exclude: optional comma-separated list of tags that should be skipped (default: none)"
+ printf '\t%s\n' "--image-tag-prefix: optional prefix to the docker tag (default: none)"
+ printf '\t%s\n' "--parallel_processes: optional argument that specifies the number of parallel processes that can be executed simultaneously (default: 3)"
printf '\t%s\n' "--fips: enables FIPS mode by default"
printf '\t%s\n' "-h, --help: Prints help"
}
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 77c4c2fdc..a50c768a0 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -3,7 +3,7 @@ shortuuid==1.0.13
behavex==4.1.0
docker==7.1.0
PyYAML==6.0.2
-m2crypto==0.41.0
+m2crypto==0.46.2
watchdog==6.0.0
pyopenssl==25.0.0
azure-storage-blob==12.24.1