From 77c7a648b6756bf39e8b1b70c2e8bd0897980304 Mon Sep 17 00:00:00 2001 From: mandyche Date: Tue, 1 Aug 2023 14:38:41 -0400 Subject: [PATCH 1/2] setup --- setup.py | 2 ++ {simuleval/test => test}/test_agent.py | 2 +- {simuleval/test => test}/test_agent_pipeline.py | 2 +- {simuleval/test => test}/test_evaluator.py | 2 +- {simuleval/test => test}/test_remote_evaluation.py | 2 +- {simuleval/test => test}/test_s2s.py | 2 +- {simuleval/test => test}/test_s2t.py | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) rename {simuleval/test => test}/test_agent.py (98%) rename {simuleval/test => test}/test_agent_pipeline.py (98%) rename {simuleval/test => test}/test_evaluator.py (96%) rename {simuleval/test => test}/test_remote_evaluation.py (97%) rename {simuleval/test => test}/test_s2s.py (98%) rename {simuleval/test => test}/test_s2t.py (95%) diff --git a/setup.py b/setup.py index 64aae337..d26b0fe4 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,8 @@ "examples.*", "docs", "docs.*", + "tests", + "tests.*", ] ), ) diff --git a/simuleval/test/test_agent.py b/test/test_agent.py similarity index 98% rename from simuleval/test/test_agent.py rename to test/test_agent.py index d33d7678..d3b63c80 100644 --- a/simuleval/test/test_agent.py +++ b/test/test_agent.py @@ -13,7 +13,7 @@ from simuleval.agents.actions import ReadAction, WriteAction from simuleval.data.segments import TextSegment -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def test_agent(root_path=ROOT_PATH): diff --git a/simuleval/test/test_agent_pipeline.py b/test/test_agent_pipeline.py similarity index 98% rename from simuleval/test/test_agent_pipeline.py rename to test/test_agent_pipeline.py index ef6b3ed9..522552af 100644 --- a/simuleval/test/test_agent_pipeline.py +++ b/test/test_agent_pipeline.py @@ -12,7 +12,7 @@ from simuleval.agents.actions import ReadAction, WriteAction from simuleval.data.segments import TextSegment -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def test_pipeline_cmd(root_path=ROOT_PATH): diff --git a/simuleval/test/test_evaluator.py b/test/test_evaluator.py similarity index 96% rename from simuleval/test/test_evaluator.py rename to test/test_evaluator.py index 5d774de3..fcc28b92 100644 --- a/simuleval/test/test_evaluator.py +++ b/test/test_evaluator.py @@ -10,7 +10,7 @@ import simuleval.cli as cli -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def test_score_only(root_path=ROOT_PATH): diff --git a/simuleval/test/test_remote_evaluation.py b/test/test_remote_evaluation.py similarity index 97% rename from simuleval/test/test_remote_evaluation.py rename to test/test_remote_evaluation.py index a3fbbaa9..6e5b672a 100644 --- a/simuleval/test/test_remote_evaluation.py +++ b/test/test_remote_evaluation.py @@ -13,7 +13,7 @@ import simuleval.cli as cli from simuleval.utils.functional import find_free_port -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def p1(port, root_path): diff --git a/simuleval/test/test_s2s.py b/test/test_s2s.py similarity index 98% rename from simuleval/test/test_s2s.py rename to test/test_s2s.py index 8143269d..438a1865 100644 --- a/simuleval/test/test_s2s.py +++ b/test/test_s2s.py @@ -15,7 +15,7 @@ from simuleval.agents.actions import ReadAction, WriteAction from simuleval.data.segments import SpeechSegment -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def test_s2s(root_path=ROOT_PATH): diff --git a/simuleval/test/test_s2t.py b/test/test_s2t.py similarity index 95% rename from simuleval/test/test_s2t.py rename to test/test_s2t.py index c5e57068..5e465290 100644 --- a/simuleval/test/test_s2t.py +++ b/test/test_s2t.py @@ -13,7 +13,7 @@ from simuleval.agents.actions import ReadAction, WriteAction from simuleval.data.segments import SpeechSegment -ROOT_PATH = Path(__file__).parents[2] +ROOT_PATH = Path(__file__).parents[1] def test_s2t(root_path=ROOT_PATH): From 3aadbe8f90b9d0d1f2f7772fc6a318402b806544 Mon Sep 17 00:00:00 2001 From: mandyche Date: Tue, 1 Aug 2023 14:45:35 -0400 Subject: [PATCH 2/2] edit gitHub actions --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47fbbcc3..5ae98127 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,8 +43,8 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest run: | - pytest simuleval/test/test_agent.py - pytest simuleval/test/test_agent_pipeline.py - pytest simuleval/test/test_evaluator.py - pytest simuleval/test/test_remote_evaluation.py - pytest simuleval/test/test_s2s.py + pytest test/test_agent.py + pytest test/test_agent_pipeline.py + pytest test/test_evaluator.py + pytest test/test_remote_evaluation.py + pytest test/test_s2s.py