diff --git a/.azure-pipelines/linux.yml b/.azure-pipelines/linux.yml index 0dcf398..a15ff44 100644 --- a/.azure-pipelines/linux.yml +++ b/.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 diff --git a/.azure-pipelines/macos.yml b/.azure-pipelines/macos.yml index 943126e..271c316 100644 --- a/.azure-pipelines/macos.yml +++ b/.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 diff --git a/.azure-pipelines/templates/setup-script-nix.yml b/.azure-pipelines/templates/setup-script-nix.yml index 1df7b9c..94631cc 100644 --- a/.azure-pipelines/templates/setup-script-nix.yml +++ b/.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 diff --git a/.azure-pipelines/templates/setup-script-win.yml b/.azure-pipelines/templates/setup-script-win.yml index dc17e3d..87b7047 100644 --- a/.azure-pipelines/templates/setup-script-win.yml +++ b/.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 diff --git a/utils/.dockerignore b/.dockerignore similarity index 100% rename from utils/.dockerignore rename to .dockerignore diff --git a/.travis.yml b/.travis.yml index 530e09b..0708972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/utils/Dockerfile b/Dockerfile similarity index 69% rename from utils/Dockerfile rename to Dockerfile index a588df6..903c049 100644 --- a/utils/Dockerfile +++ b/Dockerfile @@ -1,13 +1,3 @@ -##### 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 @@ -15,7 +5,7 @@ FROM continuumio/miniconda3 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 diff --git a/README.md b/README.md index 1097602..073e467 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/environment.yml b/binder/environment.yml similarity index 100% rename from environment.yml rename to binder/environment.yml