Skip to content

RTD Previews: Get correct base branch for backports#150690

Merged
hugovk merged 1 commit into
python:mainfrom
StanFromIreland:rtd-preview-basebranch
Jun 21, 2026
Merged

RTD Previews: Get correct base branch for backports#150690
hugovk merged 1 commit into
python:mainfrom
StanFromIreland:rtd-preview-basebranch

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented May 31, 2026

Copy link
Copy Markdown
Member

It is currently hard-coded to main, so 3.15 backports don't get previews as the merge will always fail.

@StanFromIreland StanFromIreland requested review from webknjaz and zware May 31, 2026 19:51
StanFromIreland
StanFromIreland commented May 31, 2026
View reviewed changes
Comment thread .readthedocs.yml
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ];
then
base_branch=main;
base_branch=$(wget -qO- "https://api.github.com/repos/python/cpython/pulls/$READTHEDOCS_VERSION" | jq -er ".base.ref");

@StanFromIreland StanFromIreland May 31, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using READTHEDOCS_VERSION works because for PR builds it is the PR number.

StanFromIreland
StanFromIreland commented May 31, 2026
View reviewed changes
Comment thread .readthedocs.yml
tools:
python: "3"
apt_packages:
- jq

@StanFromIreland StanFromIreland May 31, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this PR's build, installing jq adds ~3 seconds to the total build time.

@StanFromIreland StanFromIreland mentioned this pull request May 31, 2026
Merged
@hugovk hugovk merged commit 082ac30 into python:main Jun 21, 2026
55 checks passed
@StanFromIreland StanFromIreland deleted the rtd-preview-basebranch branch June 21, 2026 17:29
@StanFromIreland StanFromIreland added the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Jun 21, 2026
@miss-islington-app

miss-islington-app Bot commented Jun 21, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.15.
🐍🍒⛏🤖

@bedevere-app

bedevere-app Bot commented Jun 21, 2026

Copy link
Copy Markdown

GH-151867 is a backport of this pull request to the 3.15 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.15 pre-release feature fixes, bugs and security fixes label Jun 21, 2026
StanFromIreland added a commit that referenced this pull request Jun 21, 2026
@miss-islington @StanFromIreland
[3.15] RTD Previews: Get correct base branch for backports (GH-150690) (
a2d2ee8 
#151867)

Co-authored-by: Stan Ulbrych <stan@python.org>
pyctrl pushed a commit to pyctrl/cpython that referenced this pull request Jul 5, 2026
@StanFromIreland @pyctrl
RTD Previews: Get correct base branch for backports (python#150690)
7d4c00c
@hugovk hugovk added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.14

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.13

@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153163 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jul 6, 2026
@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153164 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Jul 6, 2026
@hugovk hugovk added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Jul 6, 2026
@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Thanks @StanFromIreland for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.11

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.10

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.13

@miss-islington-app

miss-islington-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

Sorry, @StanFromIreland and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 082ac30eaf51b9b9c218b81b4db71628a487d6c8 3.12

hugovk pushed a commit to hugovk/cpython that referenced this pull request Jul 6, 2026
@StanFromIreland @hugovk
[3.13] RTD Previews: Get correct base branch for backports (pythonGH-…
3c515da 
…150690)

(cherry picked from commit 082ac30)

Co-authored-by: Stan Ulbrych <stan@python.org>
@hugovk hugovk removed the needs backport to 3.13 bugs and security fixes label Jul 6, 2026
@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153165 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jul 6, 2026
@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153166 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.11 only security fixes label Jul 6, 2026
@bedevere-app

bedevere-app Bot commented Jul 6, 2026

Copy link
Copy Markdown

GH-153167 is a backport of this pull request to the 3.10 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.10 only security fixes label Jul 6, 2026
hugovk added a commit that referenced this pull request Jul 6, 2026
@hugovk @StanFromIreland
[3.13] RTD Previews: Get correct base branch for backports (GH-150690) (
05c92c3 
#153164)

Co-authored-by: Stan Ulbrych <stan@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@webknjaz webknjaz Awaiting requested review from webknjaz
@zware zware Awaiting requested review from zware
@AA-Turner AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner

Assignees

@hugovk hugovk

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@StanFromIreland @hugovk