Skip to content

Commit 9db9883

Browse files
committed
Remove test skipping
1 parent e1d2cca commit 9db9883

5 files changed

Lines changed: 3 additions & 22 deletions

File tree

.github/workflows/tests.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,6 @@ jobs:
126126
python -m pytest -x --cov=tskit --cov-report=xml --cov-branch -n2 --durations=20 tests
127127
fi
128128
129-
# - name: Run numba tests
130-
# working-directory: python
131-
# run: |
132-
# source ~/.profile
133-
# conda activate anaconda-client-env
134-
# python -m pytest -x --only-numba-tests --cov=tskit.numba --cov-report=xml --cov-branch -n2 --durations=20 tests
135-
136129
- name: Upload coverage to Codecov
137130
uses: codecov/codecov-action@v5.4.0
138131
with:

python/requirements/CI-complete/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ lshmm==0.0.8
66
msgpack==1.1.0
77
msprime==1.3.3
88
networkx==3.2.1
9+
numba==0.61.2
910
portion==2.6.0
1011
pytest==8.3.5
1112
pytest-cov==6.0.0

python/requirements/CI-tests-pip/requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ networkx==3.2.1
1111
msgpack==1.1.0
1212
newick==1.10.0
1313
kastore==0.3.3
14-
jsonschema==4.23.0
14+
jsonschema==4.23.0
15+
numba==0.61.2

python/tests/conftest.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,6 @@ def pytest_collection_modifyitems(config, items):
8686
for item in items:
8787
if "slow" in item.keywords:
8888
item.add_marker(skip_slow)
89-
# if config.getoption("--only-numba-tests"):
90-
# only_numba = pytest.mark.skip(reason="--only-numba-tests specified")
91-
# for item in items:
92-
# if "numba" not in item.keywords:
93-
# item.add_marker(only_numba)
94-
else:
95-
numba_tests_skipped = pytest.mark.skip(
96-
reason="--only-numba-tests not specified, skipping numba tests"
97-
)
98-
for item in items:
99-
if "numba" in item.keywords:
100-
item.add_marker(numba_tests_skipped)
10189

10290

10391
@fixture

python/tests/test_jit.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def test_numba_import_error():
1717
import tskit.jit.numba # noqa: F401
1818

1919

20-
@pytest.mark.numba
2120
@pytest.mark.parametrize("ts", tsutil.get_example_tree_sequences())
2221
def test_correct_trees_forward(ts):
2322
import tskit.jit.numba as jit_numba
@@ -39,7 +38,6 @@ def test_correct_trees_forward(ts):
3938
assert edge.id == out_index[edge_out_index]
4039

4140

42-
@pytest.mark.numba
4341
def test_using_from_jit_function():
4442
"""
4543
Test that we can use the numba jit function from the tskit.jit module.

0 commit comments

Comments
 (0)