Skip to content

Commit 2b16d7a

Browse files
kouwesm
kou
authored and
wesm
committed
ARROW-5788: [Rust] Use both "path" and "version" for internal dependencies
We need "path" to release a new version by "cargo publish". We need "version" to use released packages. Author: Sutou Kouhei <[email protected]> Closes apache#4873 from kou/rust-version-with-path and squashes the following commits: bd7738280 <Sutou Kouhei> Use both "path" and "version" for internal dependencies
1 parent e25cd78 commit 2b16d7a

File tree

4 files changed

+36
-44
lines changed

4 files changed

+36
-44
lines changed

‎dev/release/00-prepare-test.rb

+30-30
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ def test_update_version_pre_tag
188188
hunks: [
189189
["-version = \"#{@snapshot_version}\"",
190190
"+version = \"#{@release_version}\""],
191-
["-arrow = { path = \"../arrow\" }",
192-
"-parquet = { path = \"../parquet\" }",
193-
"+arrow = \"#{@release_version}\"",
194-
"+parquet = \"#{@release_version}\""]
191+
["-arrow = { path = \"../arrow\", version = \"#{@snapshot_version}\" }",
192+
"-parquet = { path = \"../parquet\", version = \"#{@snapshot_version}\" }",
193+
"+arrow = { path = \"../arrow\", version = \"#{@release_version}\" }",
194+
"+parquet = { path = \"../parquet\", version = \"#{@release_version}\" }"]
195195
],
196196
},
197197
{
@@ -206,8 +206,8 @@ def test_update_version_pre_tag
206206
hunks: [
207207
["-version = \"#{@snapshot_version}\"",
208208
"+version = \"#{@release_version}\""],
209-
["-arrow = { path = \"../arrow\" }",
210-
"+arrow = \"#{@release_version}\""]
209+
["-arrow = { path = \"../arrow\", version = \"#{@snapshot_version}\" }",
210+
"+arrow = { path = \"../arrow\", version = \"#{@release_version}\" }"]
211211
],
212212
},
213213
{
@@ -231,14 +231,14 @@ def test_update_version_post_tag
231231
path: "c_glib/configure.ac",
232232
hunks: [
233233
["-m4_define([arrow_glib_version], #{@release_version})",
234-
"+m4_define([arrow_glib_version], #{@next_version}-SNAPSHOT)"],
234+
"+m4_define([arrow_glib_version], #{@next_snapshot_version})"],
235235
],
236236
},
237237
{
238238
path: "c_glib/meson.build",
239239
hunks: [
240240
["-version = '#{@release_version}'",
241-
"+version = '#{@next_version}-SNAPSHOT'"],
241+
"+version = '#{@next_snapshot_version}'"],
242242
],
243243
},
244244
{
@@ -252,35 +252,35 @@ def test_update_version_post_tag
252252
path: "cpp/CMakeLists.txt",
253253
hunks: [
254254
["-set(ARROW_VERSION \"#{@release_version}\")",
255-
"+set(ARROW_VERSION \"#{@next_version}-SNAPSHOT\")"],
255+
"+set(ARROW_VERSION \"#{@next_snapshot_version}\")"],
256256
],
257257
},
258258
{
259259
path: "csharp/Directory.Build.props",
260260
hunks: [
261261
["- <Version>#{@release_version}</Version>",
262-
"+ <Version>#{@next_version}-SNAPSHOT</Version>"],
262+
"+ <Version>#{@next_snapshot_version}</Version>"],
263263
],
264264
},
265265
{
266266
path: "js/package.json",
267267
hunks: [
268268
["- \"version\": \"#{@release_version}\"",
269-
"+ \"version\": \"#{@next_version}-SNAPSHOT\""],
269+
"+ \"version\": \"#{@next_snapshot_version}\""],
270270
],
271271
},
272272
{
273273
path: "matlab/CMakeLists.txt",
274274
hunks: [
275275
["-set(MLARROW_VERSION \"#{@release_version}\")",
276-
"+set(MLARROW_VERSION \"#{@next_version}-SNAPSHOT\")"],
276+
"+set(MLARROW_VERSION \"#{@next_snapshot_version}\")"],
277277
],
278278
},
279279
{
280280
path: "python/setup.py",
281281
hunks: [
282282
["-default_version = '#{@release_version}'",
283-
"+default_version = '#{@next_version}-SNAPSHOT'"],
283+
"+default_version = '#{@next_snapshot_version}'"],
284284
],
285285
},
286286
{
@@ -302,78 +302,78 @@ def test_update_version_post_tag
302302
path: "ruby/red-arrow-cuda/lib/arrow-cuda/version.rb",
303303
hunks: [
304304
["- VERSION = \"#{@release_version}\"",
305-
"+ VERSION = \"#{@next_version}-SNAPSHOT\""],
305+
"+ VERSION = \"#{@next_snapshot_version}\""],
306306
],
307307
},
308308
{
309309
path: "ruby/red-arrow/lib/arrow/version.rb",
310310
hunks: [
311311
["- VERSION = \"#{@release_version}\"",
312-
"+ VERSION = \"#{@next_version}-SNAPSHOT\""],
312+
"+ VERSION = \"#{@next_snapshot_version}\""],
313313
],
314314
},
315315
{
316316
path: "ruby/red-gandiva/lib/gandiva/version.rb",
317317
hunks: [
318318
["- VERSION = \"#{@release_version}\"",
319-
"+ VERSION = \"#{@next_version}-SNAPSHOT\""],
319+
"+ VERSION = \"#{@next_snapshot_version}\""],
320320
],
321321
},
322322
{
323323
path: "ruby/red-parquet/lib/parquet/version.rb",
324324
hunks: [
325325
["- VERSION = \"#{@release_version}\"",
326-
"+ VERSION = \"#{@next_version}-SNAPSHOT\""],
326+
"+ VERSION = \"#{@next_snapshot_version}\""],
327327
],
328328
},
329329
{
330330
path: "ruby/red-plasma/lib/plasma/version.rb",
331331
hunks: [
332332
["- VERSION = \"#{@release_version}\"",
333-
"+ VERSION = \"#{@next_version}-SNAPSHOT\""],
333+
"+ VERSION = \"#{@next_snapshot_version}\""],
334334
],
335335
},
336336
{
337337
path: "rust/arrow/Cargo.toml",
338338
hunks: [
339339
["-version = \"#{@release_version}\"",
340-
"+version = \"#{@next_version}-SNAPSHOT\""],
340+
"+version = \"#{@next_snapshot_version}\""],
341341
],
342342
},
343343
{
344344
path: "rust/datafusion/Cargo.toml",
345345
hunks: [
346346
["-version = \"#{@release_version}\"",
347-
"+version = \"#{@next_version}-SNAPSHOT\""],
348-
["-arrow = \"#{@release_version}\"",
349-
"-parquet = \"#{@release_version}\"",
350-
"+arrow = { path = \"../arrow\" }",
351-
"+parquet = { path = \"../parquet\" }"]
347+
"+version = \"#{@next_snapshot_version}\""],
348+
["-arrow = { path = \"../arrow\", version = \"#{@release_version}\" }",
349+
"-parquet = { path = \"../parquet\", version = \"#{@release_version}\" }",
350+
"+arrow = { path = \"../arrow\", version = \"#{@next_snapshot_version}\" }",
351+
"+parquet = { path = \"../parquet\", version = \"#{@next_snapshot_version}\" }"]
352352
],
353353
},
354354
{
355355
path: "rust/datafusion/README.md",
356356
hunks: [
357357
["-datafusion = \"#{@release_version}\"",
358-
"+datafusion = \"#{@next_version}-SNAPSHOT\""],
358+
"+datafusion = \"#{@next_snapshot_version}\""],
359359
],
360360
},
361361
{
362362
path: "rust/parquet/Cargo.toml",
363363
hunks: [
364364
["-version = \"#{@release_version}\"",
365-
"+version = \"#{@next_version}-SNAPSHOT\""],
366-
["-arrow = \"#{@release_version}\"",
367-
"+arrow = { path = \"../arrow\" }"]
365+
"+version = \"#{@next_snapshot_version}\""],
366+
["-arrow = { path = \"../arrow\", version = \"#{@release_version}\" }",
367+
"+arrow = { path = \"../arrow\", version = \"#{@next_snapshot_version}\" }"]
368368
],
369369
},
370370
{
371371
path: "rust/parquet/README.md",
372372
hunks: [
373373
["-parquet = \"#{@release_version}\"",
374-
"+parquet = \"#{@next_version}-SNAPSHOT\""],
374+
"+parquet = \"#{@next_snapshot_version}\""],
375375
["-See [crate documentation](https://docs.rs/crate/parquet/#{@release_version}) on available API.",
376-
"+See [crate documentation](https://docs.rs/crate/parquet/#{@next_version}-SNAPSHOT) on available API."],
376+
"+See [crate documentation](https://docs.rs/crate/parquet/#{@next_snapshot_version}) on available API."],
377377
],
378378
},
379379
],

‎dev/release/00-prepare.sh

+4-13
Original file line numberDiff line numberDiff line change
@@ -136,20 +136,11 @@ update_versions() {
136136
cd -
137137

138138
cd "${SOURCE_DIR}/../../rust"
139-
sed -i.bak -E -e \
140-
"s/^version = \".+\"/version = \"${version}\"/g" \
139+
sed -i.bak -E \
140+
-e "s/^version = \".+\"/version = \"${version}\"/g" \
141+
-e "s/^(arrow = .* version = )\".+\"( .*)/\\1\"${version}\"\\2/g" \
142+
-e "s/^(parquet = .* version = )\".+\"( .*)/\\1\"${version}\"\\2/g" \
141143
*/Cargo.toml
142-
if [ ${type} = "snapshot" ]; then
143-
sed -i.bak -E \
144-
-e "s/^arrow = \".+\"/arrow = { path = \"..\/arrow\" }/g" \
145-
-e "s/^parquet = \".+\"/parquet = { path = \"..\/parquet\" }/g" \
146-
*/Cargo.toml
147-
else
148-
sed -i.bak -E \
149-
-e "s/^arrow = \{ path = \".+\" \}/arrow = \"${version}\"/g" \
150-
-e "s/^parquet = \{ path = \".+\" \}/parquet = \"${version}\"/g" \
151-
*/Cargo.toml
152-
fi
153144
rm -f */Cargo.toml.bak
154145
git add */Cargo.toml
155146

‎dev/release/test-helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def detect_versions
7777
@snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
7878
@release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
7979
@next_version = @release_version.gsub(/\A\d+/) {|major| major.succ}
80+
@next_snapshot_version = "#{@next_version}-SNAPSHOT"
8081
r_description = top_dir + "r" + "DESCRIPTION"
8182
@previous_version = r_description.read[/^Version: (.+?)\.9000$/, 1]
8283
end

‎rust/parquet/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ lz4 = "1.23"
4040
zstd = "0.4"
4141
chrono = "0.4"
4242
num-bigint = "0.2"
43-
arrow = { path = "../arrow" }
43+
arrow = { path = "../arrow", version = "1.0.0-SNAPSHOT" }
4444

4545
[dev-dependencies]
4646
lazy_static = "1"

0 commit comments

Comments
 (0)