Fix skimage

.travis.yml

@@ -28,7 +28,7 @@ install:
   - conda uninstall -y pymatgen
 
   - if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then conda install mock; fi
-  - pip install nose nose-exclude
+  #- pip install nose nose-exclude
   #- pip install graphviz
 
   # Mayavi (optional requirement)
@@ -57,7 +57,7 @@ before_script:
     - sleep 3 # give xvfb some time to start
     # https://github.com/travis-ci/travis-ci/issues/6307
     - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then rvm get head; fi 
-    - rm abipy/gui/__init__.py 
+    #- rm abipy/gui/__init__.py 
 
 # command to run tests
 script: ./dev_scripts/runtests.sh

abipy/electrons/ebands.py

@@ -3711,9 +3711,9 @@ class Bands3D(Has_Structure):
                 "Please install with it with `conda install scikit-image` or `pip install scikit-image`")
 
         try:
-            from skimage.measure import marching_cubes_lewiner
+            from skimage.measure import marching_cubes_lewiner as marching_cubes
         except ImportError:
-            from skimage.measure import marching_cubes as marching_cubes_lewiner
+            from skimage.measure import marching_cubes
 
         e0 = self.get_e0(e0)
         isobands = self.get_isobands(e0)

dev_scripts/conda_get.sh

@@ -21,7 +21,7 @@ export PATH="${HOME}/miniconda/bin:${PATH}"
 
 hash -r
 
-conda config --set always_yes yes --set changeps1 no
+conda config --set always_yes yes --set changeps1 yes
 conda update -q conda
 # Useful for debugging any issues with conda
 conda info -a

dev_scripts/runtests.sh

@@ -12,11 +12,11 @@ abicheck.py --with-flow
 
 # Run unit tests with pytest. No doctests if 2.7
 if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then 
-    pytest -n 2 --cov-config=.coveragerc --cov=abipy -v abipy \
+    pytest -n 1 --cov-config=.coveragerc --cov=abipy -v abipy \
 	--ignore=abipy/integration_tests --ignore=abipy/data/refs \
 	--ignore=abipy/examples/plot --ignore=abipy/examples/flows --ignore=abipy/gui 
 else
-    pytest -n 2 --cov-config=.coveragerc --cov=abipy -v --doctest-modules abipy \
+    pytest -n 1 --cov-config=.coveragerc --cov=abipy -v --doctest-modules abipy \
 	--ignore=abipy/integration_tests --ignore=abipy/data/refs \
 	--ignore=abipy/examples/plot --ignore=abipy/examples/flows --ignore=abipy/gui 
 fi

tox.ini

@@ -1,10 +0,0 @@
-[tox]
-envlist = py27
-[testenv]
-commands= py.test-2.6
-#[testenv]
-#basepython=python
-#changedir=doc
-#deps=sphinx
-#commands=
-#    sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html