Merge pull request #2710 from Kodiologist/py3-15

Support Python 3.15

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, 3.14, pypy-3.11]
+        python: [3.9, '3.10', 3.11, 3.12, 3.13, 3.14, '>=3.15.0-beta.1', pypy-3.11]
         include:
           # To keep the overall number of runs low, we test Windows and MacOS
           # only on the latest CPython.

docs/cli.rst

@@ -64,3 +64,5 @@ hyc
 
     .. warning::
        ``hyc`` can execute arbitrary code (via macros, :hy:func:`eval-when-compile`, etc.). Don't give it untrusted input.
+
+In practice, ``hyc`` is rarely useful, because Hy produces bytecode automatically. It exists mostly for historical reasons, and may be removed in a future major release of Hy.

hy/compat.py

@@ -8,6 +8,7 @@
 PY3_12_6 = sys.version_info >= (3, 12, 6)
 PY3_13 = sys.version_info >= (3, 13)
 PY3_14 = sys.version_info >= (3, 14)
+PY3_15 = sys.version_info >= (3, 15)
 PYPY = platform.python_implementation() == "PyPy"
 
 

hy/importer.py

@@ -77,12 +77,19 @@ def _hy_code_from_file(filename, loader_type=None):
     return code
 
 
-def _get_code_from_file(run_name, fname=None, hy_src_check=lambda x: x.endswith(".hy")):
+def _get_code_from_file(*args, hy_src_check=lambda x: x.endswith(".hy")):
     """A patch of `runpy._get_code_from_file` that will also run and cache Hy
     code.
     """
-    if fname is None and run_name is not None:
-        fname = run_name
+
+    if hy.compat.PY3_15:
+        fname, module = args
+    elif hy.compat.PY3_12:
+        fname, = args
+    else:
+        run_name, fname = args
+        if fname is None and run_name is not None:
+            fname = run_name
 
     # Check for bytecode first.  (This is what the `runpy` version does!)
     with open(fname, "rb") as f:
@@ -97,7 +104,9 @@ def _get_code_from_file(run_name, fname=None, hy_src_check=lambda x: x.endswith(
                 # This code differs from `runpy`'s only in that we
                 # force decoding into UTF-8.
                 source = f.read().decode("utf-8")
-            code = compile(source, fname, "exec")
+            code = compile(
+                source, fname, "exec",
+                **(dict(module=module) if hy.compat.PY3_15 else {}))
 
     return code if hy.compat.PY3_12_6 else (code, fname)
 
@@ -113,7 +122,7 @@ def _could_be_hy_src(filename):
     )
 
 
-def _hy_source_to_code(self, data, path, _optimize=-1):
+def _hy_source_to_code(self, data, path, fullname=None, _optimize=-1):
     if _could_be_hy_src(path):
         if os.environ.get("HY_MESSAGE_WHEN_COMPILING"):
             print("Compiling", path, file=sys.stderr)
@@ -122,7 +131,10 @@ def _hy_source_to_code(self, data, path, _optimize=-1):
         with loader_module_obj(self) as module:
             data = hy_compile(hy_tree, module)
 
-    return _py_source_to_code(self, data, path, _optimize=_optimize)
+    return _py_source_to_code(
+        self, data, path,
+        _optimize=_optimize,
+        **(dict(fullname=fullname) if hy.compat.PY3_15 else {}))
 
 
 importlib.machinery.SourceFileLoader.source_to_code = _hy_source_to_code
@@ -132,9 +144,9 @@ def _hy_source_to_code(self, data, path, _optimize=-1):
     zipimport._zip_searchorder += ((".hy", False, False),)
     _py_compile_source = zipimport._compile_source
 
-    def _hy_compile_source(pathname, source):
+    def _hy_compile_source(pathname, source, module=None):
         if not pathname.endswith(".hy"):
-            return _py_compile_source(pathname, source)
+            return _py_compile_source(pathname, source, module)
         mname = f"<zip:{pathname}>"
         sys.modules[mname] = types.ModuleType(mname)
         return compile(

setup.py

@@ -37,7 +37,7 @@ def run(self):
     version='0.0.0',
     setup_requires=["wheel"] + requires,
     install_requires=requires,
-    python_requires=">= 3.9, < 3.15",
+    python_requires=">= 3.9, < 3.16",
     entry_points={
         "console_scripts": [
             "hy = hy.cmdline:hy_main",

tests/native_tests/repl.hy

@@ -121,7 +121,9 @@
   ; https://github.com/hylang/hy/issues/2004
   (assert (has
     (rt "(defn foo [/])\n(defn bar [a a])" 'err)
-    "SyntaxError: duplicate argument"))
+    "SyntaxError: duplicate "))
+      ; It may say "duplicate argument" or "duplicate parameter",
+      ; depending on the Python version.
   ; https://github.com/hylang/hy/issues/2014
   (setv err (rt "(defn foo []\n(import re *))" 'err))
   (assert (has err "SyntaxError: import * only allowed"))