You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by jo...@apache.org on 2021/04/18 16:30:02 UTC
[arrow-rs] branch ci-fix updated: Fiddle paths for testing.
This is an automated email from the ASF dual-hosted git repository.
jorgecarleitao pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/ci-fix by this push:
new 90c8ff7 Fiddle paths for testing.
90c8ff7 is described below
commit 90c8ff7f35ba77078bd2848144a5e6ab93ffc40f
Author: Jorge C. Leitao <jo...@gmail.com>
AuthorDate: Sun Apr 18 16:29:47 2021 +0000
Fiddle paths for testing.
---
.github/workflows/rust.yml | 6 +++---
README.md | 4 ++--
arrow/src/util/test_util.rs | 2 +-
ci/scripts/python_sdist_test.sh | 2 +-
ci/scripts/python_test.sh | 2 +-
ci/scripts/rust_build.sh | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index fd44d2c..9ab74f5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -298,7 +298,7 @@ jobs:
export CARGO_TARGET_DIR="/home/runner/target"
export ARROW_TEST_DATA=$(pwd)/testing/data
- export PARQUET_TEST_DATA=$(pwd)/cpp/submodules/parquet-testing/data
+ export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
# 2020-11-15: There is a cargo-tarpaulin regression in 0.17.0
# see https://github.com/xd009642/tarpaulin/issues/618
@@ -369,7 +369,7 @@ jobs:
# "1" means line tables only, which is useful for panic tracebacks.
RUSTFLAGS: "-C debuginfo=1"
ARROW_TEST_DATA: /__w/arrow-rs/arrow-rs/testing/data
- PARQUET_TEST_DATA: /__w/arrow/arrow/cpp/submodules/parquet-testing/data
+ PARQUET_TEST_DATA: /__w/arrow/arrow/parquet-testing/data
steps:
- uses: actions/checkout@v2
with:
@@ -413,7 +413,7 @@ jobs:
# "1" means line tables only, which is useful for panic tracebacks.
RUSTFLAGS: "-C debuginfo=1"
ARROW_TEST_DATA: /__w/arrow-rs/arrow-rs/testing/data
- PARQUET_TEST_DATA: /__w/arrow/arrow/cpp/submodules/parquet-testing/data
+ PARQUET_TEST_DATA: /__w/arrow/arrow/parquet-testing/data
steps:
- uses: actions/checkout@v2
with:
diff --git a/README.md b/README.md
index 7fdef29..574b60b 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ git submodule update --init
This populates data in two git submodules:
-- `../cpp/submodules/parquet_testing/data` (sourced from https://github.com/apache/parquet-testing.git)
+- `../parquet_testing/data` (sourced from https://github.com/apache/parquet-testing.git)
- `../testing` (sourced from https://github.com/apache/arrow-testing)
By default, `cargo test` will look for these directories at their
@@ -112,7 +112,7 @@ standard location. The following environment variables can be used to override t
```bash
# Optionaly specify a different location for test data
-export PARQUET_TEST_DATA=$(cd ../cpp/submodules/parquet-testing/data; pwd)
+export PARQUET_TEST_DATA=$(cd ../parquet-testing/data; pwd)
export ARROW_TEST_DATA=$(cd ../testing/data; pwd)
```
diff --git a/arrow/src/util/test_util.rs b/arrow/src/util/test_util.rs
index 62e906d..cfbec03 100644
--- a/arrow/src/util/test_util.rs
+++ b/arrow/src/util/test_util.rs
@@ -84,7 +84,7 @@ pub fn arrow_test_data() -> String {
/// Returns the parquest test data directory, which is by default
/// stored in a git submodule rooted at
-/// `arrow/cpp/submodules/parquest-testing/data`.
+/// `arrow/parquest-testing/data`.
///
/// The default can be overridden by the optional environment variable
/// `PARQUET_TEST_DATA`
diff --git a/ci/scripts/python_sdist_test.sh b/ci/scripts/python_sdist_test.sh
index 1388ca0..154c1b3 100755
--- a/ci/scripts/python_sdist_test.sh
+++ b/ci/scripts/python_sdist_test.sh
@@ -23,7 +23,7 @@ arrow_dir=${1}
export ARROW_SOURCE_DIR=${arrow_dir}
export ARROW_TEST_DATA=${arrow_dir}/testing/data
-export PARQUET_TEST_DATA=${arrow_dir}/cpp/submodules/parquet-testing/data
+export PARQUET_TEST_DATA=${arrow_dir}/parquet-testing/data
export PYARROW_CMAKE_GENERATOR=${CMAKE_GENERATOR:-Ninja}
export PYARROW_BUILD_TYPE=${CMAKE_BUILD_TYPE:-debug}
diff --git a/ci/scripts/python_test.sh b/ci/scripts/python_test.sh
index 80a9cde..5af3caf 100755
--- a/ci/scripts/python_test.sh
+++ b/ci/scripts/python_test.sh
@@ -23,7 +23,7 @@ arrow_dir=${1}
export ARROW_SOURCE_DIR=${arrow_dir}
export ARROW_TEST_DATA=${arrow_dir}/testing/data
-export PARQUET_TEST_DATA=${arrow_dir}/cpp/submodules/parquet-testing/data
+export PARQUET_TEST_DATA=${arrow_dir}/parquet-testing/data
export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
# Enable some checks inside Python itself
diff --git a/ci/scripts/rust_build.sh b/ci/scripts/rust_build.sh
index 726ecd8..8099d30 100755
--- a/ci/scripts/rust_build.sh
+++ b/ci/scripts/rust_build.sh
@@ -29,7 +29,7 @@ source_dir=${1}/rust
export RUSTFLAGS="-C debuginfo=1"
export ARROW_TEST_DATA=${arrow_dir}/testing/data
-export PARQUET_TEST_DATA=${arrow_dir}/cpp/submodules/parquet-testing/data
+export PARQUET_TEST_DATA=${arrow_dir}/parquet-testing/data
# show activated toolchain
rustup show