Merge pull request #101 from ottogroup/develop

Develop
ottogroup · Dec 13, 2018 · f3a4372 · f3a4372
2 parents f02d8e2 + d721e2b
commit f3a4372
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,5 @@
-v1.2.1 - 2018-12-12
-===================
+v1.2.1.1 - 2018-12-13
+=====================
 
 - Added pld-export command to export a model from one model persister
   to another.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.1
+1.2.1.1
diff --git a/conda_recipe/conda_upload.sh b/conda_recipe/conda_upload.sh
@@ -14,7 +14,7 @@ mkdir ~/conda-bld
 conda install conda-build
 conda install anaconda-client
 
-conda config --add channels bioconda  # for requests-mock
+conda config --add channels conda-forge  # for requests-mock
 conda config --set anaconda_upload no
 export CONDA_BLD_PATH=~/conda-bld
 conda build .