Use binder directory for configuration files (#85)

* Revert move of Docker related files

This is now unnecessary, so don't do it.
Also remove the instructions that aren't needed now.

* Move environment.yml to Binder dir

* Update paths and docs to use Binder dir

* Use modern Binder badge

Author: matthewfeickert

.azure-pipelines/linux.yml

@@ -19,7 +19,7 @@ steps:
 
 - script: |
     # Install Python, py.test, and required packages.
-    conda env create -f environment.yml
+    conda env create -f binder/environment.yml
     source activate bayesian-modelling-tutorial
     conda install -y python=$(python.version)
     python -m ipykernel install --user --name bayesian-modelling-tutorial

.azure-pipelines/macos.yml

@@ -15,7 +15,7 @@ steps:
 
 # - script: |
 #     # Install Python, py.test, and required packages.
-#     conda env create -f environment.yml
+#     conda env create -f binder/environment.yml
 #     source activate bayesian-modelling-tutorial
 #     conda install -y python=$(python.version)
 #     python -m ipykernel install --user --name bayesian-modelling-tutorial

.azure-pipelines/templates/setup-script-nix.yml

@@ -1,6 +1,6 @@
 steps:
 - script: |
-    conda env create -f environment.yml
+    conda env create -f binder/environment.yml
     source activate bayesian-modelling-tutorial
     conda install -y python=$(python.version)
     python -m ipykernel install --user --name bayesian-modelling-tutorial

.azure-pipelines/templates/setup-script-win.yml

@@ -1,6 +1,6 @@
 steps:
 - script: |
-    conda env create -f environment.yml
+    conda env create -f binder/environment.yml
     activate bayesian-modelling-tutorial
     conda install -y python=$(python.version)
     python -m ipykernel install --user --name bayesian-modelling-tutorial

utils/.dockerignore .dockerignoreutils/.dockerignore renamed to .dockerignore

@@ -23,7 +23,7 @@ install:
   - conda info -a
 
   # Install Python, py.test, and required packages.
-  - conda env create -f environment.yml
+  - conda env create -f binder/environment.yml
   - source activate bayesian-modelling-tutorial
   # This guarantees that the Python version is matrixed.
   - conda install python=$PYTHON_VERSION

.travis.yml

@@ -1,21 +1,11 @@
-##### INSTRUCTIONS TO USE #####
-# Move this file
-# and the .dockerignore file
-# to the base directory of the repo
-# before using Docker to build the container.
-# This file was moved into `utils/`
-# because it was overriding the original
-# conda environment-based build using `environment.yml`.
-##### END INSTRUCTIONS #####
-
 # Base image: miniconda3
 FROM continuumio/miniconda3
 
 # Install GCC for Theano
 RUN apt-get install build-essential -y
 
 # Install environment
-COPY ./environment.yml /environment.yml
+COPY ./binder/environment.yml /environment.yml
 RUN conda env create -f /environment.yml
 RUN rm /environment.yml
 

utils/Dockerfile Dockerfileutils/Dockerfile renamed to Dockerfile

@@ -1,4 +1,4 @@
-[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/ericmjl/bayesian-stats-modelling-tutorial/master)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ericmjl/bayesian-stats-modelling-tutorial/master)
 
 # bayesian-stats-modelling-tutorial
 
@@ -41,7 +41,7 @@ to **install all the necessary packages**
 from the provided `environment.yml` file.
 
 ```bash
-conda env create -f environment.yml
+conda env create -f binder/environment.yml
 ```
 
 To **activate the environment**, use the `conda activate` command.
@@ -59,7 +59,7 @@ source activate bayesian-modelling-tutorial
 To **update the environment** based on the `environment.yml` specification file, use the `conda update` command.
 
 ```bash
-conda env update -f environment.yml
+conda env update -f binder/environment.yml
 ```
 
 ### 3b. `pip` users
@@ -75,7 +75,7 @@ pip install networkx scipy ...
 
 If you don't want to mess around with dev-ops, click the following badge to get a Binder session on which you can compute and write code.
 
-[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/ericmjl/bayesian-stats-modelling-tutorial/master)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ericmjl/bayesian-stats-modelling-tutorial/master)
 
 
 ### 4a. Open your Jupyter notebook