diff --git a/CHANGELOG.md b/CHANGELOG.md index 067fc5e3..7d62be39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ Instructions: Add a subsection under `[Unreleased]` for additions, fixes, change ## [Unreleased] +### Fixed + +- Fix for fill-ins for Runestone builds +- Annotated prefigure diagrams in printouts now correctly hide instructions. + ## [2.38.1] - 2026-04-04 Includes updates to core through commit: [80f77ab](https://github.com/PreTeXtBook/pretext/commit/80f77abc530ebb9338b3fdfc8b349fdc2a919d4b) diff --git a/poetry.lock b/poetry.lock index 9bf47754..d90a6946 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand. [[package]] name = "annotated-types" @@ -17,6 +17,32 @@ type = "legacy" url = "https://pypi.org/simple" reference = "pypi-public" +[[package]] +name = "anyio" +version = "4.13.0" +description = "High-level concurrency and networking framework on top of asyncio or Trio" +optional = true +python-versions = ">=3.10" +groups = ["main"] +markers = "extra == \"homepage\" or extra == \"all\"" +files = [ + {file = "anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708"}, + {file = "anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc"}, +] + +[package.dependencies] +exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} +idna = ">=2.8" +typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""} + +[package.extras] +trio = ["trio (>=0.32.0)"] + +[package.source] +type = "legacy" +url = "https://pypi.org/simple" +reference = "pypi-public" + [[package]] name = "autocommand" version = "2.2.2" @@ -616,12 +642,12 @@ version = "1.2.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" -groups = ["dev"] -markers = "python_version == \"3.10\"" +groups = ["main", "dev"] files = [ {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, ] +markers = {main = "(extra == \"homepage\" or extra == \"all\") and python_version == \"3.10\"", dev = "python_version == \"3.10\""} [package.extras] test = ["pytest (>=6)"] @@ -1467,23 +1493,53 @@ reference = "pypi-public" [[package]] name = "networkx" -version = "2.8.8" +version = "3.4.2" description = "Python package for creating and manipulating graphs and networks" optional = true -python-versions = ">=3.8" +python-versions = ">=3.10" groups = ["main"] -markers = "extra == \"prefigure\" or extra == \"all\"" +markers = "python_version < \"3.13\" and (extra == \"prefigure\" or extra == \"all\")" files = [ - {file = "networkx-2.8.8-py3-none-any.whl", hash = "sha256:e435dfa75b1d7195c7b8378c3859f0445cd88c6b0375c181ed66823a9ceb7524"}, - {file = "networkx-2.8.8.tar.gz", hash = "sha256:230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e"}, + {file = "networkx-3.4.2-py3-none-any.whl", hash = "sha256:df5d4365b724cf81b8c6a7312509d0c22386097011ad1abe274afd5e9d3bbc5f"}, + {file = "networkx-3.4.2.tar.gz", hash = "sha256:307c3669428c5362aab27c8a1260aa8f47c4e91d3891f48be0141738d8d053e1"}, ] [package.extras] -default = ["matplotlib (>=3.4)", "numpy (>=1.19)", "pandas (>=1.3)", "scipy (>=1.8)"] -developer = ["mypy (>=0.982)", "pre-commit (>=2.20)"] -doc = ["nb2plots (>=0.6)", "numpydoc (>=1.5)", "pillow (>=9.2)", "pydata-sphinx-theme (>=0.11)", "sphinx (>=5.2)", "sphinx-gallery (>=0.11)", "texext (>=0.6.6)"] -extra = ["lxml (>=4.6)", "pydot (>=1.4.2)", "pygraphviz (>=1.9)", "sympy (>=1.10)"] -test = ["codecov (>=2.1)", "pytest (>=7.2)", "pytest-cov (>=4.0)"] +default = ["matplotlib (>=3.7)", "numpy (>=1.24)", "pandas (>=2.0)", "scipy (>=1.10,!=1.11.0,!=1.11.1)"] +developer = ["changelist (==0.5)", "mypy (>=1.1)", "pre-commit (>=3.2)", "rtoml"] +doc = ["intersphinx-registry", "myst-nb (>=1.1)", "numpydoc (>=1.8.0)", "pillow (>=9.4)", "pydata-sphinx-theme (>=0.15)", "sphinx (>=7.3)", "sphinx-gallery (>=0.16)", "texext (>=0.6.7)"] +example = ["cairocffi (>=1.7)", "contextily (>=1.6)", "igraph (>=0.11)", "momepy (>=0.7.2)", "osmnx (>=1.9)", "scikit-learn (>=1.5)", "seaborn (>=0.13)"] +extra = ["lxml (>=4.6)", "pydot (>=3.0.1)", "pygraphviz (>=1.14)", "sympy (>=1.10)"] +test = ["pytest (>=7.2)", "pytest-cov (>=4.0)"] + +[package.source] +type = "legacy" +url = "https://pypi.org/simple" +reference = "pypi-public" + +[[package]] +name = "networkx" +version = "3.6" +description = "Python package for creating and manipulating graphs and networks" +optional = true +python-versions = ">=3.11" +groups = ["main"] +markers = "python_version >= \"3.13\" and (extra == \"prefigure\" or extra == \"all\")" +files = [ + {file = "networkx-3.6-py3-none-any.whl", hash = "sha256:cdb395b105806062473d3be36458d8f1459a4e4b98e236a66c3a48996e07684f"}, + {file = "networkx-3.6.tar.gz", hash = "sha256:285276002ad1f7f7da0f7b42f004bcba70d381e936559166363707fdad3d72ad"}, +] + +[package.extras] +benchmarking = ["asv", "virtualenv"] +default = ["matplotlib (>=3.8)", "numpy (>=1.25)", "pandas (>=2.0)", "scipy (>=1.11.2)"] +developer = ["mypy (>=1.15)", "pre-commit (>=4.1)"] +doc = ["intersphinx-registry", "myst-nb (>=1.1)", "numpydoc (>=1.8.0)", "pillow (>=10)", "pydata-sphinx-theme (>=0.16)", "sphinx (>=8.0)", "sphinx-gallery (>=0.18)", "texext (>=0.6.7)"] +example = ["cairocffi (>=1.7)", "contextily (>=1.6)", "igraph (>=0.11)", "iplotx (>=0.9.0)", "momepy (>=0.7.2)", "osmnx (>=2.0.0)", "scikit-learn (>=1.5)", "seaborn (>=0.13)"] +extra = ["lxml (>=4.6)", "pydot (>=3.0.1)", "pygraphviz (>=1.14)", "sympy (>=1.10)"] +release = ["build (>=0.10)", "changelist (==0.5)", "twine (>=4.0)", "wheel (>=0.40)"] +test = ["pytest (>=7.2)", "pytest-cov (>=4.0)", "pytest-xdist (>=3.0)"] +test-extras = ["pytest-mpl", "pytest-randomly"] [package.source] type = "legacy" @@ -1969,22 +2025,22 @@ reference = "pypi-public" [[package]] name = "prefig" -version = "0.5.13" +version = "0.5.14" description = "An authoring system for mathematical diagrams" optional = true python-versions = ">=3.10,<4.0" groups = ["main"] markers = "extra == \"prefigure\" or extra == \"all\"" files = [ - {file = "prefig-0.5.13-py3-none-any.whl", hash = "sha256:292cd3555bdd2bd238a486e5fe5ffd4c3e54f7b7339480112a150b3eec83834f"}, - {file = "prefig-0.5.13.tar.gz", hash = "sha256:0c8163ff9bd90f783eeec912935e621cb13cac5f06907a1d8d1228becb4edd94"}, + {file = "prefig-0.5.14-py3-none-any.whl", hash = "sha256:4825f341480a5b18db9775d0fa997be5d589e69c3a7eb4a3bf0c316de136f3ec"}, + {file = "prefig-0.5.14.tar.gz", hash = "sha256:40324fc2370fcade40d12b1361037e7da3cf79666905f6142ae33757a635105f"}, ] [package.dependencies] click = ">=8.1.7,<9.0.0" click-log = ">=0.4.0,<0.5.0" lxml = ">=6,<7" -networkx = ">=2.5,<3.0" +networkx = ">=3.0,<4.0" numpy = [ {version = ">=1.26,<2.0", markers = "python_version < \"3.13\""}, {version = ">=2.1.0,<3.0.0", markers = "python_version >= \"3.13\""}, @@ -3153,15 +3209,21 @@ reference = "pypi-public" [[package]] name = "urllib3" version = "2.2.3" -description = "" +description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = "*" +python-versions = ">=3.8" groups = ["main"] files = [ {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"}, {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"}, ] +[package.extras] +brotli = ["brotli (>=1.0.9) ; platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\""] +h2 = ["h2 (>=4,<5)"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] + [package.source] type = "legacy" url = "https://pypi.org/simple" @@ -3223,9 +3285,9 @@ reference = "pypi-public" [[package]] name = "watchfiles" version = "0.24.0" -description = "" +description = "Simple, modern and high performance file watching and code reload in python." optional = true -python-versions = "*" +python-versions = ">=3.8" groups = ["main"] markers = "extra == \"homepage\" or extra == \"all\"" files = [ @@ -3314,6 +3376,9 @@ files = [ {file = "watchfiles-0.24.0.tar.gz", hash = "sha256:afb72325b74fa7a428c009c1b8be4b4d7c2afedafb2982827ef2156646df2fe1"}, ] +[package.dependencies] +anyio = ">=3.0.0" + [package.source] type = "legacy" url = "https://pypi.org/simple" @@ -3471,4 +3536,4 @@ prefigure = ["prefig"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "86637dbe9988e3ee274264a1f655662ddac8fd2970849b512fcf1323d30bd840" +content-hash = "a23f1f822065def366bcfd6c105f2de9588108357e98344570e50c3bcc24c0dc" diff --git a/pretext/__init__.py b/pretext/__init__.py index 27f7bdff..0a97d659 100644 --- a/pretext/__init__.py +++ b/pretext/__init__.py @@ -19,7 +19,7 @@ VERSION = get_version("pretext", Path(__file__).parent.parent) -CORE_COMMIT = "80f77abc530ebb9338b3fdfc8b349fdc2a919d4b" +CORE_COMMIT = "22c2cd36f996308ae16df2b77aa60ee9af5a8e69" def activate() -> None: diff --git a/pyproject.toml b/pyproject.toml index 1a888e1e..f6b1e8d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ plastex = "^3" jinja2 = "^3" coloraide = "^4" pelican = { extras = ["markdown"], version = "^4.10", optional = true } -prefig = { extras = ["text"], version = "^0.5.13", optional = true } +prefig = { extras = ["text"], version = "^0.5.14", optional = true } citeproc-py = "^0"