From 8e747d6fc023d84108630b1820ffea4faba67e8f Mon Sep 17 00:00:00 2001 From: J Forde Date: Mon, 15 Oct 2018 23:15:20 -0400 Subject: [PATCH 1/2] Update CONTRIBUTING.md `freeze.py` expects `environment.yml` to be in working directory - calling it from project root will not work since the file is in a different folder --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54b75d29..fb5ab958 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -175,7 +175,8 @@ See the subsections below for more detailed instructions. an existing package, you should then run: ```bash - python ./repo2docker/buildpacks/conda/freeze.py + cd ./repo2docker/buildpacks/conda/ + python freeze.py ``` This script will resolve dependencies and write them to the respective `.frozen.yml` From ec7326150c05aba1e6b9be39133f2b2b28ea4691 Mon Sep 17 00:00:00 2001 From: J Forde Date: Mon, 15 Oct 2018 23:26:01 -0400 Subject: [PATCH 2/2] Update CONTRIBUTING.md Added clarity to updating conda- I read it as meaning the specific version of conda --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fb5ab958..b8544366 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -148,7 +148,7 @@ To update one of the dependencies shared across all `repo2docker` builds, you must follow these steps (with more detailed information in the sections below): * Make sure you have [Docker](https://www.docker.com/) running on your computer -* Bump the version number in the `conda` environment ([link](https://github.com/jupyter/repo2docker/blob/master/CONTRIBUTING.md#conda-dependencies)) +* Bump the version numbers of the dependencies you want to update in the `conda` environment ([link](https://github.com/jupyter/repo2docker/blob/master/CONTRIBUTING.md#conda-dependencies)) * Make a pull request with your changes ([link](https://github.com/jupyter/repo2docker/blob/master/CONTRIBUTING.md#make-a-pull-request)) See the subsections below for more detailed instructions.