Merge branch 'master' into eval-metadata

Author: flying-sheep

.github/workflows/tests.yml

@@ -28,25 +28,35 @@ jobs:
             python-version: "3.12"
             sphinx: "~=8.0"
             myst-parser: "~=4.0"
+            pillow: "==11.0.0"
           - os: macos-latest
             python-version: "3.12"
             sphinx: "~=8.0"
             myst-parser: "~=4.0"
+            pillow: "==11.0.0"
+          - os: ubuntu-latest
+            python-version: "3.12"
+            sphinx: "~=8.0"
+            myst-parser: "~=4.0"
+            pillow: "==11.0.0"
           # Oldest known-compatible dependencies
           - os: ubuntu-latest
             python-version: "3.9"
             sphinx: "==5.0.0"
             myst-parser: "==1.0.0"
+            pillow: "==11.0.0"
           # Mid-range dependencies
           - os: ubuntu-latest
             python-version: "3.11"
             sphinx: "==7.0.0"
             myst-parser: "==3.0.0"
+            pillow: "==11.0.0"
           # Newest known-compatible dependencies
           - os: ubuntu-latest
             python-version: "3.12"
             sphinx: "==8.0.2"
             myst-parser: "==4.0.0"
+            pillow: "==11.0.0"
 
     runs-on: ${{ matrix.os }}
 
@@ -61,11 +71,7 @@ jobs:
     - name: Install myst-nb with Sphinx ${{ matrix.sphinx }}
       shell: bash
       run: |
-        # Temporary: for python 3.13 we need the nightly pyarrow wheels
-        if [[ ${{ matrix.python-version }} == '3.13' ]] ; then
-          PIP_EXTRA_INDEX_URL=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple pip install --pre pyarrow
-        fi
-        pip install --upgrade "Sphinx${{ matrix.sphinx }}" "myst-parser${{ matrix.myst-parser }}" -e .[testing]
+        pip install --upgrade "Sphinx${{ matrix.sphinx }}" "myst-parser${{ matrix.myst-parser }}" "pillow${{ matrix.pillow }}" -e .[testing]
         pip freeze
 
     - name: Run pytest

.readthedocs.yml

@@ -14,5 +14,6 @@ python:
       - requirements: docs/requirements.txt
 
 sphinx:
+  configuration: docs/conf.py
   builder: html
   fail_on_warning: true

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Change Log
 
+## v1.2.0 - 2025-02-07
+
+([full changelog](https://github.com/executablebooks/MyST-NB/compare/v1.1.2...v1.2.0))
+
+### Enhancements made
+
+- ENH: Support translated notebooks by @OriolAbril in https://github.com/executablebooks/MyST-NB/pull/600
+
+### Bugs Fixed
+
+- BUG: using rstrip to preserve indents by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/637
+- FIX: fix path suffix condition in core/read.py by @je-cook in https://github.com/executablebooks/MyST-NB/pull/641
+
+### Maintenance and upkeep improvements
+
+- DOCS: adding changelog for 1.1.2 by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/638
+- MAINT: adding python 3.13 to CI and classifiers by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/635
+- CI: adding devdeps testing and cron and workflow dispatch by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/639
+- TST: fail on warnings by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/647
+- add `configuration` key to readthedocs.yml by @sneakers-the-rat in https://github.com/executablebooks/MyST-NB/pull/657
+- MAINT: fix CI in prep for release by @bsipocz in https://github.com/executablebooks/MyST-NB/pull/659
+
+### Other merged PRs
+
+- [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in https://github.com/executablebooks/MyST-NB/pull/569
+- Revert "[pre-commit.ci] pre-commit autoupdate" by @agoose77 in https://github.com/executablebooks/MyST-NB/pull/642
+
+### New Contributors
+- @sneakers-the-rat made their first contribution in https://github.com/executablebooks/MyST-NB/pull/657
+
+([GitHub contributors page for this release](https://github.com/executablebooks/MyST-NB/graphs/contributors?from=2024-09-24&to=2025-02-07&type=c))
+
+
 ## v1.1.2 - 2024-09-24
 
 ([full changelog](https://github.com/executablebooks/MyST-NB/compare/v1.1.1...c6a2d4b61205c2b20943391a656f01a4cc446076))

docs/render/format_code_cells.md

@@ -84,17 +84,18 @@ This can be set to:
 (render/output/group-stderr-stdout)=
 ### Group into single streams
 
-Cells may print multiple things to `stdout` and `stderr`.
+Cells may print multiple things to `stdout` (and/or to `stderr`).
 For example, if a cell prints status updates throughout its execution, each of these is often printed to `stdout`.
 By default, these outputs may be split across multiple items, and will be rendered as separate "chunks" in your built documentation.
 
-If you'd like each of the outputs in `stderr` and `stdout` to be merged into a single stream for each, use the following configuration:
+If you'd like each of the outputs in `stdout` to be merged into a single stream for each, use the following configuration (see {ref}`config/intro`):
 
 ```python
 nb_merge_streams = True
 ```
 
-This will ensure that all `stderr` and `stdout` outputs are merged into a single group.
+This will ensure that all `stdout` outputs are merged into a single group; likewise, all
+`stderr` outputs will be merged into single (separate) group.
 This also makes cell outputs more deterministic.
 Normally, slight differences in timing may result in different orders of `stderr` and `stdout` in the cell output, while this setting will sort them properly.
 

myst_nb/__init__.py

@@ -1,5 +1,5 @@
 """A docutils/sphinx parser for Jupyter Notebooks."""
-__version__ = "1.1.2"
+__version__ = "1.2.0"
 
 
 def setup(app):

myst_nb/core/config.py

@@ -285,7 +285,7 @@ def __post_init__(self):
         default=False,
         metadata={
             "validator": instance_of(bool),
-            "help": "Merge stdout/stderr execution output streams",
+            "help": "Merge all stdout execution output streams; same with stderr",
             "sections": (
                 Section.global_lvl,
                 Section.file_lvl,