Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/OLAnetworkx/networky into…
Browse files Browse the repository at this point in the history
… rmm
  • Loading branch information
oriyalperin committed Jun 11, 2023
2 parents 2546605 + 00109d8 commit 43e3dbb
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 8 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/example.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: example

on: [push]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
base:

runs-on: ${{ matrix.os }}-latest
strategy:
matrix:
os: [ubuntu, macos, windows]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
- name: Setup Python # Set Python version
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

# Install pip and pytest
- name: Install packages
run: |
python -m pip install --upgrade pip
python -m pip install pytest
python -m pip install --upgrade pip wheel setuptools
python -m pip install -r requirements/default.txt
python -m pip install -r requirements/test.txt
python -m pip install .
python -m pip list
- name: Test with pytest
run: pytest --doctest-modules
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Test NetworkY
run: |
pytest --durations=10 --pyargs networky
pytest --durations=10
default:
runs-on: ${{ matrix.os }}-latest
Expand All @@ -53,13 +53,13 @@ jobs:
- name: Test NetworkY
run: |
pytest --doctest-modules --durations=10 --pyargs networky
pytest --doctest-modules --durations=10
- name: Test Dispatching
# Limit this to only a single combination from the matrix
if: ${{ (matrix.os == 'ubuntu') && (matrix.python-version == '3.11') }}
run: |
NETWORKY_GRAPH_CONVERT=nx-loopback pytest --doctest-modules --durations=10 --pyargs networky
NETWORKY_GRAPH_CONVERT=nx-loopback pytest --doctest-modules --durations=10
extra:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- name: Test NetworkY
run: |
pytest --doctest-modules --durations=10 --pyargs networky
pytest --doctest-modules --durations=10
prerelease:
runs-on: ${{ matrix.os }}-latest
Expand All @@ -144,4 +144,4 @@ jobs:
- name: Test NetworkY
run: |
pytest --doctest-modules --durations=10 --pyargs networky
pytest --doctest-modules --durations=10
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
scripts
7 changes: 7 additions & 0 deletions networky/tests/test_example.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import pytest
import networky as nx

class TestExample:
def test_ex(self):
G = nx.Graph()
assert G.is_directed() == False
3 changes: 2 additions & 1 deletion requirements/default.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
networkx >= 3.1
networkx

2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
description='Extended Graph Library on Top of NetworkX',
packages=['networky'],
install_requires= install_requires,
scripts=['scripts/update_nx.py'],

)

0 comments on commit 43e3dbb

Please sign in to comment.