From df65febc83869bf0315c8001a759564c5527b86d Mon Sep 17 00:00:00 2001 From: Atharva Arya <55894364+atharva-2001@users.noreply.github.com> Date: Mon, 21 Oct 2024 20:20:43 +0530 Subject: [PATCH] Remove `rpacket_tracking` flag from tests workflow (#2746) * Remove rpacket flag from tests * Remove marker from tests and pyproject.toml * Run ruff on tests.yml * Run black * Run black on tardis/transport/montecarlo/tests/test_rpacket_tracker.py * Typo fix * see what files are there * Do not exclude hidden files --- .github/workflows/tests.yml | 14 +++++--------- pyproject.toml | 2 -- .../montecarlo/tests/test_rpacket_tracker.py | 2 -- .../visualization/tools/tests/test_rpacket_plot.py | 1 - 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1462329cfa2..157510dedcc 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,17 +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" + run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" - 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 }} --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 }} + name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.os }} include-hidden-files: true path: | .coverage* diff --git a/pyproject.toml b/pyproject.toml index d97071abe55..da196d6c396 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,8 +162,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."""