From e8a5be9c534a6274c9c3fa3204790340d9a83d8e Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 9 Oct 2024 15:30:24 -0500 Subject: [PATCH 1/2] Rm num_samples & num_reports from summary_format These variables are still available for users who provide a custom summary_format Fixes https://github.com/con/duct/issues/188 --- src/con_duct/__main__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/con_duct/__main__.py b/src/con_duct/__main__.py index 98ca5279..3c0f6dfe 100755 --- a/src/con_duct/__main__.py +++ b/src/con_duct/__main__.py @@ -22,7 +22,7 @@ from typing import IO, Any, Optional, TextIO __version__ = "0.6.0" -__schema_version__ = "0.1.1" +__schema_version__ = "0.2.1" lgr = logging.getLogger("con-duct") @@ -49,8 +49,6 @@ "Memory Average Percentage: {average_pmem!N}%\n" "CPU Peak Usage: {peak_pcpu!N}%\n" "Average CPU Usage: {average_pcpu!N}%\n" - "Samples Collected: {num_samples!X}\n" - "Reports Written: {num_reports!X}\n" ) From a34a0633e999f95ddfe6710e11f123dbd4b1c5bc Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 9 Oct 2024 15:46:51 -0500 Subject: [PATCH 2/2] [DATALAD RUNCMD] Autoupdate readme === Do not change lines below === { "chain": [], "cmd": "./.update-readme-help.py", "exit": 0, "extra_inputs": [], "inputs": [], "outputs": [], "pwd": "." } ^^^ Do not change lines above ^^^ --- README.md | 4 +--- src/con_duct/__main__.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 48493f54..fde80715 100644 --- a/README.md +++ b/README.md @@ -86,9 +86,7 @@ options: Usage (VSZ): {average_vsz!S} Memory Peak Percentage: {peak_pmem!N}% Memory Average Percentage: {average_pmem!N}% CPU Peak Usage: {peak_pcpu!N}% - Average CPU Usage: {average_pcpu!N}% Samples - Collected: {num_samples!X} Reports Written: - {num_reports!X} ) + Average CPU Usage: {average_pcpu!N}% ) --colors Use colors in duct output. (default: False) --clobber Replace log files if they already exist. (default: False) diff --git a/src/con_duct/__main__.py b/src/con_duct/__main__.py index 3c0f6dfe..407fbb3a 100755 --- a/src/con_duct/__main__.py +++ b/src/con_duct/__main__.py @@ -22,7 +22,7 @@ from typing import IO, Any, Optional, TextIO __version__ = "0.6.0" -__schema_version__ = "0.2.1" +__schema_version__ = "0.2.0" lgr = logging.getLogger("con-duct")