Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unvendor Archery #459

Merged
merged 1 commit into from
Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 2 additions & 74 deletions .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ jobs:
- name: Checkout Arrow
uses: actions/checkout@v2
with:
path: arrow
repository: apache/arrow
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install Archery and Crossbow dependencies
run: pip install -e arrow/dev/archery[bot]
run: pip install -e dev/archery[bot]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping the comment bot for the time being.

- name: Handle Github comment event
env:
ARROW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -49,78 +49,6 @@ jobs:
--event-name ${{ github.event_name }} \
--event-payload ${{ github.event_path }}

autotune:
Copy link
Member Author

@kszucs kszucs Jun 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that this is useful for the rust implementation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree -- I didn't even know it was there lol

name: "Fix all the things"
if: startsWith(github.event.comment.body, '@github-actions autotune')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: r-lib/actions/pr-fetch@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: See what is different
run: |
set -ex
git remote add upstream https://github.com/apache/arrow
git fetch upstream
changed() {
git diff --name-only HEAD..upstream/master | grep -e "$1" >/dev/null 2>&1
}
if changed '^r/.*\.R$'; then
echo "R_DOCS=true" >> $GITHUB_ENV
fi
if changed 'cmake' || changed 'CMake'; then
echo "CMAKE_FORMAT=true" >> $GITHUB_ENV
fi
if changed '^cpp/src'; then
echo "CLANG_FORMAT_CPP=true" >> $GITHUB_ENV
fi
if changed '^r/src'; then
echo "CLANG_FORMAT_R=true" >> $GITHUB_ENV
fi
- name: Run cmake_format
if: env.CMAKE_FORMAT == 'true' || endsWith(github.event.comment.body, 'everything')
run: |
set -ex
export PATH=/home/runner/.local/bin:$PATH
python3 -m pip install --upgrade pip setuptools wheel
python3 -m pip install -r dev/archery/requirements-lint.txt
python3 run-cmake-format.py
- name: Run clang-format on cpp
if: env.CLANG_FORMAT_CPP == 'true' || endsWith(github.event.comment.body, 'everything')
run: |
. .env # To get the clang version we use
cpp/build-support/run_clang_format.py \
--clang_format_binary=clang-format-${CLANG_TOOLS} \
--exclude_glob=cpp/build-support/lint_exclusions.txt \
--source_dir=cpp/src --quiet --fix
- name: Run clang-format on r
if: env.CLANG_FORMAT_R == 'true' || endsWith(github.event.comment.body, 'everything')
run: |
. .env # To get the clang version we use
cpp/build-support/run_clang_format.py \
--clang_format_binary=clang-format-${CLANG_TOOLS} \
--exclude_glob=cpp/build-support/lint_exclusions.txt \
--source_dir=r/src --quiet --fix
- uses: r-lib/actions/setup-r@v1
if: env.R_DOCS == 'true' || endsWith(github.event.comment.body, 'everything')
- name: Update R docs
if: env.R_DOCS == 'true' || endsWith(github.event.comment.body, 'everything')
shell: Rscript {0}
run: |
source("ci/etc/rprofile")
install.packages(c("remotes", "roxygen2"))
remotes::install_deps("r")
roxygen2::roxygenize("r")
- name: Commit results
run: |
git config user.name "$(git log -1 --pretty=format:%an)"
git config user.email "$(git log -1 --pretty=format:%ae)"
git commit -a -m 'Autoformat/render all the things [automated commit]' || echo "No changes to commit"
- uses: r-lib/actions/pr-push@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

rebase:
name: "Rebase"
if: startsWith(github.event.comment.body, '@github-actions rebase')
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,31 @@ env:
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
lint:
name: Lint C++, Python, R, Rust, Docker, RAT

rat:
name: Release Audit Tool (RAT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Today I learned: "RAT" = "Release Audit Tool" 👍

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout Arrow
uses: actions/checkout@v2
with:
repository: apache/arrow
submodules: true
fetch-depth: 0
- name: Checkout Arrow Rust
uses: actions/checkout@v2
with:
path: rust
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: Setup Archery
run: pip install -e dev/archery[docker]
run: pip install -e dev/archery[lint]
- name: Lint
run: archery lint --rat

prettier:
name: Use prettier to check formatting of documents
runs-on: ubuntu-latest
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,13 @@ jobs:
repository: apache/arrow
submodules: true
fetch-depth: 0
# this is temporary: once rust is removed from `apache/arrow`, we are good to go.
- name: Remove Rust from arrow
run: rm -rf rust/
- name: Checkout Arrow Rust
uses: actions/checkout@v2
with:
path: rust
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Setup Archery
Expand Down
4 changes: 0 additions & 4 deletions dev/archery/MANIFEST.in

This file was deleted.

16 changes: 0 additions & 16 deletions dev/archery/archery/__init__.py

This file was deleted.

16 changes: 0 additions & 16 deletions dev/archery/archery/benchmark/__init__.py

This file was deleted.

97 changes: 0 additions & 97 deletions dev/archery/archery/benchmark/codec.py

This file was deleted.

Loading