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

Bump release version number to 2.5 #706

Open
wants to merge 2 commits into
base: 2.5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build_html.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NUM_LANGUAGES="$(printf '%s' "$LANGUAGES" | wc -w)"
# Write _redirects file
mkdir -p build/html
printf '/ /latest/ 302\n' > build/html/_redirects
printf '/latest/* /2.4/:splat 301\n' >> build/html/_redirects
printf '/latest/* /2.5/:splat 301\n' >> build/html/_redirects

i=1
for lang in $LANGUAGES
Expand All @@ -20,10 +20,10 @@ do

if [ "$lang" = "en" ]
then
printf '/:version/en/* /2.4/en/404.html 404\n' >> build/html/_redirects
printf '/:version/en/* /2.5/en/404.html 404\n' >> build/html/_redirects
printf '/:version/* /:version/en/:splat 301\n' >> build/html/_redirects
else
printf '/:version/%s/* /2.4/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects
printf '/:version/%s/* /2.5/%s/404.html 404\n' "$lang" "$lang" >> build/html/_redirects
printf '/:version/* /:version/%s/:splat 301 Language=%s\n' "$lang" "$(printf "%s" "$lang" | sed 's/_/-/g')" >> build/html/_redirects
fi
make versionedhtml SPHINXOPTS="-j $(nproc) -Dlanguage=$lang"
Expand Down
8 changes: 4 additions & 4 deletions source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@
smv_tag_whitelist = r"^$"
smv_branch_whitelist = r"^(main|(\d+)\.(\d+))$"
smv_remote_whitelist = r"^origin$"
# Mark all branches in the form "N.M" as released except "2.5"
smv_released_pattern = r"^.*/(?!2\.5)(\d+)\.(\d+)$"
smv_latest_version = r"2.4"
# Mark all branches in the form "N.M" as released except "2.6"
smv_released_pattern = r"^.*/(?!2\.6)(\d+)\.(\d+)$"
smv_latest_version = r"2.5"
smv_outputdir_format = "{config.version}/{config.language}"
notfound_urls_prefix = "/2.4/en/"
notfound_urls_prefix = "/2.5/en/"

# Directories in which to search for additional message catalogs (see language),
# relative to the source directory. The directories on this path are searched
Expand Down
Loading