From ed60879cb874c4edb5ee9f869246f95424e05fbf Mon Sep 17 00:00:00 2001 From: Peter Kroon Date: Fri, 15 Sep 2023 14:34:09 +0200 Subject: [PATCH 1/3] Update requirement to networkx 3 --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 06994c2..e2f2394 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From 9dac6c278138ce1fd6a33b340b1538f244ca2bd8 Mon Sep 17 00:00:00 2001 From: Peter Kroon Date: Fri, 15 Sep 2023 14:34:29 +0200 Subject: [PATCH 2/3] Remove references to OrderedGraph types --- tests/test_graph_builder.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/test_graph_builder.py b/tests/test_graph_builder.py index d1cf913..9fd1b0c 100644 --- a/tests/test_graph_builder.py +++ b/tests/test_graph_builder.py @@ -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') From 3eb404a8d61a9f88535b594981c6e154b73aa0b6 Mon Sep 17 00:00:00 2001 From: Peter Kroon Date: Fri, 15 Sep 2023 14:38:16 +0200 Subject: [PATCH 3/3] Update CI python versions --- .github/workflows/deploy.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index f372c4a..4c5a4ce 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - py_version: ["3.9"] + py_version: ["3.11"] steps: - uses: actions/checkout@v2 @@ -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: >- diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d5a7e31..cde6b3d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 @@ -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