You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2019/06/04 20:41:00 UTC

[arrow] branch master updated: ARROW-5077: [Rust] Change Cargo.toml to use release versions

This is an automated email from the ASF dual-hosted git repository.

kou 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 272866f  ARROW-5077: [Rust] Change Cargo.toml to use release versions
272866f is described below

commit 272866fd17693a9e044761032b73b01176bedfb6
Author: Yosuke Shiro <yo...@gmail.com>
AuthorDate: Wed Jun 5 05:40:08 2019 +0900

    ARROW-5077: [Rust] Change Cargo.toml to use release versions
    
    Author: Yosuke Shiro <yo...@gmail.com>
    
    Closes #4460 from shiro615/release-change-cargo-toml and squashes the following commits:
    
    e500915be <Yosuke Shiro> Remove { version = ... }
    e0bacdb95 <Yosuke Shiro> Refactor
    94483dced <Yosuke Shiro>  Change Cargo.toml to use release versions
---
 dev/release/00-prepare-test.rb | 12 ++++++++++++
 dev/release/00-prepare.sh      | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb
index 423542e..8a1936d 100644
--- a/dev/release/00-prepare-test.rb
+++ b/dev/release/00-prepare-test.rb
@@ -184,6 +184,10 @@ class PrepareTest < Test::Unit::TestCase
                      hunks: [
                        ["-version = \"#{@snapshot_version}\"",
                         "+version = \"#{@release_version}\""],
+                       ["-arrow = { path = \"../arrow\" }",
+                        "-parquet = { path = \"../parquet\" }",
+                        "+arrow = \"#{@release_version}\"",
+                        "+parquet = \"#{@release_version}\""]
                      ],
                    },
                    {
@@ -198,6 +202,8 @@ class PrepareTest < Test::Unit::TestCase
                      hunks: [
                        ["-version = \"#{@snapshot_version}\"",
                         "+version = \"#{@release_version}\""],
+                       ["-arrow = { path = \"../arrow\" }",
+                        "+arrow = \"#{@release_version}\""]
                      ],
                    },
                    {
@@ -327,6 +333,10 @@ class PrepareTest < Test::Unit::TestCase
                      hunks: [
                        ["-version = \"#{@release_version}\"",
                         "+version = \"#{@next_version}-SNAPSHOT\""],
+                       ["-arrow = \"#{@release_version}\"",
+                        "-parquet = \"#{@release_version}\"",
+                        "+arrow = { path = \"../arrow\" }",
+                        "+parquet = { path = \"../parquet\" }"]
                      ],
                    },
                    {
@@ -341,6 +351,8 @@ class PrepareTest < Test::Unit::TestCase
                      hunks: [
                        ["-version = \"#{@release_version}\"",
                         "+version = \"#{@next_version}-SNAPSHOT\""],
+                       ["-arrow = \"#{@release_version}\"",
+                        "+arrow = { path = \"../arrow\" }"]
                      ],
                    },
                    {
diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh
index 8f10344..724df83 100755
--- a/dev/release/00-prepare.sh
+++ b/dev/release/00-prepare.sh
@@ -121,6 +121,17 @@ update_versions() {
   sed -i.bak -E -e \
     "s/^version = \".+\"/version = \"${version}\"/g" \
     */Cargo.toml
+  if [ ${type} = "snapshot" ]; then
+    sed -i.bak -E \
+      -e "s/^arrow = \".+\"/arrow = { path = \"..\/arrow\" }/g" \
+      -e "s/^parquet = \".+\"/parquet = { path = \"..\/parquet\" }/g" \
+      */Cargo.toml
+  else
+    sed -i.bak -E \
+      -e "s/^arrow = \{ path = \".+\" \}/arrow = \"${version}\"/g" \
+      -e "s/^parquet = \{ path = \".+\" \}/parquet = \"${version}\"/g" \
+      */Cargo.toml
+  fi
   rm -f */Cargo.toml.bak
   git add */Cargo.toml