diff --git a/.circleci/config.yml b/.circleci/config.yml index f1ae868c1..f5a183a87 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:12 + - image: pyodide/pyodide-env:13 environment: - EMSDK_NUM_CORES: 4 EMCC_CORES: 4 @@ -161,7 +161,7 @@ jobs: - run: name: test command: | - tools/pytest_wrapper.py src packages/micropip/ -v -k chrome -n 3 + tools/pytest_wrapper.py src packages/micropip/ -v -k chrome test-packages-firefox: <<: *defaults diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 022935e23..de99df567 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: # only check for unused imports, as the rest is done by black args: [--select=F401] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.782 + rev: v0.812 hooks: - id: mypy args: diff --git a/Dockerfile b/Dockerfile index 30f81428c..4cef902ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update \ bzip2 ccache clang-format-6.0 cmake f2c g++ gfortran git make \ patch pkg-config swig unzip wget xz-utils \ # testing packages: libgconf-2-4 is necessary for running chromium - libgconf-2-4 chromium \ + libgconf-2-4 "chromium=89.*" \ && rm -rf /var/lib/apt/lists/* RUN pip3 --no-cache-dir install \ @@ -15,7 +15,7 @@ RUN pip3 --no-cache-dir install \ distlib \ flake8 \ hypothesis \ - mypy \ + "mypy==0.812" \ pytest \ pytest-cov \ pytest-httpserver \ @@ -31,7 +31,7 @@ RUN wget -qO- https://ftp.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/e && wget -qO- https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz | tar zxC /usr/local/bin/ # Get recent version of chromedriver -RUN wget --quiet https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip \ +RUN wget --quiet https://chromedriver.storage.googleapis.com/89.0.4389.23/chromedriver_linux64.zip \ && unzip chromedriver_linux64.zip \ && mv $PWD/chromedriver /usr/local/bin \ && rm -f chromedriver_linux64.zip diff --git a/Dockerfile-prebuilt b/Dockerfile-prebuilt index 9249f6cfd..74593abf9 100644 --- a/Dockerfile-prebuilt +++ b/Dockerfile-prebuilt @@ -1,6 +1,6 @@ ARG VERSION -FROM iodide/pyodide-env:${VERSION} +FROM pyodide/pyodide-env:${VERSION} USER root diff --git a/run_docker b/run_docker index 96485ecd0..d33866d26 100755 --- a/run_docker +++ b/run_docker @@ -29,9 +29,9 @@ function error() { } -PYODIDE_IMAGE_TAG="12" +PYODIDE_IMAGE_TAG="13" PYODIDE_PREBUILT_IMAGE_TAG="0.17.0a2" -DEFAULT_PYODIDE_DOCKER_IMAGE="iodide/pyodide-env:${PYODIDE_IMAGE_TAG}" +DEFAULT_PYODIDE_DOCKER_IMAGE="pyodide/pyodide-env:${PYODIDE_IMAGE_TAG}" DEFAULT_PYODIDE_SYSTEM_PORT="8000" DOCKER_COMMAND="/bin/bash" diff --git a/src/tests/python_tests.txt b/src/tests/python_tests.txt index 8a0f38790..b0fe710f3 100644 --- a/src/tests/python_tests.txt +++ b/src/tests/python_tests.txt @@ -45,7 +45,7 @@ test__xxsubinterpreters test_abc test_abstract_numbers test_aifc audioop -test_argparse +test_argparse crash-chrome test_array test_asdl_parser test_ast