Skip to content

Commit 7d9c062

Browse files
committed
Use --no-deps to avoid messing up the conda environment
1 parent 6c500d7 commit 7d9c062

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.circleci/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ commands:
4141
command: |
4242
. /opt/conda/etc/profile.d/conda.sh
4343
conda activate esmvaltool
44+
pip check
4445
pytest -n 4 --junitxml=test-reports/report.xml
4546
esmvaltool version
4647
esmvaltool -- --help
@@ -95,7 +96,7 @@ commands:
9596
conda env create -n esmvaltool -f environment.yml --verbose
9697
conda activate esmvaltool
9798
mamba list >> /logs/conda.txt
98-
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
99+
pip --no-deps install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
99100
if [[ "<<parameters.flags>>" != *'--editable'* ]]
100101
then
101102
rm -r esmvaltool
@@ -135,7 +136,7 @@ jobs:
135136
. /opt/conda/etc/profile.d/conda.sh
136137
conda activate esmvaltool
137138
mkdir /logs
138-
pip install .[test] > /logs/install.txt 2>&1
139+
pip --no-deps install .[test] > /logs/install.txt 2>&1
139140
- run:
140141
name: Check Python code style and mistakes
141142
command: |
@@ -206,9 +207,9 @@ jobs:
206207
conda env create -n esmvaltool -f environment.yml --verbose
207208
conda activate esmvaltool
208209
mamba list >> /logs/conda.txt
209-
pip install --editable .[develop]
210+
pip install --no-deps --editable .[develop]
210211
git clone https://github.com/ESMValGroup/ESMValCore $HOME/ESMValCore
211-
pip install --editable $HOME/ESMValCore[develop]
212+
pip install --no-deps --editable $HOME/ESMValCore[develop]
212213
- log_versions
213214
- test_and_report
214215
- run:
@@ -246,7 +247,8 @@ jobs:
246247
# Install
247248
conda env create -n esmvaltool -f environment_python.yml
248249
conda activate esmvaltool
249-
pip install .[doc]
250+
pip install --no-deps .[doc]
251+
pip check
250252
# Log versions
251253
dpkg -l > /logs/versions.txt
252254
conda env export > /logs/environment.yml

doc/sphinx/source/quickstart/installation.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ code (called ``ESMValTool`` if you did not choose a different name):
372372

373373
.. code-block:: bash
374374
375-
pip install --editable '.[develop]'
375+
pip install --no-deps --editable '.[develop]'
376376
377377
Using the ``--editable`` flag will cause the installer to create a symbolic link
378378
from the installation location to your source code, so any changes you make to
@@ -471,7 +471,7 @@ and then install ESMValCore in development mode
471471

472472
.. code-block:: bash
473473
474-
pip install --editable '.[develop]'
474+
pip install --no-deps --editable '.[develop]'
475475
476476
To check that the installation was successful, run
477477

@@ -484,7 +484,7 @@ this should show the directory of the source code that you just downloaded.
484484
If the command above shows a directory inside your conda environment instead,
485485
e.g. ``~/miniforge3/envs/esmvaltool/lib/python3.11/site-packages/esmvalcore``,
486486
you may need to manually remove that directory and run
487-
``pip install --editable '.[develop]'`` again.
487+
``pip install --no-deps --editable '.[develop]'`` again.
488488

489489
Finally, also install the :ref:`esmvaltool:pre-commit` hooks by running:
490490

@@ -688,7 +688,7 @@ trust the usual PyPI URLs you can declare them with the option
688688

689689
.. code-block:: bash
690690
691-
pip install --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org -e .[develop]
691+
pip install --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org --no-deps -e .[develop]
692692
693693
If R packages fail to download, you might be able to solve this by
694694
setting the environment variable ``http_proxy`` to the correct value, e.g.

0 commit comments

Comments
 (0)