Merge pull request #2644 from Kodiologist/no-pyodide-testing

Remove Pyodide testing

Author: Kodiologist

.github/workflows/tests.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         name-prefix: ['']
         os: [ubuntu-latest]
-        python: [3.9, '3.10', 3.11, 3.12, 3.13, pypy-3.10, pyodide]
+        python: [3.9, '3.10', 3.11, 3.12, 3.13, pypy-3.10]
         include:
           # To keep the overall number of runs low, we test Windows and MacOS
           # only on the latest CPython.
@@ -34,36 +34,20 @@ jobs:
     steps:
     - run: git config --global core.autocrlf false
     - uses: actions/checkout@v4
-    - if: matrix.python != 'pyodide'
-      uses: actions/setup-python@v5
+    - uses: actions/setup-python@v5
       with:
           python-version: ${{ matrix.python }}
-    - if: matrix.python == 'pyodide'
-      uses: actions/setup-python@v5
-      with: {python-version: 3.12}
-    - if: matrix.python == 'pyodide'
-      uses: actions/setup-node@v4
     - name: Install
       shell: bash
       run: |
-        if [[ ${{ matrix.python }} = pyodide ]] ; then
-            npm install pyodide
-            pip install pyodide-build
-            pyodide venv .venv-pyodide
-            source .venv-pyodide/bin/activate
-        fi
         pip install .
         rm -r hy
           # We want to be sure we're testing the installed version,
           # instead of running from the source tree.
         pip install pytest
     - name: Test
       shell: bash
-      run: |
-        if [[ ${{ matrix.python }} = pyodide ]] ; then
-            source .venv-pyodide/bin/activate
-        fi
-        python -m pytest tests
+      run: python -m pytest tests
 
   docs:
     # Try building the manual, ensuring that Sphinx doesn't produce

docs/api.rst

@@ -663,7 +663,7 @@ Comprehensions
    The last argument of ``for`` can be an ``(else …)`` form. This form is
    executed after the last iteration of the ``for``\'s outermost iteration
    clause, but only if that outermost loop terminates normally. If it's jumped
-   out of with e.g. ``break``, the ``else`` is ignored. ::
+   out of with e.g. :hy:func:`break`, the ``else`` is ignored. ::
 
      (for [x [1 2 3]]
        (print x)

docs/conf.py

@@ -24,7 +24,7 @@
   # Ultimately this will only appear on the page itself. The actual HTML title
   # will be simplified in post-processing.
 
-hyrule_version = 'v0.8.0'
+hyrule_version = 'v1.0.0'
 
 source_suffix = '.rst'
 master_doc = 'index'

docs/macros.rst

@@ -119,7 +119,7 @@ A better approach is to use :hy:func:`hy.gensym` to choose your variable name::
         (setv ~g (.upper ~arg))
         (+ ~g ~g)))
 
-Hyrule provides some macros that make using gensyms more convenient, like :hy:func:`defmacro! <hyrule.defmacro!>` and :hy:func:`with-gensyms <hyrule.with-gensyms>`.
+Hyrule provides some macros that make using gensyms more convenient, like :hy:func:`defmacro! <hyrule.defmacro!>` and :hy:func:`def-gensyms <hyrule.def-gensyms>`.
 
 On the other hand, you can write a macro that advertises a specific name (or set of names) as part of its interface. For example, Hyrule's `anaphoric macro <https://en.wikipedia.org/wiki/Anaphoric_macro>`_ :hy:func:`ap-if <hyrule.ap-if>` assigns the result of a test form to ``it``, and allows the caller to include forms that refer to ``it``::
 

docs/versioning.rst

@@ -4,6 +4,6 @@ Versioning and compatibility
 
 Starting with Hy 1.0.0, Hy is `semantically versioned <https://semver.org>`_. Refer to `the NEWS file <https://github.com/hylang/hy/blob/master/NEWS.rst>`_ for a summary of user-visible changes brought on by each version, and how to update your code in case of breaking changes. Be sure you're reading the version of this manual (shown at the top of each page) that matches the version of Hy you're running.
 
-Hy is tested on `all released and currently maintained versions of CPython <https://devguide.python.org/versions>`_ (on Linux, Windows, and Mac OS), and on recent versions of `PyPy <https://pypy.org>`_ and `Pyodide <https://pyodide.org>`_. We usually find that for Hy, unlike most Python packages, we need to change things to fully support each new 3.x release of Python. We may drop compatibility with a version of Python after the CPython guys cease maintaining it. Note that we construe such a change as non-breaking, so we won't bump Hy's major version for it. But we will at least bump the minor version, and ``python_requires`` in Hy's ``setup.py`` should prevent you from installing a Hy version that won't work with your Python version.
+Hy is tested on `all released and currently maintained versions of CPython <https://devguide.python.org/versions>`_ (on Linux, Windows, and Mac OS), and on recent versions of `PyPy <https://pypy.org>`_. (`Pyodide <https://pyodide.org>`_ is also supported, as for `Try Hy <http://hylang.org/try-hy>`_, but is no longer tested, since the testing infrastructure was a maintenance burden and failed to reveal any compatibility issues in Hy itself.) We usually find that for Hy, unlike most Python packages, we need to change things to fully support each new 3.x release of Python. We may drop compatibility with a version of Python after the CPython guys cease maintaining it. Note that we construe such a change as non-breaking, so we won't bump Hy's major version for it. But we will at least bump the minor version, and ``python_requires`` in Hy's ``setup.py`` should prevent you from installing a Hy version that won't work with your Python version.
 
 Starting with Hy 1.0.0, each version of Hy also has a nickname, such as "Afternoon Review". Nicknames are used in alphabetical order, with a nickname starting with "Z" then wrapping around to "A". Nicknames are provided mostly for the amusement of the maintainer, but can be useful as a conspicuous sign that you're not using the version you expected. In code, you can get the current nickname as a string (or ``None``, for unreleased commits of Hy) with ``hy.nickname``.

hy/compat.py

@@ -8,7 +8,6 @@
 PY3_12_6 = sys.version_info >= (3, 12, 6)
 PY3_13 = sys.version_info >= (3, 13)
 PYPY = platform.python_implementation() == "PyPy"
-PYODIDE = platform.system() == "Emscripten"
 
 
 if "def" in ast.unparse(ast.parse("𝕕𝕖𝕗 = 1")):

hy/core/util.hy

@@ -82,7 +82,7 @@
 
   An exceptional case is if the macro is a core macro that returns one of Hy's internal compiler result objects instead of a real model. Then, you just get the original back, as if the macro hadn't been expanded.
 
-  The optional arguments ``module`` and ``macros`` can be provided to control where macros are looked up, as with :hy:func:`hy.eval`.
+  As with :hy:func:`hy.eval`, the optional arguments ``module`` and ``macros`` can be provided to control where macros are looked up, and local macros are invisible unless provided via e.g. ``:macros (local-macros)``.
 
   See also :hy:func:`hy.macroexpand`."
   (_macroexpand model (or module (calling-module)) macros :once True))

tests/importer/test_importer.py

@@ -18,7 +18,7 @@ def test_basics():
     "Make sure the basics of the importer work"
 
     resources_mod = importlib.import_module("tests.resources")
-    assert hasattr(resources_mod, "can_test_async")
+    assert resources_mod.in_init == "chippy"
 
     bin_mod = importlib.import_module("tests.resources.bin")
     assert hasattr(bin_mod, "_null_fn_for_import_test")

tests/native_tests/comprehensions.hy

@@ -1,8 +1,7 @@
 (import
   types
   asyncio
-  pytest
-  tests.resources [async-test])
+  pytest)
 
 
 (defn test-comprehension-types []
@@ -386,7 +385,7 @@
   (assert (= x 3)))
 
 
-(defn [async-test] test-for-async []
+(defn test-for-async []
   (defn :async numbers []
     (for [i [1 2]]
       (yield i)))
@@ -399,7 +398,7 @@
       (assert (= x 3))))))
 
 
-(defn [async-test] test-for-async-else []
+(defn test-for-async-else []
   (defn :async numbers []
     (for [i [1 2]]
       (yield i)))

tests/native_tests/decorators.hy

@@ -1,6 +1,5 @@
 (import
-  asyncio
-  tests.resources [async-test])
+  asyncio)
 
 
 (defn test-decorated-1line-function []
@@ -53,7 +52,7 @@
   (assert (= l ["dec" "arg" "foo" "foo fn" "bar body" 1])))
 
 
-(defn [async-test] test-decorated-defn-a []
+(defn test-decorated-defn-a []
   (defn decorator [func] (fn :async [] (/ (await (func)) 2)))
 
   (defn :async [decorator] coro-test []

tests/native_tests/functions.hy

@@ -3,8 +3,7 @@
 (import
   asyncio
   typing [List]
-  pytest
-  tests.resources [async-test])
+  pytest)
 
 
 (defn test-fn []
@@ -25,7 +24,7 @@
   (assert (= (fn-test) None)))
 
 
-(defn [async-test] test-fn-async []
+(defn test-fn-async []
   (assert (= (asyncio.run ((fn :async [] (await (asyncio.sleep 0)) [1 2 3])))
              [1 2 3])))
 
@@ -182,14 +181,14 @@
     (setv x [#* spam]  y 1)))
 
 
-(defn [async-test] test-defn-async []
+(defn test-defn-async []
   (defn :async coro-test []
     (await (asyncio.sleep 0))
     [1 2 3])
   (assert (= (asyncio.run (coro-test)) [1 2 3])))
 
 
-(defn [async-test] test-no-async-gen-return []
+(defn test-no-async-gen-return []
   ; https://github.com/hylang/hy/issues/2523
   (defn :async runner [gen]
     (setv vals [])

tests/native_tests/import.hy

@@ -6,8 +6,7 @@
   os.path [exists isdir isfile]
   sys :as systest
   sys
-  pytest
-  hy.compat [PYODIDE])
+  pytest)
 
 
 (defn test-imported-bits []

tests/native_tests/with.hy

@@ -2,7 +2,6 @@
   asyncio
   unittest.mock [Mock]
   pytest
-  tests.resources [async-test]
   tests.resources.pydemo [AsyncWithTest async-exits])
 
 (defn test-context []
@@ -39,7 +38,7 @@
   (assert (= out [1 2 3]))
   (assert (= exits [4 3 2 1])))
 
-(defn [async-test] test-single-with-async []
+(defn test-single-with-async []
   (.clear async-exits)
   (setv out [])
   (asyncio.run
@@ -49,7 +48,7 @@
   (assert (= out [1]))
   (assert (= async-exits [1])))
 
-(defn [async-test] test-quince-with-async []
+(defn test-quince-with-async []
   (.clear async-exits)
   (setv out [])
   (asyncio.run
@@ -63,7 +62,7 @@
   (assert (= out [1 2 3]))
   (assert (= async-exits [4 3 2 1])))
 
-(defn [async-test] test-with-mixed-async []
+(defn test-with-mixed-async []
   (setv (cut exits) [])
   (setv out [])
   (asyncio.run

tests/resources/__init__.py

@@ -1,15 +1,7 @@
 import pytest
 
-from hy.compat import PYODIDE
-
 in_init = "chippy"
 
 
 def function_with_a_dash():
     pass
-
-
-can_test_async = not PYODIDE
-async_test = pytest.mark.skipif(
-    not can_test_async, reason="`asyncio.run` not implemented"
-)

tests/test_bin.py

@@ -11,13 +11,6 @@
 
 import pytest
 
-from hy.compat import PYODIDE
-
-if PYODIDE:
-    pytest.skip(
-        '`subprocess.Popen` not implemented on Pyodide',
-        allow_module_level = True)
-
 
 def pyr(s=""):
     return "hy --repl-output-fn=repr " + s

tests/test_hy2py.py

@@ -8,21 +8,17 @@
 
 import hy.importer
 from hy import mangle
-from hy.compat import PYODIDE
 
 
 def test_direct_import():
     import tests.resources.pydemo
-    from tests.resources import can_test_async
-    assert_stuff(tests.resources.pydemo, can_test_async)
+    assert_stuff(tests.resources.pydemo)
 
 
-@pytest.mark.skipif(PYODIDE, reason="subprocess.check_call not implemented on Pyodide")
 def test_hy2py_import():
     import contextlib
     import os
     import subprocess
-    from tests.resources import can_test_async
 
     path = "tests/resources/pydemo_as_py.py"
     env = dict(os.environ)
@@ -38,10 +34,10 @@ def test_hy2py_import():
     finally:
         with contextlib.suppress(FileNotFoundError):
             os.remove(path)
-    assert_stuff(m, can_test_async)
+    assert_stuff(m)
 
 
-def assert_stuff(m, can_test_async):
+def assert_stuff(m):
 
     # This makes sure that automatically imported builtins go after docstrings.
     assert m.__doc__ == "This is a module docstring."
@@ -168,10 +164,9 @@ class C:
     assert m.pys_accum == [0, 1, 2, 3, 4]
     assert m.py_accum == "01234"
 
-    if can_test_async:
-        m.async_exits.clear()
-        assert asyncio.run(m.coro()) == list("abcdef")
-        assert m.async_exits == ["b"]
+    m.async_exits.clear()
+    assert asyncio.run(m.coro()) == list("abcdef")
+    assert m.async_exits == ["b"]
 
     assert m.cheese == [1, 1]
     assert m.mac_results == ["x", "x"]