diff --git a/docs/developer-guide.md b/docs/developer-guide.md index 45122e15e3764cc056e8ff62f3b924893ff9e772..7fc735d32ded48df6daded2cc8b908a52b634d1a 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -145,9 +145,9 @@ 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 ->> conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil ->> conda install -c https://conda.anaconda.org/conda-forge pyscaffold pytest-cov --no-channel-priority +>> conda install setuptools_scm future h5py pytables pytest nose sphinx blosc prb 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 ``` Note that ```--no-channel-priority``` avoids that newer packages from the diff --git a/docs/install.md b/docs/install.md index 3c603fef68751780235036e93f4ddbda2c3d1711..6a0ef8b0d4b095d6aad10a27405ee6ec58abef4b 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 -conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil -conda install -c https://conda.anaconda.org/conda-forge pyscaffold pytest-cov --no-channel-priority +>> conda install setuptools_scm future h5py pytables pytest nose sphinx blosc prb paramiko +>> conda install scipy pandas matplotlib cython xlrd coverage xlwt openpyxl psutil +>> conda install -c https://conda.anaconda.org/conda-forge pyscaffold pytest-cov --no-channel-priority --no-update-dependencies ``` Now you can install ```wetb``` with ```pip``` (there is no ```conda``` package @@ -18,14 +18,14 @@ Since we prefer that ```conda``` manages and installs all dependencies we expclicitally tell ```pip``` to only install ```wetb``` and nothing more: ``` -pip install wetb --upgrade --no-deps +>> pip install wetb --upgrade --no-deps ``` ## Update conda and ```wetb``` ``` -conda update --all -pip install wetb --upgrade --no-deps +>> conda update --all +>> pip install wetb --upgrade --no-deps ``` @@ -35,7 +35,7 @@ pip install wetb --upgrade --no-deps ## Installation and update ``` -pip install --upgrade wetb +>> pip install --upgrade wetb ``` diff --git a/requirements.txt b/requirements.txt index c0cbf307fd2526758c6e2d7495a5b2793ef47d2a..413074b8eb6cfd727c1464cc38558e22bf2b6ff2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,7 @@ tables future paramiko psutil +pbr +pyscaffold +pytest-cov +