travis

.travis.yml

@@ -38,26 +38,9 @@ install:
         # Install conda https://conda.io/docs/travis.html
         source dev_scripts/conda_get.sh
         source dev_scripts/conda_install.sh
-        #- conda uninstall -y pymatgen
-        #- conda uninstall -y abipy
+        conda config --add channels abinit
       fi
 
-  # Install abinit from abinit conda channel.
-  - echo "Installing abinit from abinit channel ..."
-  #- conda install -y -c abinit abinit=${ABINIT_VERSION}
-  #- abinit --version
-  #- abinit --build
-
-  # Get pymatgen from matsci
-  #- conda config --add channels matsci
-  # Use my pymatgen fork
-  #- git clone https://github.com/gmatteo/pymatgen.git && cd pymatgen && pip install -q -r requirements.txt && pip install -q -r requirements-optional.txt && python setup.py install && cd ../
-  # pymatgen master
-  #- git clone https://github.com/materialsproject/pymatgen.git && cd pymatgen && pip install -q -r requirements.txt && pip install -q -r requirements-optional.txt && python setup.py install && cd ../
-
-  #- git clone --depth=50 https://github.com/gmatteo/pymatgen.git && cd pymatgen && python setup.py install && cd ../
-  #- git clone --depth=50 https://github.com/abinit/abipy.git && cd abipy && python setup.py install && cd ../
-
   - python setup.py install
   - mkdir -p ${HOME}/.abinit/abipy
   - cp dev_scripts/travis_scheduler.yml ${HOME}/.abinit/abipy/scheduler.yml

dev_scripts/runtests.sh

@@ -1,15 +1,12 @@
 #!/bin/bash
 set -e  # exit on first error
 
-#abinit --version
-#abinit --build
 abicheck.py --with-flow
 
-nosetests -v --with-coverage --cover-package=pseudo_dojo --logging-level=INFO
+#nosetests -v --with-coverage --cover-package=pseudo_dojo --logging-level=INFO
 
 # This is to run the integration tests (slow)
-# pytest -v --cov=abipy --doctest-modules --ignore=./docs/ abipy/integration_tests
-# pytest abipy/integration_tests --ignore=./docs/
+pytest -v --cov=pseudo_dojo --doctest-modules --ignore=./docs/ --ignore=pseudo_dojo/integration_tests
 
 # Generate documentation
 #if [[ "${ABIPY_SPHINX}" == "yes" ]]; then

requirements.txt

@@ -1,3 +1,4 @@
+monty
 numpy
 scipy
 tabulate