Skip to content

Commit

Permalink
Merge pull request #587 from scipp/fix-conda-build-pace-neutrons
Browse files Browse the repository at this point in the history
Skip horace tests if pace_neutrons is not installed
  • Loading branch information
nvaytet authored Dec 12, 2024
2 parents 4d6afb0 + 7e8f25a commit cb602e1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ test:

{# Conda does not allow spaces between package name and version, so remove them #}
{% for package in test_dependencies %}
{% if package != "pace_neutrons" %}
- {% if package == "graphviz" %}python-graphviz{% else %}{{ package|replace(" ", "") }}{% endif %}
{% endif %}
{% endfor %}
# Note that we add tof here because it depends on plopp, and plopp should not be in
# basetest.in because of the nightly dependencies
Expand Down
3 changes: 2 additions & 1 deletion tests/io/sqw/sqw_horace_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from typing import Any

import numpy as np
import pace_neutrons
import pytest
import scipp as sc
from dateutil.parser import parse as parse_datetime
Expand All @@ -25,6 +24,8 @@
SqwLineProj,
)

pace_neutrons = pytest.importorskip("pace_neutrons")


@pytest.fixture(scope="module")
def matlab() -> Any:
Expand Down

0 comments on commit cb602e1

Please sign in to comment.