Merge remote-tracking branch 'LoLab-VU/bngconsole'

Manual conflict resolution of #169: New BioNetGen interfaces for console and file based access Conflicts: pysb/tests/test_bng.py
pysb · Nov 3, 2015 · 0c011cf · 0c011cf
2 parents abaaa1b + c0ae7b7
commit 0c011cf
Show file tree

Hide file tree

Showing 5 changed files with 363 additions and 120 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
 - export PATH=/home/travis/miniconda/bin:$PATH
 - conda update --yes conda
 - conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib sympy networkx
-  nose h5py
+  nose h5py pexpect
 - pip install -i https://pypi.binstar.org/pypi/simple pygraphviz==1.3rc1
 - pip install python-coveralls
 - wget "http://www.csb.pitt.edu/Faculty/Faeder/?smd_process_download=1&download_id=142"