Merge branch 'develop' of https://github.com/lthurner/pandapower into…

… develop
huangjp725 · Mar 21, 2017 · 1e0aaf8 · 1e0aaf8
2 parents 207383c + f48fdb1
commit 1e0aaf8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,6 @@ install:
   # Replace dep1 dep2 ... with your dependencies
   - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy scipy pandas networkx numpydoc numba xlsxwriter xlrd
   - source activate test-environment
-  - conda install numpy=1.11
   - pip install pytest pytest-cov
   - pip install coveralls
   - python setup.py install