You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ra...@apache.org on 2023/04/17 12:58:44 UTC
[arrow] 10/11: GH-35181: [R] Bump R package version number in versions.json (#35132)
This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch maint-12.0.0
in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 6e80cbb7adbc9920fde697be7c8ef236ca0b7017
Author: Nic Crane <th...@gmail.com>
AuthorDate: Mon Apr 17 11:35:44 2023 +0100
GH-35181: [R] Bump R package version number in versions.json (#35132)
This PR corrects a missed R package version number increase
* Closes: #35181
Lead-authored-by: Nic Crane <th...@gmail.com>
Co-authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Raúl Cumplido <ra...@gmail.com>
---
dev/release/01-prepare-test.rb | 6 +++---
dev/release/post-11-bump-versions-test.rb | 6 +++---
dev/release/test-helper.rb | 2 ++
r/pkgdown/assets/versions.json | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index eb9b10e393..1062e8b06c 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -243,10 +243,10 @@ class PrepareTest < Test::Unit::TestCase
[
"- \"name\": \"#{@previous_version}.9000 (dev)\",",
"+ \"name\": \"#{@release_version}.9000 (dev)\",",
- "- \"name\": \"#{@previous_version} (release)\",",
+ "- \"name\": \"#{@previous_r_version} (release)\",",
"+ \"name\": \"#{@release_version} (release)\",",
"+ {",
- "+ \"name\": \"#{@previous_version}\",",
+ "+ \"name\": \"#{@previous_r_version}\",",
"+ \"version\": \"#{@previous_compatible_version}/\"",
"+ },",
]
@@ -261,7 +261,7 @@ class PrepareTest < Test::Unit::TestCase
[
"- \"name\": \"#{@previous_version}.9000 (dev)\",",
"+ \"name\": \"#{@release_version}.9000 (dev)\",",
- "- \"name\": \"#{@previous_version} (release)\",",
+ "- \"name\": \"#{@previous_r_version} (release)\",",
"+ \"name\": \"#{@release_version} (release)\",",
]
],
diff --git a/dev/release/post-11-bump-versions-test.rb b/dev/release/post-11-bump-versions-test.rb
index cc35b93cc9..b030323531 100644
--- a/dev/release/post-11-bump-versions-test.rb
+++ b/dev/release/post-11-bump-versions-test.rb
@@ -190,10 +190,10 @@ class PostBumpVersionsTest < Test::Unit::TestCase
[
"- \"name\": \"#{@previous_version}.9000 (dev)\",",
"+ \"name\": \"#{@release_version}.9000 (dev)\",",
- "- \"name\": \"#{@previous_version} (release)\",",
+ "- \"name\": \"#{@previous_r_version} (release)\",",
"+ \"name\": \"#{@release_version} (release)\",",
"+ {",
- "+ \"name\": \"#{@previous_version}\",",
+ "+ \"name\": \"#{@previous_r_version}\",",
"+ \"version\": \"#{@previous_compatible_version}/\"",
"+ },",
],
@@ -208,7 +208,7 @@ class PostBumpVersionsTest < Test::Unit::TestCase
[
"- \"name\": \"#{@previous_version}.9000 (dev)\",",
"+ \"name\": \"#{@release_version}.9000 (dev)\",",
- "- \"name\": \"#{@previous_version} (release)\",",
+ "- \"name\": \"#{@previous_r_version} (release)\",",
"+ \"name\": \"#{@release_version} (release)\",",
],
],
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 1249961eb8..3b2c3aa6e5 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -130,6 +130,8 @@ module VersionDetectable
else
@previous_compatible_version = nil
end
+ r_versions = top_dir + "r" + "pkgdown" + "assets" + "versions.json"
+ @previous_r_version = r_versions.read[/"name": "(.+?) \(release\)"/, 1]
end
def compute_so_version(version)
diff --git a/r/pkgdown/assets/versions.json b/r/pkgdown/assets/versions.json
index 05ae619584..04d52dc9cb 100644
--- a/r/pkgdown/assets/versions.json
+++ b/r/pkgdown/assets/versions.json
@@ -4,7 +4,7 @@
"version": "dev/"
},
{
- "name": "11.0.0 (release)",
+ "name": "11.0.0.3 (release)",
"version": ""
},
{