passagemath-docbuild 10.5.42__tar.gz → 10.6.1rc1__tar.gz

{passagemath_docbuild-10.5.42/passagemath_docbuild.egg-info → passagemath_docbuild-10.6.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: passagemath-docbuild
-Version: 10.5.42
+Version: 10.6.1rc1
 Summary: passagemath: Build system of the Sage documentation
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 Maintainer: Matthias Köppe, passagemath contributors
@@ -19,14 +19,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/x-rst
 Requires-Dist: sphinx<9,>=5.2
 
@@ -71,7 +70,7 @@ passagemath attempts to support all major Linux distributions and recent version
 macOS. Use on Windows currently requires the use of Windows Subsystem for Linux or
 virtualization.
 
-Complete sets of binary wheels are provided on PyPI for Python versions 3.9.x-3.12.x.
+Complete sets of binary wheels are provided on PyPI for Python versions 3.10.x-3.13.x.
 Python 3.13.x is also supported, but some third-party packages are still missing wheels,
 so compilation from source is triggered for those.
 

{passagemath_docbuild-10.5.42 → passagemath_docbuild-10.6.1rc1}/README.rst

@@ -39,7 +39,7 @@ passagemath attempts to support all major Linux distributions and recent version
 macOS. Use on Windows currently requires the use of Windows Subsystem for Linux or
 virtualization.
 
-Complete sets of binary wheels are provided on PyPI for Python versions 3.9.x-3.12.x.
+Complete sets of binary wheels are provided on PyPI for Python versions 3.10.x-3.13.x.
 Python 3.13.x is also supported, but some third-party packages are still missing wheels,
 so compilation from source is triggered for those.
 

passagemath_docbuild-10.6.1rc1/VERSION.txt

@@ -0,0 +1 @@
+10.6.1.rc1

{passagemath_docbuild-10.5.42 → passagemath_docbuild-10.6.1rc1/passagemath_docbuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: passagemath-docbuild
-Version: 10.5.42
+Version: 10.6.1rc1
 Summary: passagemath: Build system of the Sage documentation
 Author-email: The Sage Developers <sage-support@googlegroups.com>
 Maintainer: Matthias Köppe, passagemath contributors
@@ -19,14 +19,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/x-rst
 Requires-Dist: sphinx<9,>=5.2
 
@@ -71,7 +70,7 @@ passagemath attempts to support all major Linux distributions and recent version
 macOS. Use on Windows currently requires the use of Windows Subsystem for Linux or
 virtualization.
 
-Complete sets of binary wheels are provided on PyPI for Python versions 3.9.x-3.12.x.
+Complete sets of binary wheels are provided on PyPI for Python versions 3.10.x-3.13.x.
 Python 3.13.x is also supported, but some third-party packages are still missing wheels,
 so compilation from source is triggered for those.
 

{passagemath_docbuild-10.5.42 → passagemath_docbuild-10.6.1rc1}/pyproject.toml

@@ -26,7 +26,6 @@ classifiers = [
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -34,7 +33,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
-requires-python = ">=3.9, <3.14"
+requires-python = ">=3.10, <3.14"
 
 [project.urls]
 "release notes" = "https://github.com/passagemath/passagemath/releases"

{passagemath_docbuild-10.5.42 → passagemath_docbuild-10.6.1rc1}/sage_docbuild/conf.py

@@ -15,26 +15,25 @@ behavior.
 #                  https://www.gnu.org/licenses/
 # ****************************************************************************
 
-# Load configuration shared with sage.misc.sphinxify
-from sage.misc.sagedoc_conf import *
-
-import sys
+import importlib
 import os
 import re
-import importlib
+import sys
+
 import dateutil.parser
-import sphinx
-import sphinx.ext.intersphinx as intersphinx
+from IPython.lib.lexers import IPyLexer, IPythonConsoleLexer
 from sphinx import highlighting
+from sphinx.ext import intersphinx
 from sphinx.transforms import SphinxTransform
 from sphinx.util.docutils import SphinxDirective
-from IPython.lib.lexers import IPythonConsoleLexer, IPyLexer
-from sage.misc.sagedoc import extlinks
-from sage.env import SAGE_DOC_SRC, SAGE_DOC, PPLPY_DOCS, MATHJAX_DIR
-from sage.misc.latex_macros import sage_mathjax_macros
-from sage.features.sphinx import JupyterSphinx
-from sage.features.all import all_features
+
 import sage.version
+from sage.env import MATHJAX_DIR, PPLPY_DOCS, SAGE_DOC, SAGE_DOC_SRC
+from sage.features.all import all_features
+from sage.features.sphinx import JupyterSphinx
+from sage.misc.latex_macros import sage_mathjax_macros
+from sage.misc.sagedoc import extlinks as extlinks  # noqa: PLC0414
+from sage.misc.sagedoc_conf import *  # Load configuration shared with sage.misc.sphinxify
 
 # ---------------------
 # General configuration
@@ -377,8 +376,8 @@ copybutton_only_copy_prompt_lines = True
 
 # https://www.sphinx-doc.org/en/master/usage/extensions/linkcode.html
 def linkcode_resolve(domain, info):
-    import inspect
     from urllib.parse import quote
+
     from sage.misc.sageinspect import sage_getsourcelines
     if domain != 'py':
         return None
@@ -968,7 +967,10 @@ class SagecodeTransform(SphinxTransform):
         if self.app.builder.tags.has('html') or self.app.builder.tags.has('inventory'):
             for node in list(self.document.findall(nodes.literal_block)):
                 if node.get('language') is None and node.astext().startswith('sage:'):
-                    from docutils.nodes import container as Container, label as Label, literal_block as LiteralBlock, Text
+                    from docutils.nodes import Text
+                    from docutils.nodes import container as Container
+                    from docutils.nodes import label as Label
+                    from docutils.nodes import literal_block as LiteralBlock
                     from sphinx_inline_tabs._impl import TabContainer
                     parent = node.parent
                     index = parent.index(node)
@@ -1028,7 +1030,7 @@ class SagecodeTransform(SphinxTransform):
                             prev_node['classes'].append('with-python-tab')
                     if SAGE_LIVE_DOC == 'yes':
                         # Tab for Jupyter-sphinx cell
-                        from jupyter_sphinx.ast import JupyterCellNode, CellInputNode
+                        from jupyter_sphinx.ast import CellInputNode, JupyterCellNode
                         source = node.rawsource
                         lines = []
                         for line in source.splitlines():

{passagemath_docbuild-10.5.42 → passagemath_docbuild-10.6.1rc1}/sage_docbuild/ext/sage_autodoc.py

@@ -37,13 +37,14 @@ AUTHORS:
 - François Bissey (2024-09-10): Tweaks to support python 3.9 (and older sphinx) as well
 
 - François Bissey (2024-11-12): rebased on Sphinx 8.1.3 (while trying to keep python 3.9 compatibility)
+
+- François Bissey (2025-02-24): Remove python 3.9 support hacks, making us closer to upstream
 """
 
 from __future__ import annotations
 
 import functools
 import operator
-import sys
 import re
 from inspect import Parameter, Signature
 from typing import TYPE_CHECKING, Any, NewType, TypeVar
@@ -709,7 +710,7 @@ class Documenter:
 
         # add additional content (e.g. from document), if present
         if more_content:
-            for line, src in zip(more_content.data, more_content.items):
+            for line, src in zip(more_content.data, more_content.items, strict=True):
                 self.add_line(line, src[0], src[1])
 
     def get_object_members(self, want_all: bool) -> tuple[bool, list[ObjectMember]]:
@@ -1080,7 +1081,7 @@ class ModuleDocumenter(Documenter):
         super().add_content(None)
         self.indent = old_indent
         if more_content:
-            for line, src in zip(more_content.data, more_content.items):
+            for line, src in zip(more_content.data, more_content.items, strict=True):
                 self.add_line(line, src[0], src[1])
 
     @classmethod
@@ -1616,14 +1617,8 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
     def can_document_member(
         cls: type[Documenter], member: Any, membername: str, isattr: bool, parent: Any,
     ) -> bool:
-        # support both sphinx 8 and py3.9/older sphinx
-        try:
-            result_bool = isinstance(member, type) or (
-                isattr and isinstance(member, NewType | TypeVar))
-        except Exception:
-            result_bool = isinstance(member, type) or (
-                isattr and (inspect.isNewType(member) or isinstance(member, TypeVar)))
-        return result_bool
+        return isinstance(member, type) or (
+            isattr and isinstance(member, NewType | TypeVar))
 
     def import_object(self, raiseerror: bool = False) -> bool:
         ret = super().import_object(raiseerror)
@@ -1696,12 +1691,7 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
             # -------------------------------------------------------------------
             else:
                 self.doc_as_attr = True
-            # support both sphinx 8 and py3.9/older sphinx
-            try:
-                test_bool = isinstance(self.object, NewType | TypeVar)
-            except Exception:
-                test_bool = inspect.isNewType(self.object) or isinstance(self.object, TypeVar)
-            if test_bool:
+            if isinstance(self.object, NewType | TypeVar):
                 modname = getattr(self.object, '__module__', self.modname)
                 if modname != self.modname and self.modname.startswith(modname):
                     bases = self.modname[len(modname):].strip('.').split('.')
@@ -1710,12 +1700,7 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
         return ret
 
     def _get_signature(self) -> tuple[Any | None, str | None, Signature | None]:
-        # support both sphinx 8 and py3.9/older sphinx
-        try:
-            test_bool = isinstance(self.object, NewType | TypeVar)
-        except Exception:
-            test_bool = inspect.isNewType(self.object) or isinstance(self.object, TypeVar)
-        if test_bool:
+        if isinstance(self.object, NewType | TypeVar):
             # Suppress signature
             return None, None, None
 
@@ -1900,24 +1885,14 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
             self.directivetype = 'attribute'
         super().add_directive_header(sig)
 
-        # support both sphinx 8 and py3.9/older sphinx
-        try:
-            test_bool = isinstance(self.object, NewType | TypeVar)
-        except Exception:
-            test_bool = inspect.isNewType(self.object) or isinstance(self.object, TypeVar)
-        if test_bool:
+        if isinstance(self.object, NewType | TypeVar):
             return
 
         if self.analyzer and '.'.join(self.objpath) in self.analyzer.finals:
             self.add_line('   :final:', sourcename)
 
         canonical_fullname = self.get_canonical_fullname()
-        # support both sphinx 8 and py3.9/older sphinx
-        try:
-            newtype_test = isinstance(self.object, NewType)
-        except Exception:
-            newtype_test = inspect.isNewType(self.object)
-        if (not self.doc_as_attr and not newtype_test
+        if (not self.doc_as_attr and not isinstance(self.object, NewType)
                 and canonical_fullname and self.fullname != canonical_fullname):
             self.add_line('   :canonical: %s' % canonical_fullname, sourcename)
 
@@ -1969,28 +1944,6 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
         if isinstance(self.object, TypeVar):
             if self.object.__doc__ == TypeVar.__doc__:
                 return []
-        # ------------------------------------------------------------------
-        # This section is kept for compatibility with python 3.9
-        # see https://github.com/sagemath/sage/pull/38549#issuecomment-2327790930
-        if sys.version_info[:2] < (3, 10):
-            if inspect.isNewType(self.object) or isinstance(self.object, TypeVar):
-                parts = self.modname.strip('.').split('.')
-                orig_objpath = self.objpath
-                for i in range(len(parts)):
-                    new_modname = '.'.join(parts[:len(parts) - i])
-                    new_objpath = parts[len(parts) - i:] + orig_objpath
-                    try:
-                        analyzer = ModuleAnalyzer.for_module(new_modname)
-                        analyzer.analyze()
-                        key = ('', new_objpath[-1])
-                        comment = list(analyzer.attr_docs.get(key, []))
-                        if comment:
-                            self.objpath = new_objpath
-                            self.modname = new_modname
-                            return [comment]
-                    except PycodeError:
-                        pass
-        # ------------------------------------------------------------------
         if self.doc_as_attr:
             # Don't show the docstring of the class when it is an alias.
             if self.get_variable_comment():
@@ -2054,12 +2007,7 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):  # type:
             return None
 
     def add_content(self, more_content: StringList | None) -> None:
-        # support both sphinx 8 and py3.9/older sphinx
-        try:
-            newtype_test = isinstance(self.object, NewType)
-        except Exception:
-            newtype_test = inspect.isNewType(self.object)
-        if newtype_test:
+        if isinstance(self.object, NewType):
             if self.config.autodoc_typehints_format == "short":
                 supertype = restify(self.object.__supertype__, "smart")
             else:
@@ -3028,14 +2976,9 @@ class PropertyDocumenter(DocstringStripSignatureMixin,  # type: ignore[misc]
 
 def autodoc_attrgetter(app: Sphinx, obj: Any, name: str, *defargs: Any) -> Any:
     """Alternative getattr() for types"""
-    try:
-        for typ, func in app.registry.autodoc_attrgetters.items():
-            if isinstance(obj, typ):
-                return func(obj, name, *defargs)
-    except AttributeError:
-        for typ, func in app.registry.autodoc_attrgettrs.items():
-            if isinstance(obj, typ):
-                return func(obj, name, *defargs)
+    for typ, func in app.registry.autodoc_attrgetters.items():
+        if isinstance(obj, typ):
+            return func(obj, name, *defargs)
 
     return safe_getattr(obj, name, *defargs)
 

passagemath_docbuild-10.5.42/VERSION.txt

@@ -1 +0,0 @@
-10.5.42