Skip to content

Commit

Permalink
Merge pull request #18 from pckroon/nx-3
Browse files Browse the repository at this point in the history
Update to networkx 3
  • Loading branch information
pckroon authored Sep 15, 2023
2 parents 23ae993 + 3eb404a commit d884c71
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
py_version: ["3.9"]
py_version: ["3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.9
python-version: 3.11

- name: Install pypa/build
run: >-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
py_version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
py_version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: 3.11
- name: Install dependencies
run: |
pip install --upgrade setuptools pip
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ setup-requires =
pbr
install-requires = # ?? requires-dist?
pbr
networkx ~= 2.0
networkx
# Comes from hypothesis, but is not automatically picked up by
# pip. See pypa/pip#7135 and pypa/pip#988
attrs >= 19.2.0
hypothesis
zip-safe = False
7 changes: 2 additions & 5 deletions tests/test_graph_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ def test_graph_builder(data):
and make sure that graphs that are supposed to be connected are.
"""
graph_types = st.sampled_from([nx.Graph, nx.DiGraph, nx.MultiGraph,
nx.MultiDiGraph, nx.OrderedGraph,
nx.OrderedDiGraph, nx.OrderedMultiGraph,
nx.OrderedMultiDiGraph])
nx.MultiDiGraph])

graph_type = data.draw(graph_types, label='graph type')
node_keys = st.integers()

multigraph = graph_type in [nx.MultiGraph, nx.MultiDiGraph,
nx.OrderedMultiGraph, nx.OrderedMultiDiGraph]
multigraph = graph_type in [nx.MultiGraph, nx.MultiDiGraph]

min_nodes = data.draw(st.integers(min_value=0, max_value=25),
label='min nodes')
Expand Down

0 comments on commit d884c71

Please sign in to comment.