From 21cd9dcf7da889ab604611ae04e9f818cbb6b084 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:50:32 +0200 Subject: [PATCH 1/5] Bump qgate-graph --- dev-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 15a5fb5..c1b31ba 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -9,7 +9,7 @@ contourpy>=1.0.0,<=1.3.0 psutil>=5.9.0,<=6.0.0 packaging>=21.0 -qgate_graph==1.4.12 +qgate_graph==1.4.13 coverage>=7 coverage-badge>=1 diff --git a/requirements.txt b/requirements.txt index 2535ac7..1b48470 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ contourpy>=1.0.0,<=1.3.0 psutil>=5.9.0,<=6.0.0 packaging>=21.0 -qgate_graph==1.4.12 +qgate_graph==1.4.13 From 4f382951bb13f4c62acc384920d2039f69632c94 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:16:23 +0200 Subject: [PATCH 2/5] Update test_graph.py --- tests/test_graph.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/test_graph.py b/tests/test_graph.py index 8728cff..fd8c7ee 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -1,3 +1,4 @@ +import datetime import glob import unittest from qgate_perf.parallel_executor import ParallelExecutor @@ -67,11 +68,12 @@ def test_graph(self): setup)) generator.create_graph(self.OUTPUT_ADR) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_aus_ger-*-bulk-10x10.png")) + today = datetime.datetime.now().strftime("%Y-%m-%d") + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_aus_ger-*-bulk-10x10.png")) self.assertTrue(len(file) == 1) print(file[0]) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_aus_ger-*-bulk-100x10.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_aus_ger-*-bulk-100x10.png")) self.assertTrue(len(file) == 1) print(file[0]) @@ -87,6 +89,7 @@ def test_graph_run_exception(self): self.assertFalse(generator.run(1,1, setup)) generator.create_graph(self.OUTPUT_ADR) + today = datetime.datetime.now().strftime("%Y-%m-%d") file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception-*-bulk-1x1.png")) self.assertTrue(len(file) == 1) print(file[0]) From 7c70e37f0cb704ced099315a1c9901c6e1fa1045 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:17:29 +0200 Subject: [PATCH 3/5] Update test_graph.py --- tests/test_graph.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_graph.py b/tests/test_graph.py index fd8c7ee..c5422ad 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -90,7 +90,7 @@ def test_graph_run_exception(self): generator.create_graph(self.OUTPUT_ADR) today = datetime.datetime.now().strftime("%Y-%m-%d") - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception-*-bulk-1x1.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_exception-*-bulk-1x1.png")) self.assertTrue(len(file) == 1) print(file[0]) @@ -106,7 +106,8 @@ def test_graph_runexecutor_exception(self): self.assertFalse(generator.run_executor([[2,2]], setup)) generator.create_graph(self.OUTPUT_ADR) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception2-*-bulk-1x1.png")) + today = datetime.datetime.now().strftime("%Y-%m-%d") + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_exception2-*-bulk-1x1.png")) self.assertTrue(len(file) == 1) print(file[0]) @@ -128,7 +129,8 @@ def test_graph_runbulkexecutor_exception_random(self): generator.create_graph(self.OUTPUT_ADR) # check relevant files - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_random-*-bulk-1x1.png")) + today = datetime.datetime.now().strftime("%Y-%m-%d") + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_random-*-bulk-1x1.png")) self.assertTrue(len(file)==1) print(file[0]) From 7d007983c3f8dc1169d6cd2410cf0aff7604f283 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:19:49 +0200 Subject: [PATCH 4/5] Update test_graph.py --- tests/test_graph.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_graph.py b/tests/test_graph.py index c5422ad..422f439 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -128,13 +128,14 @@ def test_graph_runbulkexecutor_exception_random(self): generator.run_bulk_executor([[1,1], [1,5]], [[4,4],[8,4],[16,4]], setup) generator.create_graph(self.OUTPUT_ADR) - # check relevant files today = datetime.datetime.now().strftime("%Y-%m-%d") + + # check relevant files file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_random-*-bulk-1x1.png")) self.assertTrue(len(file)==1) print(file[0]) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_random-*-bulk-1x5.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", today, f"PRF-test_random-*-bulk-1x5.png")) self.assertTrue(len(file) == 1) print(file[0]) From 9c4ab118cd2ea4bf56f813956884c9c4f86f9cc2 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:20:08 +0200 Subject: [PATCH 5/5] Update version.py --- qgate_perf/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgate_perf/version.py b/qgate_perf/version.py index 75b43ae..78e30fd 100644 --- a/qgate_perf/version.py +++ b/qgate_perf/version.py @@ -1,3 +1,3 @@ # Store the version here so: -__version__ = '0.4.12' \ No newline at end of file +__version__ = '0.4.13' \ No newline at end of file