Requests shim

.clang-format

@@ -107,6 +107,4 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
----
-Language: JavaScript
 ...

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+extend-ignore = E203, E402, E501, E731, E741, B950
+select = C,E,F,W,B,B9

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,6 @@
 <!-- Thank you for contributing to Pyodide! All improvements are welcome,
      so don't be afraid to make a PR. -->
 
-<!-- [IMPORTANT] Note on CI failures:
-     Currently, we are having issues with selenium-based tests.
-     Don't panic if the CI fails on your PR because of timeouts.
-     It's probably not your fault. We will investigate :) -->
-
 ### Description
 
 <!-- Please explain what your PR is about:
@@ -16,11 +11,10 @@
 
 ### Checklists
 
-<!-- Note on checklists:
+<!-- Note:
      If you think some of these steps are not necessary for your PR,
-     just remove those checkboxes, or mark them as checked. Otherwise,
-     if some checkboxes are left unmarked, we might assume that your PR
-     is not ready to be merged and we might keep you waiting -->
+     remove those checkboxes, or mark them as checked. If you keep unchecked checkboxes,
+     we will assume that your PR is not ready to be merged  -->
 
 - [ ] Add a [CHANGELOG](https://github.com/pyodide/pyodide/blob/main/docs/project/changelog.md) entry
 - [ ] Add / update tests

.github/workflows/deploy_release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.9"
+          python-version: "3.10.2"
 
       - name: Install dependencies
         run: python -m pip install build twine

.github/workflows/docker_image.yml

@@ -2,9 +2,18 @@ name: pyodide-env-docker
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Version of the docker image to build."
-        required: true
+      chrome_version:
+        description: "Version of the chrome browser (e.g. 97, 96, latest)."
+        required: false
+        default: "97"
+      firefox_version:
+        description: "Version of the firefox browser (e.g. 96, 95, latest)."
+        required: false
+        default: "96"
+      tag:
+        description: "Tag of the docker image to build (If not set, <release-date>-chrome[version]-firefox[version] will be used)"
+        required: false
+        default: ""
 env:
   GHCR_REGISTRY: ghcr.io
   IMAGE_NAME: pyodide/pyodide-env
@@ -25,14 +34,26 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.IMAGE_NAME }}
+      - name: Set tag
+        id: tag
+        run: |
+          TAG=${{ github.event.inputs.tag }}
+          if [ -z "$TAG" ]; then
+            DATE=$(date +'%Y%m%d')
+            TAG="$DATE-chrome${{ github.event.inputs.chrome_version }}-firefox${{ github.event.inputs.firefox_version }}"
+          fi
+          echo "::set-output name=tag::$TAG"
       - name: Build and push Docker image to Docker Hub
         id: build
         uses: docker/build-push-action@v2
         with:
           file: ./Dockerfile
           push: true
-          tags: ${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}
+          tags: ${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            CHROME_VERSION=${{ github.event.inputs.chrome_version }}
+            FIREFOX_VERSION=${{ github.event.inputs.firefox_version }}
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}
   build_ghcr:
@@ -51,13 +72,25 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Set tag
+        id: tag
+        run: |
+          TAG=${{ github.event.inputs.tag }}
+          if [ -z "$TAG" ]; then
+            DATE=$(date +'%Y%m%d')
+            TAG="$DATE-chrome${{ github.event.inputs.chrome_version }}-firefox${{ github.event.inputs.firefox_version }}"
+          fi
+          echo "::set-output name=tag::$TAG"
       - name: Build and push Docker image to ${{ env.GHCR_REGISTRY }}
         id: build
         uses: docker/build-push-action@v2
         with:
           file: ./Dockerfile
           push: true
-          tags: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}
+          tags: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            CHROME_VERSION=${{ github.event.inputs.chrome_version }}
+            FIREFOX_VERSION=${{ github.event.inputs.firefox_version }}
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}

.github/workflows/main.yml

@@ -6,7 +6,20 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: main-${{ github.head_ref }}
+  cancel-in-progress: true
+
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v3
+        with:
+          python-version: 3.10.2
+      - uses: pre-commit/[email protected]
+
   build-core:
     runs-on: ubuntu-latest
     env:
@@ -28,7 +41,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: pyodide-env
-          python-version: 3.9.5
+          python-version: 3.10.2
           channels: conda-forge
 
       - name: Check Python versions
@@ -75,21 +88,21 @@ jobs:
           ccache -s
 
       - name: check-size
-        run: ls -lh build/
+        run: ls -lh dist/
 
       - name: Store artifacts build
         uses: actions/upload-artifact@v2
         with:
           name: core-build
-          path: ./build/
+          path: ./dist/
           retention-days: 60
 
   test-core:
     runs-on: ubuntu-latest
     env:
       DISPLAY: :99
 
-    needs: build-core
+    needs: [build-core]
     strategy:
       matrix:
         selenium_runner: [firefox]
@@ -101,12 +114,12 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: core-build
-          path: ./build/
+          path: ./dist/
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: pyodide-env
-          python-version: 3.9.5
+          python-version: 3.10.2
           channels: conda-forge
 
       - name: install test requirements
@@ -120,7 +133,7 @@ jobs:
         shell: bash -l {0}
         run: |
           ls -lh
-          ls -lh build/
+          ls -lh dist/
           tools/pytest_wrapper.py src packages/micropip/ -v -k "${SELENIUM_RUNNER}"
 
       - name: run package tests
@@ -129,5 +142,5 @@ jobs:
         shell: bash -l {0}
         run: |
           ls -lh
-          ls -lh build/
+          ls -lh dist/
           tools/pytest_wrapper.py packages/test* packages/*/test* -v -k "numpy and not joblib and ${SELENIUM_RUNNER}"

.github/workflows/prebuilt_docker_image.yml

@@ -1,20 +1,23 @@
 name: prebuilt-docker-image
 on:
-  push:
-    tags:
-      - "*.*.*"
+  release:
+    types: [published]
 env:
   GHCR_REGISTRY: ghcr.io
   IMAGE_NAME: pyodide/pyodide
-  # Note: the following version needs updating after each pyodide-env image release
-  PYODIDE_ENV_VERSION: 19
+  PYODIDE_ENV_VERSION: 20220411-chrome99-firefox98
 jobs:
   build_docker:
     runs-on: ubuntu-latest
     environment: Docker
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        id: builder
+        with:
+          driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=-1
       - name: Log into Docker Hub registry
         uses: docker/login-action@v1
         with:
@@ -33,15 +36,21 @@ jobs:
           push: true
           build-args: |
             VERSION=${{ env.PYODIDE_ENV_VERSION }}
-          tags: ${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}
+          tags: ${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
           labels: ${{ steps.meta.outputs.labels }}
+          builder: ${{ steps.builder.outputs.name }}
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}
   build_ghcr:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        id: builder
+        with:
+          driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=-1
       - name: Log into registry ${{ env.GHCR_REGISTRY }}
         uses: docker/login-action@v1
         with:
@@ -61,7 +70,8 @@ jobs:
           push: true
           build-args: |
             VERSION=${{ env.PYODIDE_ENV_VERSION }}
-          tags: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}
+          tags: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}
           labels: ${{ steps.meta.outputs.labels }}
+          builder: ${{ steps.builder.outputs.name }}
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}

.gitignore

@@ -1,7 +1,8 @@
 *.a
 *.o
 *.pyc
-src/js/pyproxy.gen.js
+src/js/*.gen.*
+src/js/*.out.*
 
 *.egg-info/