Skip to content

Commit e1d90aa

Browse files
committed
Use latest networkx release, not dev version
1 parent 6fba6cc commit e1d90aa

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ jobs:
4949
- name: Install dependencies
5050
run: |
5151
$(command -v mamba || command -v conda) install python-suitesparse-graphblas scipy pandas donfig pyyaml numpy python-graphblas \
52-
pytest-cov pytest-randomly pytest-mpl
52+
pytest-cov pytest-randomly pytest-mpl networkx
5353
# matplotlib lxml pygraphviz pydot sympy # Extra networkx deps we don't need yet
54-
pip install git+https://github.com/networkx/networkx.git@main --no-deps
54+
# Sometimes we prefer to use the latest release of NetworkX or the latest development from github
55+
# pip install git+https://github.com/networkx/networkx.git@main --no-deps
5556
pip install -e . --no-deps
5657
- name: PyTest
5758
run: |

graphblas_algorithms/interface.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -281,31 +281,31 @@ def key(testpath):
281281
return (testname, frozenset({filename}))
282282

283283
# Reasons to skip tests
284-
multi_attributed = "unable to handle multi-attributed graphs"
284+
# multi_attributed = "unable to handle multi-attributed graphs"
285285
multidigraph = "unable to handle MultiDiGraph"
286286
multigraph = "unable to handle MultiGraph"
287287

288288
# Which tests to skip
289289
skip = {
290-
key("test_mst.py:TestBoruvka.test_attributes"): multi_attributed,
291-
key("test_mst.py:TestBoruvka.test_weight_attribute"): multi_attributed,
290+
# key("test_mst.py:TestBoruvka.test_attributes"): multi_attributed,
291+
# key("test_mst.py:TestBoruvka.test_weight_attribute"): multi_attributed,
292292
key("test_dense.py:TestFloyd.test_zero_weight"): multidigraph,
293293
key("test_dense_numpy.py:test_zero_weight"): multidigraph,
294294
key("test_weighted.py:TestBellmanFordAndGoldbergRadzik.test_multigraph"): multigraph,
295-
key("test_binary.py:test_compose_multigraph"): multigraph,
296-
key("test_binary.py:test_difference_multigraph_attributes"): multigraph,
297-
key("test_binary.py:test_disjoint_union_multigraph"): multigraph,
298-
key("test_binary.py:test_full_join_multigraph"): multigraph,
299-
key("test_binary.py:test_intersection_multigraph_attributes"): multigraph,
300-
key(
301-
"test_binary.py:test_intersection_multigraph_attributes_node_set_different"
302-
): multigraph,
303-
key("test_binary.py:test_symmetric_difference_multigraph"): multigraph,
304-
key("test_binary.py:test_union_attributes"): multi_attributed,
295+
# key("test_binary.py:test_compose_multigraph"): multigraph,
296+
# key("test_binary.py:test_difference_multigraph_attributes"): multigraph,
297+
# key("test_binary.py:test_disjoint_union_multigraph"): multigraph,
298+
# key("test_binary.py:test_full_join_multigraph"): multigraph,
299+
# key("test_binary.py:test_intersection_multigraph_attributes"): multigraph,
300+
# key(
301+
# "test_binary.py:test_intersection_multigraph_attributes_node_set_different"
302+
# ): multigraph,
303+
# key("test_binary.py:test_symmetric_difference_multigraph"): multigraph,
304+
# key("test_binary.py:test_union_attributes"): multi_attributed,
305305
# TODO: move failing assertion from `test_union_and_compose`
306-
key("test_binary.py:test_union_and_compose"): multi_attributed,
307-
key("test_binary.py:test_union_multigraph"): multigraph,
308-
key("test_vf2pp.py:test_custom_multigraph4_different_labels"): multigraph,
306+
# key("test_binary.py:test_union_and_compose"): multi_attributed,
307+
# key("test_binary.py:test_union_multigraph"): multigraph,
308+
# key("test_vf2pp.py:test_custom_multigraph4_different_labels"): multigraph,
309309
}
310310
for item in items:
311311
kset = set(item.keywords)

0 commit comments

Comments
 (0)