Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove rpacket_tracking flag from tests workflow #2746

Merged
merged 8 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
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 }}
include-hidden-files: true
name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.os }}
path: |
.coverage*
!.coveragerc
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ text_file_format = "rst"
markers = [
# continuum tests
"continuum",
# rpacket tracking tests
"rpacket_tracking"
]

[tool.tardis]
Expand Down
2 changes: 0 additions & 2 deletions tardis/transport/montecarlo/tests/test_rpacket_tracker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion tardis/visualization/tools/tests/test_rpacket_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from tardis.visualization import RPacketPlotter


@pytest.mark.rpacket_tracking
class TestRPacketPlotter:
"""Test the RPacketPlotter class."""

Expand Down
Loading