You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2022/05/30 11:21:01 UTC
[arrow] branch master updated: ARROW-16560: [Website][Release] Fix versions.json update phase
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 9b58385235 ARROW-16560: [Website][Release] Fix versions.json update phase
9b58385235 is described below
commit 9b58385235b9e6842c1e1a82a393e3df799f08b8
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Mon May 30 13:20:53 2022 +0200
ARROW-16560: [Website][Release] Fix versions.json update phase
Update versions.json before (not after) we tag a new version. Because
we need to use updated versions.json on release. If we update
versions.json after tagging, documentations of new release use
non-updated versions.json.
Closes #13257 from kou/release-doc-fix-version-bump-phase
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
dev/release/01-prepare-test.rb | 30 ++++++++++++++++++++++++++++++
dev/release/post-12-bump-versions-test.rb | 29 -----------------------------
dev/release/utils-prepare.sh | 9 ++++++---
dev/release/utils-update-docs-versions.py | 15 ++++++++-------
4 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 0b8bd1e271..b498a29763 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -154,6 +154,21 @@ class PrepareTest < Test::Unit::TestCase
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@release_version}/apache-arrow-#{@release_version}.tar.gz\""],
],
},
+ {
+ path: "docs/source/_static/versions.json",
+ hunks: [
+ [
+ "- \"name\": \"#{@release_compatible_version} (dev)\",",
+ "+ \"name\": \"#{@next_compatible_version} (dev)\",",
+ "- \"name\": \"#{@previous_compatible_version} (stable)\",",
+ "+ \"name\": \"#{@release_compatible_version} (stable)\",",
+ "+ {",
+ "+ \"name\": \"#{@previous_compatible_version}\",",
+ "+ \"version\": \"#{@previous_compatible_version}/\"",
+ "+ },",
+ ],
+ ],
+ },
{
path: "go/parquet/writer_properties.go",
hunks: [
@@ -196,6 +211,21 @@ class PrepareTest < Test::Unit::TestCase
"+\# arrow #{@release_version}"],
],
},
+ {
+ path: "r/pkgdown/assets/versions.json",
+ hunks: [
+ [
+ "- \"name\": \"#{@previous_version}.9000 (dev)\",",
+ "+ \"name\": \"#{@release_version}.9000 (dev)\",",
+ "- \"name\": \"#{@previous_version} (release)\",",
+ "+ \"name\": \"#{@release_version} (release)\",",
+ "+ {",
+ "+ \"name\": \"#{@previous_version}\",",
+ "+ \"version\": \"#{@previous_compatible_version}/\"",
+ "+ },",
+ ]
+ ],
+ },
]
Dir.glob("java/**/pom.xml") do |path|
diff --git a/dev/release/post-12-bump-versions-test.rb b/dev/release/post-12-bump-versions-test.rb
index 52597fae08..730cf4f1a3 100644
--- a/dev/release/post-12-bump-versions-test.rb
+++ b/dev/release/post-12-bump-versions-test.rb
@@ -115,21 +115,6 @@ class PostBumpVersionsTest < Test::Unit::TestCase
"+ url \"https://www.apache.org/dyn/closer.lua?path=arrow/arrow-#{@release_version}.9000/apache-arrow-#{@release_version}.9000.tar.gz\""],
],
},
- {
- path: "docs/source/_static/versions.json",
- hunks: [
- [
- "- \"name\": \"#{@release_compatible_version} (dev)\",",
- "+ \"name\": \"#{@next_compatible_version} (dev)\",",
- "- \"name\": \"#{@previous_compatible_version} (stable)\",",
- "+ \"name\": \"#{@release_compatible_version} (stable)\",",
- "+ {",
- "+ \"name\": \"#{@previous_compatible_version}\",",
- "+ \"version\": \"#{@previous_compatible_version}/\"",
- "+ },",
- ]
- ]
- },
{
path: "js/package.json",
hunks: [
@@ -167,20 +152,6 @@ class PostBumpVersionsTest < Test::Unit::TestCase
"+# arrow #{@release_version}",],
],
},
- {
- path: "r/pkgdown/assets/versions.json",
- hunks: [
- [ "- \"name\": \"#{@previous_version}.9000 (dev)\",",
- "+ \"name\": \"#{@release_version}.9000 (dev)\",",
- "- \"name\": \"#{@previous_version} (release)\",",
- "+ \"name\": \"#{@release_version} (release)\",",
- "+ {",
- "+ \"name\": \"#{@previous_version}\",",
- "+ \"version\": \"#{@previous_compatible_version}/\"",
- "+ },"
- ]
- ]
- },
]
Dir.glob("go/**/{go.mod,*.go,*.go.*}") do |path|
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index d58f5735ba..609325da01 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -161,11 +161,14 @@ update_versions() {
popd
case ${type} in
- snapshot)
+ release)
pushd "${ARROW_DIR}"
- ${PYTHON:-python3} "dev/release/utils-update-docs-versions.py" . "${version}" "${r_version}"
- git add r/pkgdown/assets/versions.json
+ ${PYTHON:-python3} "dev/release/utils-update-docs-versions.py" \
+ . \
+ "${version}" \
+ "${next_version}"
git add docs/source/_static/versions.json
+ git add r/pkgdown/assets/versions.json
popd
;;
esac
diff --git a/dev/release/utils-update-docs-versions.py b/dev/release/utils-update-docs-versions.py
index d414785260..af9d05ec1c 100644
--- a/dev/release/utils-update-docs-versions.py
+++ b/dev/release/utils-update-docs-versions.py
@@ -19,10 +19,10 @@ import json
import sys
dir_path = sys.argv[1]
-# X.Y.Z-SNAPSHOT
+# X.Y.Z
version = sys.argv[2]
-# {X-1}.Y.Z.9000
-r_version = sys.argv[3]
+# {X+1}.Y.Z
+next_version = sys.argv[3]
main_versions_path = dir_path + "/docs/source/_static/versions.json"
r_versions_path = dir_path + "/r/pkgdown/assets/versions.json"
@@ -33,8 +33,9 @@ with open(main_versions_path) as json_file:
old_versions = json.load(json_file)
split_version = version.split(".")
-dev_compatible_version = ".".join(split_version[:2])
-stable_compatible_version = f"{str(int(split_version[0]) - 1)}.0"
+split_next_version = next_version.split(".")
+dev_compatible_version = ".".join(split_next_version[:2])
+stable_compatible_version = ".".join(split_version[:2])
previous_compatible_version = old_versions[1]["name"].split(" ")[0]
# Create new versions
@@ -56,8 +57,8 @@ with open(main_versions_path, 'w') as json_file:
with open(r_versions_path) as json_file:
old_r_versions = json.load(json_file)
-dev_r_version = r_version
-release_r_version = ".".join(r_version.split(".")[:3])
+dev_r_version = f"{version}.9000"
+release_r_version = version
previous_r_name = old_r_versions[1]["name"].split(" ")[0]
previous_r_version = ".".join(previous_r_name.split(".")[:2])