Merge branch 'main' into feature/0.18.0-nano

Author: phorward

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - -{{ checksum "Makefile.envs" }}-v20201205-
+            - -{{ checksum "Makefile.envs" }}-v20201205-
 
       - run:
           name: build emsdk
@@ -88,7 +88,6 @@ jobs:
           paths:
             - .
 
-
       - store_artifacts:
           path: /root/repo/build/
 
@@ -102,7 +101,7 @@ jobs:
 
       - restore_cache:
           keys:
-          - -{{ checksum "Makefile.envs" }}-v20201205-
+            - -{{ checksum "Makefile.envs" }}-v20201205-
 
       - run:
           name: build packages
@@ -161,7 +160,7 @@ jobs:
       - run:
           name: stack-size
           command: |
-            pytest -s benchmark/stack_usage.py  | sed -n 's/## //pg' || true
+            pytest -s benchmark/stack_usage.py  | sed -n 's/## //pg'
 
   test-emsdk:
     <<: *defaults
@@ -207,7 +206,6 @@ jobs:
             npm install
             npm test
 
-
   benchmark:
     <<: *defaults
     steps:
@@ -252,7 +250,7 @@ jobs:
       - run:
           name: Deploy to pyodide-cdn2.iodide.io
           command: |
-            find build/ -type f -exec sh -c "echo \"Compressing {}\"; gzip {}; mv {}.gz {};" \;
+            find build/ -type f -print0 | xargs -0 -n1 -I@ bash -c "echo \"Compressing @\"; gzip @; mv @.gz @;"
             aws s3 sync build/ "s3://pyodide-cdn2.iodide.io/v${CIRCLE_TAG}/full/" --exclude '*.data' --cache-control 'max-age=30758400, immutable, public' --content-encoding 'gzip'    # 1 year cache
             aws s3 sync build/ "s3://pyodide-cdn2.iodide.io/v${CIRCLE_TAG}/full/" --exclude '*' --include '*.data' --cache-control 'max-age=30758400, immutable, public'  --content-type 'application/wasm' --content-encoding 'gzip'  # 1 year
             # update 301 redirect for the /latest/* route.
@@ -281,7 +279,7 @@ jobs:
       - run:
           name: Deploy to pyodide-cdn2.iodide.io
           command: |
-            find build/ -type f -exec sh -c "echo \"Compressing {}\"; gzip {}; mv {}.gz {};" \;
+            find build/ -type f -print0 | xargs -0 -n1 -I@ bash -c "echo \"Compressing @\"; gzip @; mv @.gz @;"
             aws s3 rm --recursive "s3://pyodide-cdn2.iodide.io/dev/full/"
             aws s3 sync build/ "s3://pyodide-cdn2.iodide.io/dev/full/" --exclude '*.data' --cache-control 'max-age=3600, public' --content-encoding 'gzip'  # 1 hour cache
             aws s3 sync build/ "s3://pyodide-cdn2.iodide.io/dev/full/" --exclude '*' --include '*.data' --cache-control 'max-age=3600, public'  --content-type 'application/wasm' --content-encoding 'gzip'  # 1 hour cache
@@ -290,55 +288,133 @@ workflows:
   version: 2
   build-and-deploy:
     jobs:
-      - lint
-      - test-docs
-      - test-python
-      - build-core
+      - lint:
+          filters:
+            tags:
+              only: /.*/
+
+      - test-docs:
+          filters:
+            tags:
+              only: /.*/
+
+      - test-python:
+          filters:
+            tags:
+              only: /.*/
+
+      - build-core:
+          filters:
+            tags:
+              only: /.*/
+
       - build-packages:
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-core-chrome
-          test-params: -k chrome src packages/micropip
+          test-params: -k "chrome and not webworker" src packages/micropip
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-core-firefox
-          test-params: -k firefox src packages/micropip
+          test-params: -k "firefox and not webworker" src packages/micropip
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-core-node
           test-params: -k node src packages/micropip
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
+      - test-main:
+          name: test-core-chrome-webworker
+          test-params: -k chrome src/tests/test_webworker.py
+          requires:
+            - test-core-chrome
+          filters:
+            tags:
+              only: /.*/
+
+      - test-main:
+          name: test-core-firefox-webworker
+          test-params: -k firefox src/tests/test_webworker.py
+          requires:
+            - test-core-firefox
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-packages-chrome
           test-params: -k chrome packages/test* packages/*/test*
           requires:
             - build-packages
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-packages-firefox
           test-params: -k firefox packages/test* packages/*/test*
           requires:
             - build-packages
+          filters:
+            tags:
+              only: /.*/
+
       - test-main:
           name: test-packages-node
           test-params: -k "node and not numpy" packages/test* packages/*/test*
           requires:
             - build-packages
+          filters:
+            tags:
+              only: /.*/
+
       - test-emsdk:
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - test-js:
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - benchmark-stack-size:
           requires:
             - build-core
+          filters:
+            tags:
+              only: /.*/
+
       - benchmark:
           requires:
             - build-packages
+          filters:
+            tags:
+              only: /.*/
+
       - deploy-release:
           requires:
             - lint

.gitignore

@@ -25,6 +25,6 @@ emsdk/emsdk
 geckodriver.log
 node_modules
 packages/.artifacts
-packages/*/build.log
+packages/*/build.log*
 packages/build-logs
 dist/

.pre-commit-config.yaml

@@ -1,33 +1,38 @@
 exclude: '^.*patches|.*\.cgi$'
 default_language_version:
-    python : "3.9"
+  python: "3.9"
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/psf/black
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
-    -   id: black
--   repo: https://gitlab.com/pycqa/flake8
+      - id: black
+  - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.8
     hooks:
-    -   id: flake8
+      - id: flake8
         types: [file, python]
         # only check for unused imports, as the rest is done by black
         args: [--select=F401]
--   repo: https://github.com/pre-commit/mirrors-mypy
+  - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.812
     hooks:
-     -  id: mypy
+      - id: mypy
         args:
           - --ignore-missing-imports
--   repo: local
+  - repo: local
     hooks:
-    -   id: clang-format
+      - id: clang-format
         name: clang-format-6.0
         language: system
         entry: ./tools/clang-format-precommit.sh
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v2.3.2" # Use the sha / tag you want to point at
+    hooks:
+      - id: prettier

Makefile

@@ -144,13 +144,12 @@ lint: node_modules/.installed
 	find src -type f -regex '.*\.\(c\|h\)' \
 		| xargs clang-format-6.0 -output-replacements-xml \
 		| (! grep '<replacement ')
-	npx prettier --check `find src -type f -name '*.js' -not -name '*.gen.js'`
-	npx prettier --check `find src -type f -name '*.html'`
+	npx prettier --check src --ignore-path '*.gen.*'
 	black --check .
 	mypy --ignore-missing-imports    \
 		pyodide-build/pyodide_build/ \
 		src/ 					     \
-		packages/micropip/micropip/  \
+		packages/micropip/src/ 		 \
 		packages/*/test* 			 \
 		conftest.py 				 \
 		docs

README.md

@@ -4,7 +4,8 @@
   </a>
 </div>
 
-
+[![NPM Latest Release](https://img.shields.io/npm/v/pyodide)](https://www.npmjs.com/package/pyodide)
+[![PyPI Latest Release](https://img.shields.io/pypi/v/pyodide-build.svg)](https://pypi.org/project/pyodide-build/)
 [![Build Status](https://circleci.com/gh/pyodide/pyodide.png)](https://circleci.com/gh/pyodide/pyodide)
 [![Documentation Status](https://readthedocs.org/projects/pyodide/badge/?version=stable)](https://pyodide.readthedocs.io/?badge=stable)
 
@@ -53,8 +54,8 @@ technical resources. These include:
     recommended for Windows and macOS users and for Linux users who prefer a
     Debian-based Docker image with the dependencies already installed.
 
-
 ## History
+
 Pyodide was created in 2018 by [Michael Droettboom](https://github.com/mdboom)
 at Mozilla as part of the [Iodide
 project](https://github.com/iodide-project/iodide). Iodide is an experimental

benchmark/stack_usage.py

@@ -5,13 +5,14 @@
 def print_info():
     headings = [
         "browser",
+        "py_limit",
         "py_usage",
         "js_depth",
         "py_depth",
         "js_depth/py_usage",
         "js_depth/py_depth",
     ]
-    fmt = "## {{:{:d}s}}  {{:{:d}.2f}}  {{:{:d}g}}  {{:{:d}g}}  {{:{:d}g}}  {{:{:d}g}}".format(
+    fmt = "## {{:{:d}s}}  {{:{:d}g}}  {{:{:d}.2f}}  {{:{:d}g}}  {{:{:d}g}}  {{:{:d}g}}  {{:{:d}g}}".format(
         *map(len, headings)
     )
     printed_heading = False
@@ -31,20 +32,21 @@ def print_info(*args):
 def test_stack_usage(selenium, print_info):
     res = selenium.run_js(
         """
-        window.measure_available_js_stack_depth = () => {
+        self.measure_available_js_stack_depth = () => {
             let depth = 0;
             function recurse() { depth += 1; recurse(); }
             try { recurse(); } catch (err) { }
             return depth;
         };
+        let py_limit = pyodide.runPython("import sys; sys.getrecursionlimit()");
         let py_usage = pyodide.runPython(`
             from js import measure_available_js_stack_depth
             def recurse(n):
                 return measure_available_js_stack_depth() if n==0 else recurse(n-1)
             (recurse(0)-recurse(100))/100
         `);
         let js_depth = measure_available_js_stack_depth();
-        window.py_depth = [0];
+        self.py_depth = [0];
         try {
         pyodide.runPython(`
         import sys
@@ -59,6 +61,7 @@ def infiniterecurse():
 
         py_depth = py_depth[0];
         return [
+            py_limit,
             py_usage,
             js_depth,
             py_depth,