From 35836b8b59e41a1d633174dd4e84ba271b77d04c Mon Sep 17 00:00:00 2001 From: Chris P Date: Sat, 3 Jun 2017 22:31:11 +0200 Subject: [PATCH] Bump version to 2.6.0 - Penetrating Pineapple --- .version | 2 +- CHANGELOG.md | 2 +- tests/test_speed/benchmark.py | 14 +++++++++++++- tests/test_speed/plot_benchmark.py | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.version b/.version index 402fd6f9..61f64435 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.5.0 Penetrating Pineapple +2.6.0 Penetrating Pineapple diff --git a/CHANGELOG.md b/CHANGELOG.md index a365baec..f6c2bcee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format follows [keepachangelog.com]. Please stick to it. -## [2.5.0 Penetrating Pineapple] -- [unreleased] +## [2.6.0 Penetrating Pineapple] -- 2017-06-03 ### Fixed diff --git a/tests/test_speed/benchmark.py b/tests/test_speed/benchmark.py index bf586795..b468e65e 100644 --- a/tests/test_speed/benchmark.py +++ b/tests/test_speed/benchmark.py @@ -291,6 +291,17 @@ def get_benchid(self): return 'rmlint-v2.2.2' +class Rmlint246(Rmlint): + script = 'rmlint-v2.4.6.sh' + + def get_binary(self): + return 'rmlint/rmlint-v2.4.6' + + def get_benchid(self): + return 'rmlint-v2.4.6' + + + class Rmlint222Paranoid(Rmlint222): def get_options(self, paths): return '-pp ' + Rmlint222.get_options(self, paths) @@ -669,6 +680,7 @@ def main(): # RmlintSpot(), # RmlintSpotParanoid(), Rmlint222(), + Rmlint246(), Rmlint222Paranoid(), RmlintXXHash(), # RmlintSpooky(), @@ -681,7 +693,7 @@ def main(): # Actual competitors: Fdupes(), Rdfind(), - Dupd() + # Dupd() ] # Filter the `programs` list if necessary. diff --git a/tests/test_speed/plot_benchmark.py b/tests/test_speed/plot_benchmark.py index a46f737c..a7760db5 100644 --- a/tests/test_speed/plot_benchmark.py +++ b/tests/test_speed/plot_benchmark.py @@ -53,6 +53,9 @@ def unpack(chart, data, bench_name, add_x_labels=True): for program in sorted(data['programs']): result = data['programs'][program] + if len(result["numbers"]) < n_runs: + continue + points = [] for key in [str(run + 1) for run in range(n_runs)] + ['average']: points.append(result['numbers'][key])