Skip to content

Commit

Permalink
test installing matplotlib with apt-get
Browse files Browse the repository at this point in the history
  • Loading branch information
Silmathoron committed Mar 26, 2016
1 parent ad690b4 commit 85f921c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ before_install:
- sudo python get-pip.py
- sudo pip install -U setuptools
# test scipy from apt (much faster) and install matplotlib
- if [[ "$PYVERSION" == "2.7" ]]; then sudo apt-get install -y python-scipy && pip install --user cython==0.23.4; fi
- if [[ "$PYVERSION" == "3.x" ]]; then sudo apt-get install -y python3-scipy python3-pip python3-matplotlib cython3; else sudo pip install -U matplotlib && pip install --user cython==0.23.4; fi
- if [[ "$PYVERSION" == "2.7" ]]; then sudo apt-get install -y python-scipy python-matplotlib && pip install --user cython==0.23.4; fi
- if [[ "$PYVERSION" == "3.x" ]]; then sudo apt-get install -y python3-scipy python3-pip python3-matplotlib cython3; else pip install --user cython==0.23.4; fi
# MPI
- sudo apt-get install -y openmpi-bin libopenmpi-dev
# install graph-tool and igraph
Expand Down
4 changes: 2 additions & 2 deletions src/nngt/plot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
# module import

from .custom_plt import palette
#~ from .plt_properties import degree_distribution, betweenness_distribution
#~ from .plt_activity import spike_raster
from .plt_properties import degree_distribution, betweenness_distribution
from .plt_activity import spike_raster

__all__ = [ "degree_distribution", "betweenness_distribution", 'spike_raster' ]

Expand Down

0 comments on commit 85f921c

Please sign in to comment.