From 9ae611153d128a512a2f782abd94812635186b4e Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Mon, 2 Sep 2024 10:27:20 +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 fdbdb96..acca624 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.8 +qgate_graph==1.4.10 coverage>=7 coverage-badge>=1 diff --git a/requirements.txt b/requirements.txt index 977a9e9..36bf21d 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.9 +qgate_graph==1.4.10 From 7b0feaee4e5c214d6e05713e05978fb18850aa51 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Mon, 2 Sep 2024 10:27:40 +0200 Subject: [PATCH 2/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 c64a679..75b43ae 100644 --- a/qgate_perf/version.py +++ b/qgate_perf/version.py @@ -1,3 +1,3 @@ # Store the version here so: -__version__ = '0.4.11' \ No newline at end of file +__version__ = '0.4.12' \ No newline at end of file From d61d3a89356a29b6275a2a6ffbc7956806885bc7 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:25:33 +0200 Subject: [PATCH 3/5] Extend tests --- dev-requirements.txt | 2 +- requirements.txt | 2 +- tests/test_graph.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index acca624..b547ab6 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.10 +qgate_graph==1.4.11 coverage>=7 coverage-badge>=1 diff --git a/requirements.txt b/requirements.txt index 36bf21d..b1d1931 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.10 +qgate_graph==1.4.11 diff --git a/tests/test_graph.py b/tests/test_graph.py index a71f782..8c68e55 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -103,7 +103,7 @@ 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",f"PRF-test_exception2-*-bulk-1x1.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_exception2-*-bulk-1x1.png")) self.assertTrue(len(file) == 1) print(file[0]) @@ -125,11 +125,11 @@ 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",f"PRF-test_random-*-bulk-1x1.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", 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",f"PRF-test_random-*-bulk-1x5.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_random-*-bulk-1x5.png")) self.assertTrue(len(file) == 1) print(file[0]) From faf7ea14ac9978518d4f07e53359e795b1330129 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:51:16 +0200 Subject: [PATCH 4/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 b547ab6..15a5fb5 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.11 +qgate_graph==1.4.12 coverage>=7 coverage-badge>=1 diff --git a/requirements.txt b/requirements.txt index b1d1931..2535ac7 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.11 +qgate_graph==1.4.12 From 959904ae9ee1cd269308cb1b7fb68968789e5ee5 Mon Sep 17 00:00:00 2001 From: jist <95856749+george0st@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:55:29 +0200 Subject: [PATCH 5/5] Repair tests --- tests/test_graph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_graph.py b/tests/test_graph.py index 8c68e55..8728cff 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -67,11 +67,11 @@ def test_graph(self): setup)) generator.create_graph(self.OUTPUT_ADR) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_aus_ger-*-bulk-10x10.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", 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",f"PRF-test_aus_ger-*-bulk-100x10.png")) + file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf", "4 sec", f"PRF-test_aus_ger-*-bulk-100x10.png")) self.assertTrue(len(file) == 1) print(file[0]) @@ -87,7 +87,7 @@ def test_graph_run_exception(self): self.assertFalse(generator.run(1,1, setup)) generator.create_graph(self.OUTPUT_ADR) - file=glob.glob(path.join(self.OUTPUT_ADR, "graph-perf",f"PRF-test_exception-*-bulk-1x1.png")) + 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])