diff --git a/.circleci/config.yml b/.circleci/config.yml index 14d43f1c2..92f657ac4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 defaults: &defaults working_directory: ~/repo docker: - - image: iodide/pyodide-env:0.3.0 + - image: iodide/pyodide-env:0.3.1 jobs: build: @@ -16,13 +16,6 @@ jobs: command: | make lint - - run: - name: dependencies - command: | - # TODO: update pyodide-env image with the below - sudo apt-get update - sudo apt-get install gfortran f2c - - restore_cache: keys: - v1-emsdk-{{ checksum "emsdk/Makefile" }}-v11- diff --git a/Makefile b/Makefile index 22a4ae44d..a20cf958a 100644 --- a/Makefile +++ b/Makefile @@ -135,8 +135,7 @@ clean: rm -fr src/*.bc make -C packages clean make -C six clean - make -C CLAPACK-WA cleanall - echo "The Emsdk and CPython are not cleaned. cd into those directories to do so." + echo "The Emsdk, CPython and CLAPACK are not cleaned. cd into those directories to do so." %.bc: %.c $(CPYTHONLIB) $(LZ4LIB) diff --git a/run_docker b/run_docker index 9cd212cb0..a4d166945 100755 --- a/run_docker +++ b/run_docker @@ -1,2 +1,2 @@ #!/bin/sh -docker run --rm -v $PWD:/src --user root -e NB_UID=$UID -e NB_GID=$GID -it iodide/pyodide-env:0.3.0 /bin/bash +docker run --rm -v $PWD:/src --user root -e NB_UID=$UID -e NB_GID=$GID -it iodide/pyodide-env:0.3.1 /bin/bash