From d7d4d4e3c191c612695e963162d51c24a4070100 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Fri, 26 Jul 2024 16:20:06 +0530 Subject: [PATCH 1/8] Remove rpacket flag from tests --- .github/workflows/tests.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1462329cfa2..fbee8f3a775 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,18 +39,14 @@ concurrency: jobs: tests: - name: ${{ matrix.continuum }} continuum ${{ matrix.rpacket_tracking }} rpacket_tracking ${{ matrix.os }} ${{ inputs.pip_git && 'pip tests enabled' || '' }} + name: ${{ matrix.continuum }} continuum ${{ matrix.os }} ${{ inputs.pip_git && 'pip tests enabled' || '' }} if: github.repository_owner == 'tardis-sn' runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: label: [osx-arm64, linux-64] - continuum: ["not", ""] - rpacket_tracking: ["not", ""] - exclude: - - continuum: "" - rpacket_tracking: "" + continuum: ['not', ''] include: - label: osx-arm64 os: macos-latest @@ -86,18 +82,17 @@ jobs: pip install qgridnext - name: Run tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" - - - name: Regression Data Generation tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" + run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" + + - name: Refdata Generation tests + run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum" if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' - run: mv .coverage .coverage.${{ strategy.job-index }} - uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.rpacket_tracking }}-rpacket_tracking-${{ matrix.os }} - include-hidden-files: true + name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.os }} path: | .coverage* !.coveragerc From 7cb315437eae89d173787acef2246da1e9b93b7e Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Mon, 2 Sep 2024 12:27:14 +0530 Subject: [PATCH 2/8] Remove marker from tests and pyproject.toml --- pyproject.toml | 2 -- tardis/transport/montecarlo/tests/test_rpacket_tracker.py | 2 -- tardis/visualization/tools/tests/test_rpacket_plot.py | 1 - 3 files changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f6fafb230b..f4ec691e438 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -187,8 +187,6 @@ text_file_format = "rst" markers = [ # continuum tests "continuum", - # rpacket tracking tests - "rpacket_tracking" ] [tool.tardis] diff --git a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py index 57d42bfc897..971183d2360 100644 --- a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py +++ b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py @@ -8,8 +8,6 @@ ) from tardis.transport.montecarlo.r_packet import InteractionType -pytestmark = pytest.mark.rpacket_tracking - @pytest.fixture() def interaction_type_last_interaction_class( diff --git a/tardis/visualization/tools/tests/test_rpacket_plot.py b/tardis/visualization/tools/tests/test_rpacket_plot.py index 7b7a48367bf..17ff2f17738 100755 --- a/tardis/visualization/tools/tests/test_rpacket_plot.py +++ b/tardis/visualization/tools/tests/test_rpacket_plot.py @@ -8,7 +8,6 @@ from tardis.visualization import RPacketPlotter -@pytest.mark.rpacket_tracking class TestRPacketPlotter: """Test the RPacketPlotter class.""" From 04e1845c7e6ff0d2f6057be48ade69db37144f8e Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Mon, 2 Sep 2024 12:28:32 +0530 Subject: [PATCH 3/8] Run ruff on tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fbee8f3a775..a36ae881976 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,10 +82,10 @@ jobs: pip install qgridnext - name: Run tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" - + run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" + - name: Refdata Generation tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum" + run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum" if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' - run: mv .coverage .coverage.${{ strategy.job-index }} From 74fbab9c70a675368730addfc7d6ba6c8fe6b204 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Wed, 4 Sep 2024 16:31:45 +0530 Subject: [PATCH 4/8] Run black --- tardis/transport/montecarlo/tests/test_rpacket_tracker.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py index 971183d2360..7db9cfd1613 100644 --- a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py +++ b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py @@ -8,7 +8,6 @@ ) from tardis.transport.montecarlo.r_packet import InteractionType - @pytest.fixture() def interaction_type_last_interaction_class( simulation_rpacket_tracking, From 62c206ebfcf8e122750102c806cb50e2813221d1 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Mon, 30 Sep 2024 17:33:29 +0530 Subject: [PATCH 5/8] Run black on tardis/transport/montecarlo/tests/test_rpacket_tracker.py --- tardis/transport/montecarlo/tests/test_rpacket_tracker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py index 7db9cfd1613..971183d2360 100644 --- a/tardis/transport/montecarlo/tests/test_rpacket_tracker.py +++ b/tardis/transport/montecarlo/tests/test_rpacket_tracker.py @@ -8,6 +8,7 @@ ) from tardis.transport.montecarlo.r_packet import InteractionType + @pytest.fixture() def interaction_type_last_interaction_class( simulation_rpacket_tracking, From bd7fde36e19451ca43eb010df1acf4458599d1ad Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Mon, 30 Sep 2024 17:46:11 +0530 Subject: [PATCH 6/8] Typo fix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a36ae881976..c448eaff77d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -84,7 +84,7 @@ jobs: - name: Run tests run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" - - name: Refdata Generation tests + - name: Regression Data Generation tests run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum" if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' From 9a5769c274f0391d2e002176aa7770036e50b427 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Wed, 16 Oct 2024 17:04:20 +0530 Subject: [PATCH 7/8] see what files are there --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c448eaff77d..eaa79c6e748 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -107,6 +107,8 @@ jobs: uses: ./.github/actions/setup_env with: os-label: linux-64 + + - run: ls -la # will download all artifacts(in this case all are coverage reports) - uses: actions/download-artifact@v4 From 0ec46084cb4f91f769e310e07dba1efbdeaea027 Mon Sep 17 00:00:00 2001 From: Atharva Arya Date: Wed, 16 Oct 2024 17:56:09 +0530 Subject: [PATCH 8/8] Do not exclude hidden files --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eaa79c6e748..157510dedcc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,6 +93,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.os }} + include-hidden-files: true path: | .coverage* !.coveragerc @@ -107,8 +108,6 @@ jobs: uses: ./.github/actions/setup_env with: os-label: linux-64 - - - run: ls -la # will download all artifacts(in this case all are coverage reports) - uses: actions/download-artifact@v4