diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index 536e696a..4158ad19 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -12,41 +12,38 @@ jobs: - "3.10" - "3.11" # - "3.12" - igraph: ["igraph", "no-igraph"] steps: # This cancels any such job that is still runnning - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.6.0 - with: - access_token: ${{ github.token }} - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install Linux libraries - run: | - sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \ - libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \ - libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0 graphviz graphviz-dev - - name: Install dependencies - run: | - pip install --upgrade pip - pip install zstandard==0.16.0 - pip install numpy - pip install flybrains --no-deps - pip install git+https://github.com/siavashk/pycpd@master - pip install k3d - pip install pyarrow - - name: Install navis - run: pip install -e .[dev,vispy-pyqt5,pathos,cloudvolume] - - run: pip install python-igraph - if: ${{ matrix.igraph == 'igraph' }} - - name: Report dependency versions - run: pip freeze -r requirements.txt - - name: Test - uses: GabrielBB/xvfb-action@v1 - with: + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.6.0 + with: + access_token: ${{ github.token }} + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install Linux libraries run: | - export NAVIS_HEADLESS=TRUE - pytest --verbose + sudo apt-get install -y libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 \ + libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 \ + libxcb-xinerama0 libxcb-xinput0 libxcb-xfixes0 graphviz graphviz-dev + - name: Install dependencies + run: | + pip install --upgrade pip + pip install zstandard==0.16.0 + pip install numpy + pip install flybrains --no-deps + pip install git+https://github.com/siavashk/pycpd@master + pip install k3d + pip install pyarrow + - name: Install navis + run: pip install -e .[dev,vispy-pyqt5,pathos,cloudvolume] + - name: Report dependency versions + run: pip freeze -r requirements.txt + - name: Test + uses: GabrielBB/xvfb-action@v1 + with: + run: | + export NAVIS_HEADLESS=TRUE + pytest --verbose diff --git a/requirements.txt b/requirements.txt index 40774d48..e05d112e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ h5py>=3.1 matplotlib>=3.6 morphops>=0.1.11 -ncollpyde>=0.18 +ncollpyde>=0.18,<0.20 networkx>=2.4 numpy>=1.16 pandas>=1.0 diff --git a/tests/common.py b/tests/common.py deleted file mode 100644 index 488069b0..00000000 --- a/tests/common.py +++ /dev/null @@ -1,21 +0,0 @@ -import warnings - -try: - import igraph -except ImportError: - igraph = None - warnings.warn('iGraph library not found. Will test only with NetworkX.') - -import navis - - -def with_igraph(func): - def wrapper(*args, **kwargs): - navis.config.use_igraph = False - res1 = func(*args, **kwargs) - if igraph: - navis.config.use_igraph = True - res2 = func(*args, **kwargs) - assert res1 == res2 - return res1 - return wrapper diff --git a/tests/test_neurons.py b/tests/test_neurons.py index c0f6721f..d766974b 100644 --- a/tests/test_neurons.py +++ b/tests/test_neurons.py @@ -4,8 +4,6 @@ import pytest -from .common import with_igraph - def test_deepcopy(): nrn = navis.core.BaseNeuron() @@ -23,7 +21,6 @@ def test_from_swc_multi(swc_source_multi, parallel): assert isinstance(n, navis.NeuronList) -@with_igraph def test_from_gml(): n = navis.example_neurons(n=1, source='gml') assert isinstance(n, navis.TreeNeuron)