From 5ee4717ad15b8025baad8447a0f9efe5528724bb Mon Sep 17 00:00:00 2001
From: davidovitch <david.verelst@gmail.com>
Date: Thu, 8 Dec 2016 10:07:12 +0100
Subject: [PATCH] docs: use --no-deps instead of --no-update-dependencies,
 pytest-cov from anaconda channel

---
 docs/developer-guide.md | 13 +++++++++----
 docs/install.md         |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/developer-guide.md b/docs/developer-guide.md
index 7fc735d..a5b30e7 100644
--- a/docs/developer-guide.md
+++ b/docs/developer-guide.md
@@ -145,15 +145,15 @@ use ```deactivate``` to deactivate the environment.
 Install the necessary Python dependencies using the conda package manager:
 
 ```
->> conda install setuptools_scm future h5py pytables pytest nose sphinx blosc prb paramiko
+>> conda install setuptools_scm future h5py pytables pytest pytest-cov nose sphinx blosc pbr paramiko
 >> conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil pandoc
->> conda install -c https://conda.anaconda.org/conda-forge pyscaffold pytest-cov --no-channel-priority --no-update-dependencies
+>> conda install -c https://conda.anaconda.org/conda-forge pyscaffold --no-deps
 ```
 
-Note that ```--no-channel-priority``` avoids that newer packages from the
+Note that ```--no-deps``` avoids that newer packages from the channel
 ```conda-forge``` will be used instead of those from the default ```anaconda```
 channel. Depending on which packages get overwritten, this might brake your
-Anaconda root environment. As such, using ```--no-channel-priority``` should be
+Anaconda root environment. As such, using ```--no-deps``` should be
 be used for safety (especially when operating from the root environment).
 
 
@@ -179,6 +179,11 @@ or via tortoise-git:
 >> pip install -e . --no-deps
 ```
 
+Note that the ```no-deps``` option here is used for the same reason as explained
+above for the ```conda-forge``` channel: it is to avoid that pip will replace
+newer packages compared to the ones as available in the ```Anaconda``` channel.
+
+
 ## Contributions
 
 If you make a change in the toolbox, that others can benefit from please make a merge request.
diff --git a/docs/install.md b/docs/install.md
index 36488a3..74f9416 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -7,9 +7,9 @@
 Install the necessary Python dependencies using the ```conda``` package manager:
 
 ```
->> conda install setuptools_scm future h5py pytables pytest nose sphinx blosc pbr paramiko
->> conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil pytest-cov
->> conda install -c https://conda.anaconda.org/conda-forge pyscaffold --no-update-dependencies
+>> conda install setuptools_scm future h5py pytables pytest pytest-cov nose sphinx blosc pbr paramiko
+>> conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil
+>> conda install -c https://conda.anaconda.org/conda-forge pyscaffold --no-deps
 ```
 
 Now you can install ```wetb``` with ```pip``` (there is no ```conda``` package
-- 
GitLab