Skip to content

Commit

Permalink
Merge pull request #3 from dschult/gh_test_action
Browse files Browse the repository at this point in the history
Add basic test.yaml based on graphblas-algorithms
  • Loading branch information
dschult authored Jun 28, 2023
2 parents 59d4024 + 9337477 commit 8f114c0
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 1 deletion.
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Tests

on:
pull_request:
push:
branches: [ main ]

jobs:
test:
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -l {0}
strategy:
fail-fast: true
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.10", "3.11"]
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Conda
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
channels: conda-forge
activate-environment: testing
- name: Install dependencies
run: |
conda install -c conda-forge joblib scipy pandas pytest-cov pytest-randomly
# matplotlib lxml pygraphviz pydot sympy # Extra networkx deps we don't need yet
pip install git+https://github.com/networkx/networkx.git@main --no-deps
pip install -e . --no-deps
echo "Done with installing"
- name: PyTest
run: |
NETWORKX_GRAPH_CONVERT=parallel pytest --pyargs networkx
2 changes: 1 addition & 1 deletion nx_parallel/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def convert_from_nx(incoming_graph, weight=None, *, name=None):
def convert_to_nx(obj, *, name=None):
from .graph import ParallelGraph

if isinstance(obj, Graph):
if isinstance(obj, ParallelGraph):
obj = obj.to_networkx()
return obj

Expand Down

0 comments on commit 8f114c0

Please sign in to comment.