Update circleCI docker image

Author: andersy005

.circleci/config.yml

@@ -1,50 +1,74 @@
 version: 2
+# Tell CircleCI to use this workflow
+workflows:
+  version: 2
+  default:
+    jobs:
+      - "python-3.6"
 
 jobs:
-
-  # Define a "build_test" job to be run with Circle
-  build_test:
 
+  "python-3.6":
     # This is the base environment that Circle will use
     docker:
-      - image: frolvlad/alpine-miniconda3
-      
+      - image: continuumio/miniconda:latest
+    environment:
+      PYTHON: "3.6"
+      ENV_NAME: "intake-cmip-dev"
+
     steps:
-    
-      - run: apk add --no-cache build-base ca-certificates git openssh bash curl
-      
       # Get our data and merge with upstream
       - checkout
-      
+  
       # Restore cached files to speed things up
       - restore_cache:
-          keys:
-            - conda-pkgs
+          key: deps-{{ .Branch }}-3.6-{{ checksum "environment-dev.yml" }}
 
-      - run: ./ci/install-circleci.sh
+      - run: # install and activate conda environment
+          name: configure conda 
+          command: ./ci/install-circle.sh
 
+      - run:
+          command: |
+            source activate ${ENV_NAME}
+            pytest --junitxml=test-reports/junit.xml --cov=./
+
+      - run:
+          name: Code Coverage + Code Styling with (black, flake8, isort)
+          command: |
+            source activate ${ENV_NAME}
+            echo "[Upload coverage]"
+            codecov
+            echo "[flake8]"
+            flake8 
+            echo "[black]"
+            black --check . 
+            echo "[isort]"
+            isort --recursive --check-only .
+      - run:
+          name: Check documentation build 
+          command: |
+            source activate ${ENV_NAME}
+            pushd docs
+            make html
+            popd
+     
       # Cache some files for a speedup in subsequent builds
       - save_cache:
-          key: conda-pkgs
+          key: deps-{{ .Branch }}-3.6-{{ checksum "environment-dev.yml" }}
           paths:
-            - /opt/conda/pkgs
-            
-      # Run tests
-      - run:
-           name: Running Tests 
-           command: source activate intake-cmip-dev && py.test --junitxml=test-reports/junit.xml --cov=./
+            - "/opt/conda/envs/${ENV_NAME}/"
+            - "/opt/conda/pkgs"
 
-      - run:
-           name: Coverage
-           command: source activate intake-cmip-dev && codecov
-           when: on_success
+      - store_test_results:
+          path: test-reports
+
+      - store_artifacts:
+          path: test-reports
+      # Tell Circle to store the documentation output in a folder that we can access later
+      - store_artifacts: 
+          path: docs/_build/html
+          destination: html
 
 
-
-# Tell CircleCI to use this workflow
-workflows:
-  version: 2
-  default:
-    jobs:
-      - build_test
 

ci/install-circle.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+set -eo pipefail
+
+apt-get update; apt-get install -y make
+conda config --set always_yes true --set changeps1 false --set quiet true
+conda update -q conda
+conda env create -f environment-dev.yml --name=${ENV_NAME} --quiet
+conda env list
+source activate ${ENV_NAME}
+pip install pip --upgrade
+pip install --no-deps --quiet -e .
+conda list -n ${ENV_NAME}

environment-dev.yml

@@ -13,6 +13,9 @@ dependencies:
   - dask
   - distributed
   - autopep8
+  - flake8
+  - black
+  - isort
   - pytest
   - coverage
   - pytest-cov