Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# Run tests
working_directory: /test
docker:
- image: continuumio/miniconda3
- image: esmvalgroup/esmvalcore:development
steps:
- checkout
- run:
Expand All @@ -31,13 +31,9 @@ jobs:
- restore_cache:
Comment thread
jvegreg marked this conversation as resolved.
Outdated
key: deps3-{{ .Branch }}-{{ checksum "cache_key.txt" }}
- run:
# Update/Create Conda environment and run tests
command: |
. /opt/conda/etc/profile.d/conda.sh
# conda update -y conda
conda env update
conda activate esmvaltool
python setup.py test --addopts '-m "not installation"'

- save_cache:
key: deps3-{{ .Branch }}-{{ checksum "cache_key.txt" }}
paths:
Expand Down
6 changes: 5 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ RUN apt-get update -y && apt-get install -y \
unzip

# install environment packages
RUN conda install -c conda-forge -c esmvalgroup -c birdhouse esmvaltool
COPY . /source
WORKDIR /source
RUN ls
RUN conda env update --name base --file environment.yml
RUN pip install .

# run tests
RUN esmvaltool -h
Expand Down
19 changes: 19 additions & 0 deletions docker/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM continuumio/miniconda3

# update the conda packages
RUN conda update -y conda pip

# install development tools
RUN apt-get update -y && apt-get install -y \
build-essential \
curl \
unzip
Comment thread
jvegreg marked this conversation as resolved.
Outdated

# install environment packages
COPY . /source
WORKDIR /source
RUN ls
RUN conda env update --name base --file environment.yml
RUN pip install -e .[develop]
RUN pip uninstall esmvalcore -y
RUN rm -r /source