Some package fixes

packages/astropy/meta.yaml

@@ -18,7 +18,6 @@ requirements:
     - packaging
     - numpy
   run:
-    - distutils
     - packaging
     - numpy
     - pyerfa

packages/bokeh/meta.yaml

@@ -5,7 +5,6 @@ package:
     - bokeh
 requirements:
   run:
-    - distutils
     - numpy
     - Jinja2
     - pandas

packages/cytoolz/meta.yaml

@@ -1,14 +1,13 @@
 package:
   name: cytoolz
-  version: 0.12.2
+  version: 0.12.3
   top-level:
     - cytoolz
 source:
-  sha256: 31d4b0455d72d914645f803d917daf4f314d115c70de0578d3820deb8b101f66
-  url: https://files.pythonhosted.org/packages/a0/61/c27e1e7007e3cc6989053956dfe078db84e164f22c7000b2ad1efc5b93b7/cytoolz-0.12.2.tar.gz
+  sha256: 4503dc59f4ced53a54643272c61dc305d1dbbfbd7d6bdf296948de9f34c3a282
+  url: https://files.pythonhosted.org/packages/70/d8/8df71050b214686591241a1826d2e6934b5c295c5bc57f643e4ed697f1eb/cytoolz-0.12.3.tar.gz
 requirements:
   run:
-    - nose
     - toolz
 about:
   home: https://github.com/pytoolz/cytoolz

packages/hashlib/test_hashlib.py

@@ -3,15 +3,16 @@
 
 @run_in_pyodide(packages=["test", "hashlib"], pytest_assert_rewrites=False)
 def test_hashlib(selenium):
-    from test import libregrtest  # type:ignore[attr-defined]
+    from test.libregrtest.main import main
 
     name = "test_hashlib"
     ignore_tests = [
         "*threaded*",
     ]
+    match_tests = [[pat, False] for pat in ignore_tests]
 
     try:
-        libregrtest.main([name], ignore_tests=ignore_tests, verbose=True, verbose3=True)
+        main([name], match_tests=match_tests, verbose=True, verbose3=True)
     except SystemExit as e:
         if e.code != 0:
             raise RuntimeError(f"Failed with code: {e.code}") from None
@@ -69,4 +70,4 @@ def test_hashlib_algorithms(selenium):
         assert openssl_algorithm in algorithms_available
 
     for algorithm in algorithms_available:
-        hashlib.new(algorithm).digest_size
+        hashlib.new(algorithm).digest_size  # noqa: B018

packages/joblib/meta.yaml

@@ -4,10 +4,6 @@ package:
   top-level:
     - joblib
 
-requirements:
-  run:
-    - distutils
-
 source:
   url: https://files.pythonhosted.org/packages/15/0f/d3b33b9f106dddef461f6df1872b7881321b247f3d255b87f61a7636f7fe/joblib-1.3.2.tar.gz
   sha256: 92f865e621e17784e7955080b6d042489e3b8e294949cc44c6eac304f59772b1

packages/logbook/meta.yaml

@@ -9,7 +9,6 @@ source:
 
 requirements:
   host:
-    - distutils
     - setuptools
 
 build:

packages/mne/meta.yaml

@@ -8,7 +8,6 @@ source:
   url: https://files.pythonhosted.org/packages/2e/80/980597b020ec2526c22f510ddc7ad595f13d0fd9f27b5aa75c4841c1fb62/mne-1.5.0-py3-none-any.whl
 requirements:
   run:
-    - distutils
     - numpy
     - scipy
     - setuptools

packages/pydecimal/test_pydecimal.py

@@ -3,7 +3,7 @@
 
 @run_in_pyodide(packages=["test", "pydecimal"], pytest_assert_rewrites=False)
 def test_pydecimal(selenium):
-    from test import libregrtest  # type:ignore[attr-defined]
+    from test.libregrtest.main import main
 
     name = "test_decimal"
 
@@ -12,8 +12,10 @@ def test_pydecimal(selenium):
         "test_none_args",  # Some context issue?
         "test_threading",
     ]
+    match_tests = [[pat, False] for pat in ignore_tests]
+
     try:
-        libregrtest.main([name], ignore_tests=ignore_tests, verbose=True, verbose3=True)
+        main([name], match_tests=match_tests, verbose=True, verbose3=True)
     except SystemExit as e:
         if e.code != 0:
             raise RuntimeError(f"Failed with code: {e.code}") from None

packages/pywavelets/meta.yaml

@@ -11,7 +11,6 @@ requirements:
   host:
     - numpy
   run:
-    - distutils
     - numpy
     - matplotlib
     - scipy

packages/setuptools/meta.yaml

@@ -13,7 +13,6 @@ build:
     find $WHEELDIR -name '*.exe' -delete
 requirements:
   run:
-    - distutils
     - pyparsing
 about:
   home: https://github.com/pypa/setuptools

packages/sparseqr/meta.yaml

@@ -16,7 +16,6 @@ requirements:
     - numpy
     - scipy
     - suitesparse
-    - distutils
   host:
     - suitesparse
 build:

packages/ssl/test_ssl.py

@@ -6,7 +6,7 @@ def test_ssl(selenium):
     import platform
     import unittest
     import unittest.mock
-    from test import libregrtest  # type:ignore[attr-defined]
+    from test.libregrtest.main import main
 
     platform.platform(aliased=True)
     name = "test_ssl"
@@ -19,15 +19,14 @@ def test_ssl(selenium):
         "test_lib_reason",
         "test_unwrap",
     ]
+    match_tests = [[pat, False] for pat in ignore_tests]
 
     try:
         with unittest.mock.patch(
             "test.support.socket_helper.bind_port",
             side_effect=unittest.SkipTest("nope!"),
         ):
-            libregrtest.main(
-                [name], ignore_tests=ignore_tests, verbose=True, verbose3=True
-            )
+            main([name], match_tests=match_tests, verbose=True, verbose3=True)
     except SystemExit as e:
         if e.code != 0:
             raise RuntimeError(f"Failed with code: {e.code}") from None

packages/statsmodels/meta.yaml

@@ -19,7 +19,6 @@ requirements:
     - pandas
     - patsy
   run:
-    - distutils
     - numpy
     - scipy
     - pandas

packages/sympy/meta.yaml

@@ -6,7 +6,6 @@ package:
     - sympy
 requirements:
   run:
-    - distutils
     - mpmath
 source:
   sha256: c3588cd4295d0c0f603d0f2ae780587e64e2efeedb3521e46b9bb1d08d184fa5

packages/test/meta.yaml

@@ -11,7 +11,7 @@ source:
 build:
   type: cpython_module
   script: |
-    set -x
+    cat $(PYODIDE_ROOT)/cpython/patches/* | patch -p1
     export TEST_EXTENSIONS="\
       _testinternalcapi.so \
       _testbuffer.so \

packages/wrapt/test_wrapt.py

@@ -79,5 +79,5 @@ def _function(*args, **kwargs):
             self.assertEqual(result, (_args, _kwargs))
 
     # Run tests
-    with unittest.TestCase().assertRaisesRegex(SystemExit, "False"):
+    with unittest.TestCase().assertRaisesRegex(SystemExit, 5):
         unittest.main()

pyodide-build/pyodide_build/tests/_test_recipes/joblib/meta.yaml

@@ -2,10 +2,6 @@ package:
   name: joblib
   version: 1.1.0
 
-requirements:
-  run:
-    - distutils
-
 source:
   url: https://files.pythonhosted.org/packages/92/b9/9e3616e7e00c8165fb25175c53444533bdde05f3e974d45d9fcbbe451ee6/joblib-1.1.0.tar.gz
   sha256: 4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35

pyodide-build/pyodide_build/tests/_test_recipes/micropip/meta.yaml

@@ -5,7 +5,6 @@ requirements:
   run:
     - pyparsing
     - packaging
-    - distutils # TODO: remove once there is a release with https://github.com/pypa/packaging/pull/396
 source:
   path: src
 test:

src/js/README.md

@@ -28,8 +28,6 @@ hello_python().then((result) => {
 
 ```
 $ node hello_python.js
-Loading distutils
-Loaded distutils
 Python says that 1+1= 2
 ```
 
@@ -43,8 +41,6 @@ Type ".help" for more information.
 > const { loadPyodide } = require("pyodide");
 undefined
 > let pyodide = await loadPyodide();
-Loading distutils
-Loaded distutils
 undefined
 > await pyodide.runPythonAsync("1+1");
 2

src/tests/test_core_python.py

@@ -46,7 +46,7 @@ def test_cpython_core(main_test, selenium, request):
     if not isinstance(ignore_tests, list):
         raise Exception("Invalid python_tests.yaml entry: 'skip' should be a list")
 
-    selenium.load_package(["distutils", "test"])
+    selenium.load_package(["test"])
     try:
         selenium.run(
             dedent(