Skip to content

Commit 8664078

Browse files
authored
Disable pip check on upstream tests (#2847)
1 parent dae0cee commit 8664078

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.circleci/config.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ commands:
3131
mkdir -p test-reports
3232
. /opt/conda/etc/profile.d/conda.sh
3333
conda activate esmvaltool
34-
pip check
3534
pytest -n 4 --junitxml=test-reports/report.xml << parameters.args >>
3635
esmvaltool version
3736
esmvaltool -- --help
@@ -104,6 +103,16 @@ commands:
104103
dpkg -l | tee /logs/versions.txt
105104
conda env export | tee /logs/environment.yml
106105
pip freeze | tee /logs/requirements.txt
106+
- run:
107+
name: Check dependencies are compatible
108+
command: |
109+
if [[ "<< parameters.upstream_packages >>" = "" ]]; then
110+
. /opt/conda/etc/profile.d/conda.sh
111+
conda activate esmvaltool
112+
pip check
113+
else
114+
echo "Skipping `pip check` due to upstream packages"
115+
fi
107116
- test_and_report
108117
- save_cache:
109118
key: install-<< parameters.extra >>-{{ .Branch }}-{{ checksum "cache_key.txt" }}
@@ -133,6 +142,7 @@ jobs:
133142
mkdir /logs
134143
conda activate esmvaltool
135144
pip install --no-deps .[test] > /logs/install.txt 2>&1
145+
pip check
136146
- test_and_report:
137147
args: --cov
138148
- save_cache:

0 commit comments

Comments
 (0)