Closed mergify[bot] closed 1 month ago
Cherry-pick of a1b3773a2cee96736538eb2459aa44cf82ac4836 has failed:
On branch mergify/bp/release-2.5/pr-5038
Your branch is up to date with 'origin/release-2.5'.
You are currently cherry-picking commit a1b3773a2.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: docs/source/conf.py
modified: docs/source/write_first_app.rst
modified: tox.ini
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: Makefile
both modified: docs/requirements.txt
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
This change uses (linked) tabs to display code snippets and language-specific commands for the user's desired programming language.
In order to use the sphinx-tabs extension, the version of Python used to build the docs had to be updated. Since the
n42org/tox
Docker image used had a very old Python version baked in, and there were no more recent versions available, themake docs
target now uses the official Python image. In addition to providing a much more current Python environment, this image natively supports arm64 in addition to amd64, allowing docs to be built on Apple Silicon Macs.This is an automatic backport of pull request #5038 done by Mergify.