From 351e550f5ce7ba3cf62a78e42b74461867cfa3e1 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Thu, 20 Jan 2022 16:42:56 +0000
Subject: [PATCH 01/45] Initial script

---
 ci/scripts/util_update_docs_versions.py | 64 +++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 ci/scripts/util_update_docs_versions.py

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
new file mode 100644
index 00000000000..f9d24df2667
--- /dev/null
+++ b/ci/scripts/util_update_docs_versions.py
@@ -0,0 +1,64 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import json
+import sys
+
+dir_path = sys.argv[0]
+version = sys.argv[1] 
+r_version = sys.argv[2] 
+
+main_versions_path = dir_path + "/docs/source/_static/versions.json"
+r_versions_path = dir_path + "/r/pkgdown/assets/versions.json"
+
+## Udpdate main docs version script
+
+with open(main_versions_path) as json_file:
+    old_versions = json.load(json_file)
+    
+split_version = version.split(".")
+major_minor = split_version[0] + "." + split_version[1]
+
+# Update the old stable version to a numbered version
+old_versions[0]["name"] = old_versions[0]["name"].split(" ")[0]
+old_versions[0]["version"] = old_versions[0]["name"] + '/'
+
+# Create row for new version
+new_version = [{'name': major_minor + " (stable)", 'version':''}]
+new_version.extend(old_versions)
+with open(main_versions_path, 'w') as json_file:
+    json.dump(new_version, json_file, indent = 4)
+    
+## Update R package version script
+
+with open(r_versions_path) as json_file:
+    old_r_versions = json.load(json_file)
+    
+# update release to oldrel
+old_r_versions[1]["name"] = old_r_versions[1]["name"].split(" ")[0]
+old_rel_split = old_r_versions[1]["name"].split(".")
+old_r_versions[1]["version"] = old_rel_split[0] + "." + old_rel_split[1] + "/"
+
+# update dev to release
+old_r_versions[0]["name"] = r_version + " (release)"
+old_r_versions[0]["version"] = ""
+
+# add new dev version
+new_r_version = [{'name': r_version + ".9000" + " (dev)", 'version':'dev/'}]
+new_r_version.extend(old_r_versions)
+with open(r_versions_path, 'w') as json_file:
+    json.dump(new_r_version, json_file, indent = 4)

From dad218b5a26aa6fdccfcd8221461424da8dbee06 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Thu, 20 Jan 2022 16:50:25 +0000
Subject: [PATCH 02/45] Get argv numbers right

---
 ci/scripts/util_update_docs_versions.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
index f9d24df2667..58db369d785 100644
--- a/ci/scripts/util_update_docs_versions.py
+++ b/ci/scripts/util_update_docs_versions.py
@@ -18,9 +18,9 @@
 import json
 import sys
 
-dir_path = sys.argv[0]
-version = sys.argv[1] 
-r_version = sys.argv[2] 
+dir_path = sys.argv[1]
+version = sys.argv[2] 
+r_version = sys.argv[3] 
 
 main_versions_path = dir_path + "/docs/source/_static/versions.json"
 r_versions_path = dir_path + "/r/pkgdown/assets/versions.json"

From 5d608cc5639235e6ff3a601017a869aadb159526 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Thu, 20 Jan 2022 17:00:10 +0000
Subject: [PATCH 03/45] Add line to prep script to source versions script

---
 dev/release/utils-prepare.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index ffb8b0df21e..37be420c458 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -155,4 +155,8 @@ update_versions() {
   find . -name "*.bak" -exec rm {} \;
   git add .
   popd
+
+  pushd "${ARROW_DIR}"
+  python "./ci/scripts/util_update_docs_versions.py" . "${version}" "${r_version}"
+  popd
 }

From 2bea442f799d9c79adc929a127aaba9a392edfc5 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Thu, 20 Jan 2022 17:02:01 +0000
Subject: [PATCH 04/45] add git add

---
 dev/release/utils-prepare.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 37be420c458..802b374169f 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -158,5 +158,7 @@ update_versions() {
 
   pushd "${ARROW_DIR}"
   python "./ci/scripts/util_update_docs_versions.py" . "${version}" "${r_version}"
+  git add r/pkgdown/assets/versions.json
+  git add docs/source/_static/versions.json
   popd
 }

From 906b355401e0316c024f09dea4e195d1e6936985 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 08:28:51 +0000
Subject: [PATCH 05/45] Add some updates to test

---
 dev/release/01-prepare-test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index cb8e688a86f..e5ce26c05eb 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -225,6 +225,15 @@ def test_version_pre_tag
            "+\# arrow #{@release_version}"],
         ],
       },
+      {
+        path: "r/pkgdown/assets/versions.json",
+        hunks: [
+          ['-        "name": "#{@previous_version}.9000"',
+           '+        "name": "#{@release_version}.9000"'],
+          ['-        "name": "#{@previous_version} (release)"',
+           '+        "name": "#{@release_version} (release)"']
+        ],
+      }
     ]
 
     Dir.glob("java/**/pom.xml") do |path|

From 18bf6c24a854d48295d2cd95aeea3a95aa9638d6 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 10:02:10 +0000
Subject: [PATCH 06/45] Add code to extract updated URL R

---
 dev/release/01-prepare-test.rb | 16 +++++++++++++++-
 dev/release/test-helper.rb     |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index e5ce26c05eb..1ab11cb0f82 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -228,10 +228,24 @@ def test_version_pre_tag
       {
         path: "r/pkgdown/assets/versions.json",
         hunks: [
+          [ "-        \"name\": \"#{@previous_version}.9000 (dev)\",",
+            "+        \"name\": \"#{@release_version} (dev)\",",
+            "-        \"name\": \"#{@previous_version} (release)\",",
+            "+        \"name\": \"#{@release_version} (release)\",",
+            "+    {",
+            "+        \"name\": \"#{@previous_version}\",",
+            "+        \"version\": \"#{@previous_version_minor + "/"}\"",
+            "+    },"
+          ]
+        ]
+
+
+
+        [
           ['-        "name": "#{@previous_version}.9000"',
            '+        "name": "#{@release_version}.9000"'],
           ['-        "name": "#{@previous_version} (release)"',
-           '+        "name": "#{@release_version} (release)"']
+           '+        "name": "#{@release_version} (release)"'],
         ],
       }
     ]
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 61a4ae013ae..74ef879a446 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -85,6 +85,7 @@ def detect_versions
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"
     @previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
+    @previous_version_minor = @previous_version.split(".")[0]+"."+@previous_version.split(".")[1]
   end
 
   def compute_so_version(version)

From b92a78cb75b42d3e731f8ae821e26c462e0a8cc2 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 10:02:50 +0000
Subject: [PATCH 07/45] Remove extra code

---
 dev/release/01-prepare-test.rb | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 1ab11cb0f82..71ca62bc2b6 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -238,15 +238,6 @@ def test_version_pre_tag
             "+    },"
           ]
         ]
-
-
-
-        [
-          ['-        "name": "#{@previous_version}.9000"',
-           '+        "name": "#{@release_version}.9000"'],
-          ['-        "name": "#{@previous_version} (release)"',
-           '+        "name": "#{@release_version} (release)"'],
-        ],
       }
     ]
 

From 310be18a628df40f677c1f91f19785b5da902d36 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 10:13:28 +0000
Subject: [PATCH 08/45] Add tests for the main docs version update

---
 dev/release/01-prepare-test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 71ca62bc2b6..baaedcfcaa0 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -190,6 +190,18 @@ def test_version_pre_tag
            "+  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\": \"#{@previous_version} (stable)\",",
+            "+        \"name\": \"#{@release_version} (stable)\",",
+            "+    {",
+            "+        \"name\": \"#{@previous_version}\",",
+            "+        \"version\": \"#{@previous_version_minor + "/"}\"",
+            "+    },"
+          ]
+        ]
+      },
       {
         path: "js/package.json",
         hunks: [

From c2ca8a24ce17a65865e1fbee10ab717c5d417655 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 13:37:32 +0000
Subject: [PATCH 09/45] Add dev version in main docs

---
 ci/scripts/util_update_docs_versions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
index 58db369d785..d45a9662a6d 100644
--- a/ci/scripts/util_update_docs_versions.py
+++ b/ci/scripts/util_update_docs_versions.py
@@ -32,13 +32,17 @@
     
 split_version = version.split(".")
 major_minor = split_version[0] + "." + split_version[1]
+dev_version = str(int(split_version[0]) + 1) + ".0"
 
 # Update the old stable version to a numbered version
 old_versions[0]["name"] = old_versions[0]["name"].split(" ")[0]
 old_versions[0]["version"] = old_versions[0]["name"] + '/'
 
 # Create row for new version
-new_version = [{'name': major_minor + " (stable)", 'version':''}]
+new_version = [
+    {'name': dev_version + " (dev)", 'version':'dev'},
+    {'name': major_minor + " (stable)", 'version':''}
+]
 new_version.extend(old_versions)
 with open(main_versions_path, 'w') as json_file:
     json.dump(new_version, json_file, indent = 4)

From 10af3ec23debd793d36b28125b32160f58229be1 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 17:03:53 +0000
Subject: [PATCH 10/45] Ruby test nudging

---
 dev/release/01-prepare-test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index baaedcfcaa0..f1c2f74c6ff 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -194,6 +194,10 @@ def test_version_pre_tag
         path: "docs/source/_static/versions.json",
         hunks: [
           [ "-        \"name\": \"#{@previous_version} (stable)\",",
+            "+        \"name\": \"#{@next_version} (dev)\",",
+            "+        \"version\": \"dev\"",
+            "+    },"
+            "+    {",
             "+        \"name\": \"#{@release_version} (stable)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",

From 8cd73e2ec132d276dae33cbee6a4d5868241df0b Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 18:03:00 +0000
Subject: [PATCH 11/45] Missing comma

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index f1c2f74c6ff..2067c9a01c7 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -196,7 +196,7 @@ def test_version_pre_tag
           [ "-        \"name\": \"#{@previous_version} (stable)\",",
             "+        \"name\": \"#{@next_version} (dev)\",",
             "+        \"version\": \"dev\"",
-            "+    },"
+            "+    },",
             "+    {",
             "+        \"name\": \"#{@release_version} (stable)\",",
             "+    {",

From 3bbabbcef09390a1dbad33cd03ca5048f9431e6f Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 18:05:28 +0000
Subject: [PATCH 12/45] Missing 9000

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 2067c9a01c7..4637a5923ce 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -245,7 +245,7 @@ def test_version_pre_tag
         path: "r/pkgdown/assets/versions.json",
         hunks: [
           [ "-        \"name\": \"#{@previous_version}.9000 (dev)\",",
-            "+        \"name\": \"#{@release_version} (dev)\",",
+            "+        \"name\": \"#{@release_version}.9000 (dev)\",",
             "-        \"name\": \"#{@previous_version} (release)\",",
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",

From e3a705fd5cc376a9c7a3df7632f9be42c0bbe918 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 18:15:19 +0000
Subject: [PATCH 13/45] Fix r versions hunks

---
 dev/release/01-prepare-test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 4637a5923ce..fab8cea6237 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,9 +251,8 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_version_minor + "/"}\"",
-            "+    },"
-          ]
-        ]
+            "+    },"]],
+            ["-]", "+]"]]
       }
     ]
 

From 30ad000868573fde374dc00b3dc9bedd78dc249b Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 18:35:17 +0000
Subject: [PATCH 14/45] Add brackets

---
 dev/release/01-prepare-test.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index fab8cea6237..7789c2209b5 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -252,7 +252,11 @@ def test_version_pre_tag
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_version_minor + "/"}\"",
             "+    },"]],
-            ["-]", "+]"]]
+          [
+            [
+              "-]", "+]"
+            ]
+          ]
       }
     ]
 

From 94f57a3553e36229e3af3291947deb870a973c4e Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 21 Jan 2022 18:52:11 +0000
Subject: [PATCH 15/45] syntax

---
 dev/release/01-prepare-test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 7789c2209b5..a606d5db9f2 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,12 +251,13 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_version_minor + "/"}\"",
-            "+    },"]],
+            "+    },"],
           [
             [
               "-]", "+]"
             ]
           ]
+        ]
       }
     ]
 

From 628dd4260cf414be886ad9ddeb74dd23a560fd1f Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 00:10:26 +0000
Subject: [PATCH 16/45] reorg spacing

---
 dev/release/01-prepare-test.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index a606d5db9f2..4c4b810c609 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -252,12 +252,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_version_minor + "/"}\"",
             "+    },"],
-          [
-            [
-              "-]", "+]"
-            ]
-          ]
-        ]
+          [["-]", "+]"]]]
       }
     ]
 

From 89b1c8e24e2b6994a3c0b4a8e95bbb02e413aa4d Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 08:54:46 +0000
Subject: [PATCH 17/45] Only look at minor not patch

---
 dev/release/01-prepare-test.rb | 12 ++++++------
 dev/release/test-helper.rb     |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 4c4b810c609..db551ad66c4 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -193,15 +193,15 @@ def test_version_pre_tag
       {
         path: "docs/source/_static/versions.json",
         hunks: [
-          [ "-        \"name\": \"#{@previous_version} (stable)\",",
-            "+        \"name\": \"#{@next_version} (dev)\",",
+          [ "-        \"name\": \"#{@previous_minor_version} (stable)\",",
+            "+        \"name\": \"#{@next_minor_version} (dev)\",",
             "+        \"version\": \"dev\"",
             "+    },",
             "+    {",
-            "+        \"name\": \"#{@release_version} (stable)\",",
+            "+        \"name\": \"#{@release_minor_version} (stable)\",",
             "+    {",
-            "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_version_minor + "/"}\"",
+            "+        \"name\": \"#{@previous_minor_version}\",",
+            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
             "+    },"
           ]
         ]
@@ -250,7 +250,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_version_minor + "/"}\"",
+            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
             "+    },"],
           [["-]", "+]"]]]
       }
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 74ef879a446..ca9cedb8654 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -78,14 +78,16 @@ def detect_versions
     @snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
     @snapshot_major_version = @snapshot_version.split(".")[0]
     @release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
+    @release_minor_version = @release_version.split(".")[0]+"."+@release_version.split(".")[1]
     @so_version = compute_so_version(@release_version)
     @next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
     @next_major_version = @next_version.split(".")[0]
+    @next_minor_version = @next_major_version + "."+ next_version.split(".")[1]
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"
     @previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
-    @previous_version_minor = @previous_version.split(".")[0]+"."+@previous_version.split(".")[1]
+    @previous_minor_version = @previous_version.split(".")[0]+"."+@previous_version.split(".")[1]
   end
 
   def compute_so_version(version)

From 8cfb97d33194710852ecb3c7f4c0fec42cb1fef7 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 09:23:13 +0000
Subject: [PATCH 18/45] missing @

---
 dev/release/test-helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index ca9cedb8654..8ccb5eb1813 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -82,7 +82,7 @@ def detect_versions
     @so_version = compute_so_version(@release_version)
     @next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
     @next_major_version = @next_version.split(".")[0]
-    @next_minor_version = @next_major_version + "."+ next_version.split(".")[1]
+    @next_minor_version = @next_major_version + "."+ @next_version.split(".")[1]
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"

From 07872bf6a6a0b3ee06df345460597873b1384511 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 09:46:43 +0000
Subject: [PATCH 19/45] remove redundant block

---
 dev/release/01-prepare-test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index db551ad66c4..a30644dacd5 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,8 +251,8 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_minor_version + "/"}\"",
-            "+    },"],
-          [["-]", "+]"]]]
+            "+    },"]
+        ]
       }
     ]
 

From be56cbda4af969585db0d6b746494c892e9d3381 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 10:24:21 +0000
Subject: [PATCH 20/45] yup

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index a30644dacd5..a5c4035e2d4 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,7 +251,7 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_minor_version + "/"}\"",
-            "+    },"]
+            ["-]", "+]"]]
         ]
       }
     ]

From 0a38ed5728a081a638aa959d61c8b4db00ac4f04 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Sat, 22 Jan 2022 10:36:22 +0000
Subject: [PATCH 21/45] Add newline to file

---
 ci/scripts/util_update_docs_versions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
index d45a9662a6d..7425229b522 100644
--- a/ci/scripts/util_update_docs_versions.py
+++ b/ci/scripts/util_update_docs_versions.py
@@ -66,3 +66,4 @@
 new_r_version.extend(old_r_versions)
 with open(r_versions_path, 'w') as json_file:
     json.dump(new_r_version, json_file, indent = 4)
+    json_file.write("\n")

From bf3230cd20170a756e47d406764a63b22aa86a67 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 26 Jan 2022 19:24:39 +0000
Subject: [PATCH 22/45] Add newline at end of file

---
 docs/source/_static/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/_static/versions.json b/docs/source/_static/versions.json
index d364cfe2714..00bc27dc847 100644
--- a/docs/source/_static/versions.json
+++ b/docs/source/_static/versions.json
@@ -23,4 +23,4 @@
         "name": "1.0",
         "version": "1.0/"
     }
-]
\ No newline at end of file
+]

From 33a6f7a401735ceddfa895319216b9b54e326985 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 26 Jan 2022 19:27:04 +0000
Subject: [PATCH 23/45] Remove extraneous line

---
 dev/release/01-prepare-test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index a5c4035e2d4..0b8952e7145 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -250,8 +250,8 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
-            ["-]", "+]"]]
+            "+        \"version\": \"#{@previous_minor_version + "/"}\""
+          ]
         ]
       }
     ]

From 0b5772bf7649007bb16d61fac05a3cc2e64406e6 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 26 Jan 2022 19:35:29 +0000
Subject: [PATCH 24/45] Update test

---
 ci/scripts/util_update_docs_versions.py | 3 ++-
 dev/release/01-prepare-test.rb          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
index 7425229b522..fa23aa89ee3 100644
--- a/ci/scripts/util_update_docs_versions.py
+++ b/ci/scripts/util_update_docs_versions.py
@@ -29,7 +29,7 @@
 
 with open(main_versions_path) as json_file:
     old_versions = json.load(json_file)
-    
+
 split_version = version.split(".")
 major_minor = split_version[0] + "." + split_version[1]
 dev_version = str(int(split_version[0]) + 1) + ".0"
@@ -43,6 +43,7 @@
     {'name': dev_version + " (dev)", 'version':'dev'},
     {'name': major_minor + " (stable)", 'version':''}
 ]
+
 new_version.extend(old_versions)
 with open(main_versions_path, 'w') as json_file:
     json.dump(new_version, json_file, indent = 4)
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 0b8952e7145..f74581fc197 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -250,7 +250,8 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_minor_version + "/"}\""
+            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
+            "+    },",
           ]
         ]
       }

From e9d989d0a16abd1bec6c1c85f63c9ef1bb2bb476 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 26 Jan 2022 20:20:42 +0000
Subject: [PATCH 25/45] Add newline at end of Python versions file

---
 ci/scripts/util_update_docs_versions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/scripts/util_update_docs_versions.py b/ci/scripts/util_update_docs_versions.py
index fa23aa89ee3..b21e232b588 100644
--- a/ci/scripts/util_update_docs_versions.py
+++ b/ci/scripts/util_update_docs_versions.py
@@ -47,7 +47,8 @@
 new_version.extend(old_versions)
 with open(main_versions_path, 'w') as json_file:
     json.dump(new_version, json_file, indent = 4)
-    
+    json_file.write("\n")
+
 ## Update R package version script
 
 with open(r_versions_path) as json_file:

From 5ef27e9227433b912feaf0db872d236e47de3e8c Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 15:28:21 +0000
Subject: [PATCH 26/45] Rename minor -> compatible

---
 dev/release/01-prepare-test.rb | 15 ++++++++-------
 dev/release/test-helper.rb     |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index f74581fc197..25a0ba75fe5 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -193,15 +193,15 @@ def test_version_pre_tag
       {
         path: "docs/source/_static/versions.json",
         hunks: [
-          [ "-        \"name\": \"#{@previous_minor_version} (stable)\",",
-            "+        \"name\": \"#{@next_minor_version} (dev)\",",
+          [ "-        \"name\": \"#{@previous_compatible_version} (stable)\",",
+            "+        \"name\": \"#{@next_compatible_version} (dev)\",",
             "+        \"version\": \"dev\"",
             "+    },",
             "+    {",
-            "+        \"name\": \"#{@release_minor_version} (stable)\",",
+            "+        \"name\": \"#{release_compatible_version} (stable)\",",
             "+    {",
-            "+        \"name\": \"#{@previous_minor_version}\",",
-            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
+            "+        \"name\": \"#{@previous_compatible_version}\",",
+            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
             "+    },"
           ]
         ]
@@ -250,8 +250,9 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_minor_version + "/"}\"",
-            "+    },",
+            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
+            "+    },"],
+            ["-]", "+]     "]]],
           ]
         ]
       }
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 8ccb5eb1813..8eb6b10a0dc 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -78,16 +78,16 @@ def detect_versions
     @snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
     @snapshot_major_version = @snapshot_version.split(".")[0]
     @release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
-    @release_minor_version = @release_version.split(".")[0]+"."+@release_version.split(".")[1]
+    @release_compatible_version = @release_version.split(".")[0, 2]).join(".")
     @so_version = compute_so_version(@release_version)
     @next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
     @next_major_version = @next_version.split(".")[0]
-    @next_minor_version = @next_major_version + "."+ @next_version.split(".")[1]
+    @next_compatible_version = @next_major_version.split(".")[0, 2]).join(".")
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"
     @previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
-    @previous_minor_version = @previous_version.split(".")[0]+"."+@previous_version.split(".")[1]
+    @previous_compatible_version = @previous_version.split(".")[0, 2]).join(".")
   end
 
   def compute_so_version(version)

From fdec47701cad13d54a32970370b768cb14546920 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 15:41:54 +0000
Subject: [PATCH 27/45] Only run when it's a release

---
 dev/release/utils-prepare.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 802b374169f..2674f5b1e03 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -156,9 +156,14 @@ update_versions() {
   git add .
   popd
 
-  pushd "${ARROW_DIR}"
-  python "./ci/scripts/util_update_docs_versions.py" . "${version}" "${r_version}"
-  git add r/pkgdown/assets/versions.json
-  git add docs/source/_static/versions.json
-  popd
+  case ${type} in
+    release)
+      pushd "${ARROW_DIR}"
+      python "./ci/scripts/util_update_docs_versions.py" . "${version}" "${r_version}"
+      git add r/pkgdown/assets/versions.json
+      git add docs/source/_static/versions.json
+      popd
+      ;;
+  esac
+
 }

From ba7c432d09b5d2144b3c4b9ae370783e32538a6c Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 15:43:39 +0000
Subject: [PATCH 28/45] Move script

---
 {ci/scripts => dev/release}/util_update_docs_versions.py | 0
 dev/release/utils-prepare.sh                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {ci/scripts => dev/release}/util_update_docs_versions.py (100%)

diff --git a/ci/scripts/util_update_docs_versions.py b/dev/release/util_update_docs_versions.py
similarity index 100%
rename from ci/scripts/util_update_docs_versions.py
rename to dev/release/util_update_docs_versions.py
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 2674f5b1e03..0ea6d12a20f 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -159,7 +159,7 @@ update_versions() {
   case ${type} in
     release)
       pushd "${ARROW_DIR}"
-      python "./ci/scripts/util_update_docs_versions.py" . "${version}" "${r_version}"
+      python "./dev/release/util_update_docs_versions.py" . "${version}" "${r_version}"
       git add r/pkgdown/assets/versions.json
       git add docs/source/_static/versions.json
       popd

From 96d3edfb9434e6a1bf92130fa26d1f6f7a038908 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 15:57:58 +0000
Subject: [PATCH 29/45] linter

---
 dev/release/util_update_docs_versions.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev/release/util_update_docs_versions.py b/dev/release/util_update_docs_versions.py
index b21e232b588..322bcaa9467 100644
--- a/dev/release/util_update_docs_versions.py
+++ b/dev/release/util_update_docs_versions.py
@@ -19,13 +19,13 @@
 import sys
 
 dir_path = sys.argv[1]
-version = sys.argv[2] 
-r_version = sys.argv[3] 
+version = sys.argv[2]
+r_version = sys.argv[3]
 
 main_versions_path = dir_path + "/docs/source/_static/versions.json"
 r_versions_path = dir_path + "/r/pkgdown/assets/versions.json"
 
-## Udpdate main docs version script
+# Update main docs version script
 
 with open(main_versions_path) as json_file:
     old_versions = json.load(json_file)
@@ -40,20 +40,20 @@
 
 # Create row for new version
 new_version = [
-    {'name': dev_version + " (dev)", 'version':'dev'},
-    {'name': major_minor + " (stable)", 'version':''}
+    {'name': dev_version + " (dev)", 'version': 'dev'},
+    {'name': major_minor + " (stable)", 'version': ''}
 ]
 
 new_version.extend(old_versions)
 with open(main_versions_path, 'w') as json_file:
-    json.dump(new_version, json_file, indent = 4)
+    json.dump(new_version, json_file, indent=4)
     json_file.write("\n")
 
-## Update R package version script
+# Update R package version script
 
 with open(r_versions_path) as json_file:
     old_r_versions = json.load(json_file)
-    
+
 # update release to oldrel
 old_r_versions[1]["name"] = old_r_versions[1]["name"].split(" ")[0]
 old_rel_split = old_r_versions[1]["name"].split(".")
@@ -64,8 +64,8 @@
 old_r_versions[0]["version"] = ""
 
 # add new dev version
-new_r_version = [{'name': r_version + ".9000" + " (dev)", 'version':'dev/'}]
+new_r_version = [{'name': r_version + ".9000" + " (dev)", 'version': 'dev/'}]
 new_r_version.extend(old_r_versions)
 with open(r_versions_path, 'w') as json_file:
-    json.dump(new_r_version, json_file, indent = 4)
+    json.dump(new_r_version, json_file, indent=4)
     json_file.write("\n")

From 4076b9ecf3fc6e92afa12c66331a0877b8d27a19 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 16:01:28 +0000
Subject: [PATCH 30/45] typo

---
 dev/release/test-helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 8eb6b10a0dc..3f2a91ae483 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -78,16 +78,16 @@ def detect_versions
     @snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
     @snapshot_major_version = @snapshot_version.split(".")[0]
     @release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
-    @release_compatible_version = @release_version.split(".")[0, 2]).join(".")
+    @release_compatible_version = @release_version.split(".")[0, 2].join(".")
     @so_version = compute_so_version(@release_version)
     @next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
     @next_major_version = @next_version.split(".")[0]
-    @next_compatible_version = @next_major_version.split(".")[0, 2]).join(".")
+    @next_compatible_version = @next_major_version.split(".")[0, 2].join(".")
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"
     @previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
-    @previous_compatible_version = @previous_version.split(".")[0, 2]).join(".")
+    @previous_compatible_version = @previous_version.split(".")[0, 2].join(".")
   end
 
   def compute_so_version(version)

From 18a77cf6570a2a81e42071e4db52740075148d29 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 16:45:09 +0000
Subject: [PATCH 31/45] extra brackets

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 25a0ba75fe5..d313218a9dc 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -252,7 +252,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
             "+    },"],
-            ["-]", "+]     "]]],
+            ["-]", "+]     "],
           ]
         ]
       }

From 5f9a84d8b5bdb6e971072d364dc2cedb35715a56 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 16:58:11 +0000
Subject: [PATCH 32/45] Remove extra parens

---
 dev/release/01-prepare-test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index d313218a9dc..5b24cc02633 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,8 +251,8 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
-            "+    },"],
-            ["-]", "+]     "],
+            "+    },",
+            "-]", "+]     ",
           ]
         ]
       }

From 3e96af8bdaa138d2f3252a3af72f0a7cff4b78cf Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:01:34 +0000
Subject: [PATCH 33/45] typo

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 5b24cc02633..791dc25d4c8 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -198,7 +198,7 @@ def test_version_pre_tag
             "+        \"version\": \"dev\"",
             "+    },",
             "+    {",
-            "+        \"name\": \"#{release_compatible_version} (stable)\",",
+            "+        \"name\": \"#{@release_compatible_version} (stable)\",",
             "+    {",
             "+        \"name\": \"#{@previous_compatible_version}\",",
             "+        \"version\": \"#{@previous_compatible_version + "/"}\"",

From 9641b9fb62d6f0bc3b6ed9b4bc37adb561f740fd Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:10:24 +0000
Subject: [PATCH 34/45] remove extras

---
 dev/release/01-prepare-test.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 791dc25d4c8..ad722015637 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -250,9 +250,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
-            "+    },",
-            "-]", "+]     ",
+            "+        \"version\": \"#{@previous_compatible_version + "/"}\""
           ]
         ]
       }

From ca195b2a972440c8d64c985d6a596bd4a1bffc4a Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:25:48 +0000
Subject: [PATCH 35/45] Add missing bit

---
 dev/release/01-prepare-test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index ad722015637..3d660711243 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -250,7 +250,8 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_compatible_version + "/"}\""
+            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
+            "+    },"]
           ]
         ]
       }

From 5a5cc3eff8e6ee8721c33bdc5769550826516dc6 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:33:07 +0000
Subject: [PATCH 36/45] bracket

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 3d660711243..570c22576b3 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -251,7 +251,7 @@ def test_version_pre_tag
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
             "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
-            "+    },"]
+            "+    },"
           ]
         ]
       }

From d852cdafd54b91bdfc0add38da68f183b76eb559 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:45:31 +0000
Subject: [PATCH 37/45] Add missing changes back in

---
 dev/release/01-prepare-test.rb | 4 ++--
 dev/release/utils-prepare.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 570c22576b3..8f24f81a337 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -201,7 +201,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_compatible_version} (stable)\",",
             "+    {",
             "+        \"name\": \"#{@previous_compatible_version}\",",
-            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
+            "+        \"version\": \"#{@previous_compatible_version}/\"",
             "+    },"
           ]
         ]
@@ -250,7 +250,7 @@ def test_version_pre_tag
             "+        \"name\": \"#{@release_version} (release)\",",
             "+    {",
             "+        \"name\": \"#{@previous_version}\",",
-            "+        \"version\": \"#{@previous_compatible_version + "/"}\"",
+            "+        \"version\": \"#{@previous_compatible_version}/\"",
             "+    },"
           ]
         ]
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 0ea6d12a20f..29f940f377f 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -159,7 +159,7 @@ update_versions() {
   case ${type} in
     release)
       pushd "${ARROW_DIR}"
-      python "./dev/release/util_update_docs_versions.py" . "${version}" "${r_version}"
+      ${PYTHON:-python3} "./dev/release/util_update_docs_versions.py" . "${version}" "${r_version}"
       git add r/pkgdown/assets/versions.json
       git add docs/source/_static/versions.json
       popd

From 0f447f013b9dd453fb8a9001e09cd432ad77550c Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 17:58:05 +0000
Subject: [PATCH 38/45] remove line

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 8f24f81a337..de1522cf902 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -194,7 +194,7 @@ def test_version_pre_tag
         path: "docs/source/_static/versions.json",
         hunks: [
           [ "-        \"name\": \"#{@previous_compatible_version} (stable)\",",
-            "+        \"name\": \"#{@next_compatible_version} (dev)\",",
+            
             "+        \"version\": \"dev\"",
             "+    },",
             "+    {",

From 8f0c375c7d045a1804c7e45f48ff7bc4b97c5b94 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Wed, 2 Feb 2022 18:01:33 +0000
Subject: [PATCH 39/45] Add back in

---
 dev/release/01-prepare-test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index de1522cf902..8f24f81a337 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -194,7 +194,7 @@ def test_version_pre_tag
         path: "docs/source/_static/versions.json",
         hunks: [
           [ "-        \"name\": \"#{@previous_compatible_version} (stable)\",",
-            
+            "+        \"name\": \"#{@next_compatible_version} (dev)\",",
             "+        \"version\": \"dev\"",
             "+    },",
             "+    {",

From 54d0a8dfaf1f2126ad29411f5f8e26618726638c Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 09:46:37 +0900
Subject: [PATCH 40/45] Fix wrong variable

---
 dev/release/test-helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 3f2a91ae483..c836ac65a61 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -82,7 +82,7 @@ def detect_versions
     @so_version = compute_so_version(@release_version)
     @next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
     @next_major_version = @next_version.split(".")[0]
-    @next_compatible_version = @next_major_version.split(".")[0, 2].join(".")
+    @next_compatible_version = @next_version.split(".")[0, 2].join(".")
     @next_snapshot_version = "#{@next_version}-SNAPSHOT"
     @next_so_version = compute_so_version(@next_version)
     r_description = top_dir + "r" + "DESCRIPTION"

From abd0c5e00318680af0bdeb1aad76f1fa337ba025 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 09:49:28 +0900
Subject: [PATCH 41/45] Add missing trailing /

---
 dev/release/util_update_docs_versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/release/util_update_docs_versions.py b/dev/release/util_update_docs_versions.py
index 322bcaa9467..a644a4a295c 100644
--- a/dev/release/util_update_docs_versions.py
+++ b/dev/release/util_update_docs_versions.py
@@ -40,7 +40,7 @@
 
 # Create row for new version
 new_version = [
-    {'name': dev_version + " (dev)", 'version': 'dev'},
+    {'name': dev_version + " (dev)", 'version': 'dev/'},
     {'name': major_minor + " (stable)", 'version': ''}
 ]
 

From 2cd9f4b4a2e5ffe57b3efa012d21a0871598c8d8 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 09:49:37 +0900
Subject: [PATCH 42/45] Add dev version

---
 docs/source/_static/versions.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/source/_static/versions.json b/docs/source/_static/versions.json
index 00bc27dc847..37bfcf24091 100644
--- a/docs/source/_static/versions.json
+++ b/docs/source/_static/versions.json
@@ -1,4 +1,8 @@
 [
+    {
+        "name": "7.0 (dev)",
+        "version": "dev/"
+    },
     {
         "name": "6.0 (stable)",
         "version": ""

From fb4e32bec88a2c12cd5cb9a830ebb04fc3aa9336 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 09:54:05 +0900
Subject: [PATCH 43/45] Fix versions.json generation

---
 dev/release/01-prepare-test.rb           |  9 ++++-----
 dev/release/util_update_docs_versions.py | 17 +++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 8f24f81a337..a040bc9d2a0 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -193,16 +193,15 @@ def test_version_pre_tag
       {
         path: "docs/source/_static/versions.json",
         hunks: [
-          [ "-        \"name\": \"#{@previous_compatible_version} (stable)\",",
+          [
+            "-        \"name\": \"#{@release_compatible_version} (dev)\",",
             "+        \"name\": \"#{@next_compatible_version} (dev)\",",
-            "+        \"version\": \"dev\"",
-            "+    },",
-            "+    {",
+            "-        \"name\": \"#{@previous_compatible_version} (stable)\",",
             "+        \"name\": \"#{@release_compatible_version} (stable)\",",
             "+    {",
             "+        \"name\": \"#{@previous_compatible_version}\",",
             "+        \"version\": \"#{@previous_compatible_version}/\"",
-            "+    },"
+            "+    },",
           ]
         ]
       },
diff --git a/dev/release/util_update_docs_versions.py b/dev/release/util_update_docs_versions.py
index a644a4a295c..7ac0e605674 100644
--- a/dev/release/util_update_docs_versions.py
+++ b/dev/release/util_update_docs_versions.py
@@ -33,20 +33,17 @@
 split_version = version.split(".")
 major_minor = split_version[0] + "." + split_version[1]
 dev_version = str(int(split_version[0]) + 1) + ".0"
+previous_major_minor = old_versions[1]["name"].split(" ")[0]
 
-# Update the old stable version to a numbered version
-old_versions[0]["name"] = old_versions[0]["name"].split(" ")[0]
-old_versions[0]["version"] = old_versions[0]["name"] + '/'
-
-# Create row for new version
-new_version = [
+# Create new versions
+new_versions = [
     {'name': dev_version + " (dev)", 'version': 'dev/'},
-    {'name': major_minor + " (stable)", 'version': ''}
+    {'name': major_minor + " (stable)", 'version': ''},
+    {'name': previous_major_minor, 'version': f'{previous_major_minor}/'},
+    *old_versions[2:],
 ]
-
-new_version.extend(old_versions)
 with open(main_versions_path, 'w') as json_file:
-    json.dump(new_version, json_file, indent=4)
+    json.dump(new_versions, json_file, indent=4)
     json_file.write("\n")
 
 # Update R package version script

From 49887ebaceb13562ce1f4acf499bb6dcd5050a72 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 10:02:48 +0900
Subject: [PATCH 44/45] Use "utils" and "-" to follow naming convention

---
 dev/release/utils-prepare.sh                                    | 2 +-
 ...il_update_docs_versions.py => utils-update-docs-versions.py} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename dev/release/{util_update_docs_versions.py => utils-update-docs-versions.py} (100%)

diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 29f940f377f..297cedfec5d 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -159,7 +159,7 @@ update_versions() {
   case ${type} in
     release)
       pushd "${ARROW_DIR}"
-      ${PYTHON:-python3} "./dev/release/util_update_docs_versions.py" . "${version}" "${r_version}"
+      ${PYTHON:-python3} "dev/release/utils-update-docs-versions.py" . "${version}" "${r_version}"
       git add r/pkgdown/assets/versions.json
       git add docs/source/_static/versions.json
       popd
diff --git a/dev/release/util_update_docs_versions.py b/dev/release/utils-update-docs-versions.py
similarity index 100%
rename from dev/release/util_update_docs_versions.py
rename to dev/release/utils-update-docs-versions.py

From 6d61478ca52d8c85eb66a8782c5a6eb987b1f1d6 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Thu, 3 Feb 2022 10:11:27 +0900
Subject: [PATCH 45/45] Add dev/release/**/*.py to lint targets

---
 dev/archery/archery/utils/lint.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/archery/archery/utils/lint.py b/dev/archery/archery/utils/lint.py
index 489f741b6d0..48131856402 100644
--- a/dev/archery/archery/utils/lint.py
+++ b/dev/archery/archery/utils/lint.py
@@ -189,7 +189,8 @@ def python_linter(src, fix=False):
                 "python/pyarrow/**/*.pxd",
                 "python/pyarrow/**/*.pxi",
                 "python/examples/**/*.py",
-                "dev/archery/**/*.py"]
+                "dev/archery/**/*.py",
+                "dev/release/**/*.py"]
     files = [setup_py]
     for pattern in patterns:
         files += list(map(str, Path(src.path).glob(pattern)))