Move back to using environment.yml in CI

Author: winni2k

README.rst

@@ -70,7 +70,7 @@ Development
 1. Install `conda <https://docs.conda.io/en/latest/miniconda.html>`_.
 2. Download development and testing tools::
 
-    conda env create -f environment.lock.yml -n my-dev-environment
+    conda env create -f environment.yml -n my-dev-environment
 
 3. Activate development environment::
 
@@ -86,9 +86,20 @@ Tests
 
     make test
 
+Deploy new cortexpy version to pypi
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Requires access credentials for pypi.
+
+::
+
+    make deploy
+
 Update the dev environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+This section is experimental because it does not work on travis-CI yet.
+
 ::
 
     # Create a new env from the high-level requirements file
@@ -100,15 +111,6 @@ Update the dev environment
     # save new env to environment.lock.yml
     make lock
 
-Deploy new cortexpy version to pypi
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Requires access credentials for pypi.
-
-::
-
-    make deploy
-
 Bugs
 ====
 

scripts/bootstrap

@@ -25,7 +25,7 @@ conda update -q conda
 # Useful for debugging any issues with conda
 conda info -a
 
-conda env create -q -f environment.lock.yml -n test-env
+conda env create -q -f environment.yml -n test-env
 source activate test-env
 python setup.py install
 mccortex 3 || echo continue...