Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update app dev tutorial to include Go and Java (backport #5038) #5041

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 22, 2024

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, the make 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.

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, the `make 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.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
(cherry picked from commit a1b3773)

# Conflicts:
#	Makefile
#	docs/requirements.txt
@mergify mergify bot added the conflicts label Oct 22, 2024
@mergify mergify bot requested a review from a team as a code owner October 22, 2024 04:04
Copy link
Author

mergify bot commented Oct 22, 2024

Cherry-pick of a1b3773 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

@mergify mergify bot requested a review from a team as a code owner October 22, 2024 04:04
@denyeart denyeart closed this Oct 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants