Skip to content

Commit

Permalink
Remove rpacket_tracking flag from tests workflow (#2746)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
atharva-2001 authored Oct 21, 2024
1 parent 300e565 commit df65feb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
14 changes: 5 additions & 9 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,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*
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,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

0 comments on commit df65feb

Please sign in to comment.