Merge pull request #2652 from Kodiologist/py-pi

Support Python 3.14

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

NEWS.rst

@@ -3,7 +3,7 @@
 Unreleased
 ======================================================================
 
-Supports Python 3.9 – Python 3.x
+Supports Python 3.9 – Python 3.14
 
 New Features
 ------------------------------
@@ -16,6 +16,7 @@ Bug Fixes
   `(except [] …)`, which catches all exceptions.
 * `(except [e []] …)` is now translated to Python correctly by `hy2py`.
 * Fixed a bug where logical ops starting with a `(setv …)` expression failed to compile.
+* A complex `imag` argument to `hy.models.Complex` is no longer allowed.
 
 1.0.0 ("Afternoon Review", released 2024-09-22)
 ======================================================================

docs/api.rst

@@ -1137,7 +1137,7 @@ Modules
 
        ;; Import several names from a single module.
        ;; Python: from os.path import exists, isdir as is_dir, isfile
-       (import os.path [exists  isdir :as dir?  isfile])
+       (import os.path [exists  isdir :as is-dir  isfile])
 
        ;; Import a module with an alias for the whole module.
        ;; Python: import sys as systest
@@ -1155,8 +1155,8 @@ Modules
        ;;     from math import *
        (import tests.resources [kwtest function-with-a-dash]
                os.path [exists
-                        isdir :as dir?
-                        isfile :as file?]
+                        isdir :as is-dir
+                        isfile :as is-file]
                sys :as systest
                math *)
 

docs/macros.rst

@@ -70,7 +70,7 @@ You don't need to always return a model because the compiler calls :hy:func:`hy.
 Arguments are always passed in as models. You can use quasiquotation (see :hy:func:`quasiquote`) to concisely define a model with partly literal and partly evaluated components::
 
     (defmacro set-to-2 [variable]
-     `(setv ~variable 2))
+      `(setv ~variable 2))
     (set-to-2 foobar)
     (print foobar)
 
@@ -160,19 +160,26 @@ By the way, despite the need for ``eval-and-compile``, extracting a lot of compl
 The important take-home big fat WARNING
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A typical macro should use only four kinds of names in its expansion: gensyms, core macros, objects that Python puts in scope by default (like its built-in functions), and ``hy`` and its attributes. It's possible to rebind nearly all these names, so surprise shadowing is still theoretically possible. Unfortunately, the only way to prevent these pathological rebindings from coming about is… don't do that. Don't make a new macro named ``setv`` or name a function argument ``type`` unless you're ready for every macro you call to break, the same way you wouldn't monkey-patch a built-in Python module without thinking carefully. This kind of thing is the responsibility of the macro caller; the macro writer can't do much to defend against it. There is at least a pragma :ref:`warn-on-core-shadow <warn-on-core-shadow>`, enabled by default, that causes ``defmacro`` and ``require`` to warn you if you give your new macro the same name as a core macro.
+A typical macro should use only names of these four kinds in its expansion:
+
+- gensyms
+- core macros
+- objects that Python puts in scope by default (like its built-in functions)
+- ``hy`` and its attributes
+
+It's possible to rebind nearly all these names, so surprise shadowing is still theoretically possible. Unfortunately, the only way to prevent these pathological rebindings from coming about is… don't do that. Don't make a new macro named ``setv`` or name a function parameter ``type`` unless you're ready for every macro you call to break, the same way you wouldn't monkey-patch a built-in Python module without thinking carefully. This kind of thing is the responsibility of the macro caller; the macro writer can't do much to defend against it. There is at least a pragma :ref:`warn-on-core-shadow <warn-on-core-shadow>`, enabled by default, that causes ``defmacro`` and ``require`` to warn you if you give your new macro the same name as a core macro.
 
 .. _reader-macros:
 
 Reader macros
 -------------
 
-Reader macros allow you to hook directly into Hy's parser to customize how text is parsed into models. They're defined with :hy:func:`defreader <hy.core.macros.defreader>`, or, like regular macros, brought in from other modules with :hy:func:`require`. Rather than receiving function arguments, a reader macro has access to a :py:class:`hy.HyReader` object named ``&reader``, which provides all the text-parsing logic that Hy uses to parse itself (see :py:class:`hy.HyReader` and its base class :py:class:`hy.Reader` for the available methods). A reader macro is called with the hash sign ``#``, and like a regular macro, it should return a model or something convertible to a model.
+Reader macros allow you to hook into Hy's parser to customize how text is parsed into models. They're defined with :hy:func:`defreader <hy.core.macros.defreader>`, or, like regular macros, brought in from other modules with :hy:func:`require`. Rather than receiving function arguments, a reader macro has access to a :py:class:`hy.HyReader` object named ``&reader``, which provides all the text-parsing logic that Hy uses to parse itself (see :py:class:`hy.HyReader` and its base class :py:class:`hy.Reader` for the available methods). A reader macro is called with the hash sign ``#``, and like a regular macro, it should return a model or something convertible to a model.
 
 The simplest kind of reader macro doesn't read anything::
 
     (defreader hi
-      `(print "Hello."))
+      '(print "Hello."))
 
     #hi #hi #hi
 
@@ -233,7 +240,7 @@ There are three scoped varieties of regular macro. First are **core macros**, wh
 
     (defmacro m []
       "This is a docstring."
-      `(print "Hello, world."))
+      '(print "Hello, world."))
     (print (in "m" _hy_macros))   ; => True
     (help (get-macro m))
     (m)                           ; => "Hello, world."

hy/core/macros.hy

@@ -1,7 +1,5 @@
-;;; Hy core macros
+"This file has the few core macros that are implemented in Hy instead of Python."
 
-;;; These macros form the hy language
-;;; They are automatically required in every module, except inside hy.core
 
 (defmacro cond [#* args]
   "Shorthand for a nested sequence of :hy:func:`if` forms, like an
@@ -121,7 +119,7 @@
         (help (get (local-macros) "m")))
       (f)
 
-  The equivalency is rough in the sense that ``local-macros`` returns a literal dictionary, not a preexisting object that Hy uses for resolving macro names. So, modifying the dictionary will have no effect.
+  The equivalency is rough in the sense that ``local-macros`` expands to a literal dictionary, not a preexisting object that Hy uses for resolving macro names. So, modifying the dictionary will have no effect.
 
   See also :hy:func:`get-macro <hy.core.macros.get-macro>`.]]
   (_local-macros _hy_compiler))

hy/models.py

@@ -343,7 +343,10 @@ def __new__(cls, num, *args, **kwargs):
 
 class Complex(Object, complex):
     """
-    Represents a literal floating-point complex number (:class:`complex`).
+    Represents a literal floating-point complex number (:class:`complex`). If
+    ``real`` is itself a :class:`complex` object, its imaginary part is extracted and
+    added to the imaginary part of the new model, but ``imag``, if provided, must be
+    real.
     """
 
     def __new__(cls, real, imag=0, *args, **kwargs):
@@ -354,6 +357,12 @@ def __new__(cls, real, imag=0, *args, **kwargs):
             if p2:
                 check_inf_nan_cap(p2, value.imag)
             return value
+        if isinstance(imag, complex):
+            raise TypeError("`imag` must be real")
+        if isinstance(real, complex):
+            # This is deprecated by Python 3.14's `complex`, so
+            # extract the imaginary part before passing through.
+            real, imag = real.real, imag + real.imag
         return super().__new__(cls, real, imag)
 
 

setup.py

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