This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 141aed5 use nightly-2021-09-07 for python builds (#978)
141aed5 is described below
commit 141aed5a5af53cc931a6997b6f5d5e36e4a99ac5
Author: Jiayu Liu <[email protected]>
AuthorDate: Fri Sep 10 02:14:21 2021 +0800
use nightly-2021-09-07 for python builds (#978)
* use nightly-2021-09-06
* use nightly-2021-09-07
---
.env | 2 +-
.github/workflows/python_build.yml | 4 +-
.github/workflows/python_test.yaml | 4 +-
.github/workflows/rust.yml | 78 ++++++++++++++++++-------------------
ci/docker/linux-apt-lint.dockerfile | 36 ++++++++---------
python/rust-toolchain | 2 +-
6 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/.env b/.env
index 05517d0..d20df1a 100644
--- a/.env
+++ b/.env
@@ -47,7 +47,7 @@ FEDORA=33
PYTHON=3.6
LLVM=11
CLANG_TOOLS=8
-RUST=nightly-2021-05-10
+RUST=nightly-2021-09-07
GO=1.15
NODE=14
MAVEN=3.5.4
diff --git a/.github/workflows/python_build.yml
b/.github/workflows/python_build.yml
index c010b96..8c6363b 100644
--- a/.github/workflows/python_build.yml
+++ b/.github/workflows/python_build.yml
@@ -19,7 +19,7 @@ name: Python Release Build
on:
push:
tags:
- - '*-rc*'
+ - "*-rc*"
defaults:
run:
@@ -43,7 +43,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
- toolchain: nightly-2021-05-10
+ toolchain: nightly-2021-09-07
- name: Install dependencies
run: |
diff --git a/.github/workflows/python_test.yaml
b/.github/workflows/python_test.yaml
index 8d2eb85..9dc54bf 100644
--- a/.github/workflows/python_test.yaml
+++ b/.github/workflows/python_test.yaml
@@ -25,8 +25,8 @@ jobs:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
run: |
- rustup toolchain install nightly-2021-05-10
- rustup default nightly-2021-05-10
+ rustup toolchain install nightly-2021-09-07
+ rustup default nightly-2021-09-07
rustup component add rustfmt
- name: Cache Cargo
uses: actions/cache@v2
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5246db6..a75af64 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -284,7 +284,7 @@ jobs:
strategy:
matrix:
arch: [amd64]
- rust: [nightly-2021-03-24]
+ rust: [nightly-2021-09-07]
steps:
- uses: actions/checkout@v2
with:
@@ -312,7 +312,6 @@ jobs:
# Ignore MIRI errors until we can get a clean run
cargo miri test || true
-
# Check answers are correct when hash values collide
hash-collisions:
name: Test Hash Collisions on AMD64 Rust ${{ matrix.rust }}
@@ -359,44 +358,43 @@ jobs:
env:
CARGO_HOME: "/github/home/.cargo"
CARGO_TARGET_DIR: "/github/home/target"
-
# Coverage job was failing.
https://github.com/apache/arrow-datafusion/issues/590 tracks re-instating it
- # coverage:
- # name: Coverage
- # runs-on: ubuntu-latest
- # strategy:
- # matrix:
- # arch: [amd64]
- # rust: [stable]
- # steps:
- # - uses: actions/checkout@v2
- # with:
- # submodules: true
- # - name: Cache Cargo
- # uses: actions/cache@v2
- # with:
- # path: /home/runner/.cargo
- # # this key is not equal because the user is different than on a
container (runner vs github)
- # key: cargo-coverage-cache-
- # - name: Cache Rust dependencies
- # uses: actions/cache@v2
- # with:
- # path: /home/runner/target
- # # this key is not equal because coverage uses different
compilation flags.
- # key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache-${{
matrix.rust }}-
- # - name: Run coverage
- # run: |
- # export ARROW_TEST_DATA=$(pwd)/testing/data
- # export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
+# coverage:
+# name: Coverage
+# runs-on: ubuntu-latest
+# strategy:
+# matrix:
+# arch: [amd64]
+# rust: [stable]
+# steps:
+# - uses: actions/checkout@v2
+# with:
+# submodules: true
+# - name: Cache Cargo
+# uses: actions/cache@v2
+# with:
+# path: /home/runner/.cargo
+# # this key is not equal because the user is different than on a
container (runner vs github)
+# key: cargo-coverage-cache-
+# - name: Cache Rust dependencies
+# uses: actions/cache@v2
+# with:
+# path: /home/runner/target
+# # this key is not equal because coverage uses different compilation
flags.
+# key: ${{ runner.os }}-${{ matrix.arch }}-target-coverage-cache-${{
matrix.rust }}-
+# - name: Run coverage
+# run: |
+# export ARROW_TEST_DATA=$(pwd)/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
- # cargo install --version 0.16.0 cargo-tarpaulin
- # cargo tarpaulin --out Xml
- # env:
- # CARGO_HOME: "/home/runner/.cargo"
- # CARGO_TARGET_DIR: "/home/runner/target"
- # - name: Report coverage
- # continue-on-error: true
- # run: bash <(curl -s https://codecov.io/bash)
+# # 2020-11-15: There is a cargo-tarpaulin regression in 0.17.0
+# # see https://github.com/xd009642/tarpaulin/issues/618
+# cargo install --version 0.16.0 cargo-tarpaulin
+# cargo tarpaulin --out Xml
+# env:
+# CARGO_HOME: "/home/runner/.cargo"
+# CARGO_TARGET_DIR: "/home/runner/target"
+# - name: Report coverage
+# continue-on-error: true
+# run: bash <(curl -s https://codecov.io/bash)
diff --git a/ci/docker/linux-apt-lint.dockerfile
b/ci/docker/linux-apt-lint.dockerfile
index 6653891..de033d3 100644
--- a/ci/docker/linux-apt-lint.dockerfile
+++ b/ci/docker/linux-apt-lint.dockerfile
@@ -22,19 +22,19 @@ FROM ${base}
ARG clang_tools
RUN apt-get update && \
apt-get install -y -q \
- clang-${clang_tools} \
- clang-format-${clang_tools} \
- clang-tidy-${clang_tools} \
- clang-tools-${clang_tools} \
- cmake \
- curl \
- libclang-${clang_tools}-dev \
- llvm-${clang_tools}-dev \
- openjdk-11-jdk-headless \
- python3 \
- python3-dev \
- python3-pip \
- ruby \
+ clang-${clang_tools} \
+ clang-format-${clang_tools} \
+ clang-tidy-${clang_tools} \
+ clang-tools-${clang_tools} \
+ cmake \
+ curl \
+ libclang-${clang_tools}-dev \
+ llvm-${clang_tools}-dev \
+ openjdk-11-jdk-headless \
+ python3 \
+ python3-dev \
+ python3-pip \
+ ruby \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
@@ -46,7 +46,7 @@ COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
# Rust linter
-ARG rust=nightly-2021-03-24
+ARG rust=nightly-2021-09-07
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain stable -y
ENV PATH /root/.cargo/bin:$PATH
@@ -59,11 +59,11 @@ RUN ln -s /usr/bin/python3 /usr/local/bin/python && \
ln -s /usr/bin/pip3 /usr/local/bin/pip
COPY dev/archery/requirements.txt \
- dev/archery/requirements-lint.txt \
- /arrow/dev/archery/
+ dev/archery/requirements-lint.txt \
+ /arrow/dev/archery/
RUN pip install \
- -r arrow/dev/archery/requirements.txt \
- -r arrow/dev/archery/requirements-lint.txt
+ -r arrow/dev/archery/requirements.txt \
+ -r arrow/dev/archery/requirements-lint.txt
ENV LC_ALL=C.UTF-8 \
LANG=C.UTF-8
diff --git a/python/rust-toolchain b/python/rust-toolchain
index 6231a95..3e3dc5d 100644
--- a/python/rust-toolchain
+++ b/python/rust-toolchain
@@ -1 +1 @@
-nightly-2021-05-10
+nightly-2021-09-07
