From eed1b82b1c2ff817129f75533170f8e6148dbf07 Mon Sep 17 00:00:00 2001 From: "Jorge C. Leitao" Date: Sun, 18 Apr 2021 18:41:41 +0000 Subject: [PATCH] More cleanups. --- .gitignore | 6 ++ dev/.gitignore | 1 + dev/archery/archery/cli.py | 5 +- dev/archery/archery/utils/source.py | 8 +- dev/release/rat_exclude_files.txt | 111 +--------------------------- 5 files changed, 15 insertions(+), 116 deletions(-) diff --git a/.gitignore b/.gitignore index 5397fe371dfd..31bdf49ce43e 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,9 @@ cpp/Brewfile.lock.json target Cargo.lock +rusty-tags.vi +.history +.flatbuffers/ + +.vscode +venv/* diff --git a/dev/.gitignore b/dev/.gitignore index b0792939f2ad..399c30926260 100644 --- a/dev/.gitignore +++ b/dev/.gitignore @@ -18,3 +18,4 @@ # Python virtual environments for dev tools .venv*/ +__pycache__ diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py index bcaddf1c795d..4bbde75b74cf 100644 --- a/dev/archery/archery/cli.py +++ b/dev/archery/archery/cli.py @@ -289,8 +289,7 @@ def decorate_lint_command(cmd): @archery.command(short_help="Check Arrow source tree for errors") -@click.option("--src", metavar="", default=None, - callback=validate_arrow_sources, +@click.option("--src", metavar="", default=".", help="Specify Arrow source directory") @click.option("--fix", is_flag=True, type=BOOL, default=False, help="Toggle fixing the lint errors if the linter supports it.") @@ -301,6 +300,8 @@ def decorate_lint_command(cmd): @decorate_lint_command @click.pass_context def lint(ctx, src, fix, iwyu_all, **checks): + src = ArrowSources(src) + if checks.pop('all'): # "--all" is given => enable all non-selected checks for k, v in checks.items(): diff --git a/dev/archery/archery/utils/source.py b/dev/archery/archery/utils/source.py index d30b4f152e54..1ae0fe025049 100644 --- a/dev/archery/archery/utils/source.py +++ b/dev/archery/archery/utils/source.py @@ -45,13 +45,7 @@ def __init__(self, path): ---------- path : src """ - path = Path(path) - # validate by checking a specific path in the arrow source tree - if not (path / 'cpp' / 'CMakeLists.txt').exists(): - raise InvalidArrowSource( - "No Arrow C++ sources found in {}.".format(path) - ) - self.path = path + self.path = Path(path) @property def archery(self): diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt index 68f5668098e7..ead9c8db16f4 100644 --- a/dev/release/rat_exclude_files.txt +++ b/dev/release/rat_exclude_files.txt @@ -12,37 +12,6 @@ ci/etc/rprofile ci/etc/*.patch ci/vcpkg/*.patch CHANGELOG.md -cpp/CHANGELOG_PARQUET.md -cpp/src/arrow/io/mman.h -cpp/src/arrow/util/random.h -cpp/src/arrow/status.cc -cpp/src/arrow/status.h -cpp/src/arrow/vendored/* -cpp/build-support/asan_symbolize.py -cpp/build-support/cpplint.py -cpp/build-support/lint_exclusions.txt -cpp/build-support/iwyu/* -cpp/cmake_modules/FindPythonLibsNew.cmake -cpp/cmake_modules/SnappyCMakeLists.txt -cpp/cmake_modules/SnappyConfig.h -cpp/examples/parquet/parquet-arrow/cmake_modules/FindArrow.cmake -cpp/src/parquet/.parquetcppversion -cpp/src/generated/parquet_constants.cpp -cpp/src/generated/parquet_constants.h -cpp/src/generated/parquet_types.cpp -cpp/src/generated/parquet_types.h -cpp/src/plasma/thirdparty/ae/ae.c -cpp/src/plasma/thirdparty/ae/ae.h -cpp/src/plasma/thirdparty/ae/ae_epoll.c -cpp/src/plasma/thirdparty/ae/ae_evport.c -cpp/src/plasma/thirdparty/ae/ae_kqueue.c -cpp/src/plasma/thirdparty/ae/ae_select.c -cpp/src/plasma/thirdparty/ae/config.h -cpp/src/plasma/thirdparty/ae/zmalloc.h -cpp/src/plasma/thirdparty/dlmalloc.c -cpp/thirdparty/flatbuffers/include/flatbuffers/base.h -cpp/thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h -cpp/thirdparty/flatbuffers/include/flatbuffers/stl_emulation.h dev/requirements*.txt dev/archery/MANIFEST.in dev/archery/requirements*.txt @@ -115,56 +84,11 @@ dev/tasks/linux-packages/apache-arrow/debian/source/format dev/tasks/linux-packages/apache-arrow/debian/watch dev/tasks/requirements*.txt dev/tasks/conda-recipes/* -docs/requirements.txt -go/arrow/flight/Flight_grpc.pb.go -go/arrow/go.sum -go/arrow/Gopkg.lock -go/arrow/flight/Flight.pb.go -go/arrow/flight/Flight_grpc.pb.go -go/arrow/internal/cpu/* -go/arrow/type_string.go -go/*.tmpldata -go/*.s -go/parquet/go.sum -go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go -go/parquet/internal/gen-go/parquet/parquet-consts.go -go/parquet/internal/gen-go/parquet/parquet.go -js/.npmignore -js/closure-compiler-scripts/* -js/src/fb/*.ts -js/yarn.lock -js/.eslintignore -python/cmake_modules -python/cmake_modules/FindPythonLibsNew.cmake -python/cmake_modules/SnappyCMakeLists.txt -python/cmake_modules/SnappyConfig.h -python/MANIFEST.in -python/manylinux1/.dockerignore -python/pyarrow/includes/__init__.pxd -python/pyarrow/tests/__init__.py -python/pyarrow/vendored/* -python/requirements*.txt pax_global_header MANIFEST.in __init__.pxd __init__.py requirements.txt -csharp/.gitattributes -csharp/dummy.git/* -csharp/src/Apache.Arrow/Flatbuf/* -csharp/Apache.Arrow.sln -csharp/examples/FluentBuilderExample/FluentBuilderExample.csproj -csharp/examples/Examples.sln -csharp/src/Apache.Arrow/Apache.Arrow.csproj -csharp/src/Apache.Arrow/Properties/Resources.Designer.cs -csharp/src/Apache.Arrow/Properties/Resources.resx -csharp/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj -csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj -csharp/test/Apache.Arrow.Tests/app.config -csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj -csharp/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj -csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj -csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj *.html *.sgml *.css @@ -173,35 +97,8 @@ csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj *.svg *.devhelp2 *.scss -r/R/arrowExports.R -r/src/arrowExports.cpp -r/DESCRIPTION -r/LICENSE.md -r/NAMESPACE -r/.Rbuildignore -r/arrow.Rproj -r/README.md -r/README.Rmd -r/man/*.Rd -r/cran-comments.md -r/vignettes/*.Rmd -r/tests/testthat/test-*.txt -r/inst/include/cpp11.hpp -r/inst/include/cpp11/*.hpp .gitattributes -ruby/red-arrow/.yardopts -rust/arrow/test/data/*.csv -rust/rust-toolchain -rust/arrow-flight/src/arrow.flight.protocol.rs -julia/Arrow/Project.toml -julia/Arrow/README.md -julia/Arrow/docs/Manifest.toml -julia/Arrow/docs/Project.toml -julia/Arrow/docs/make.jl -julia/Arrow/docs/mkdocs.yml -julia/Arrow/docs/src/index.md -julia/Arrow/docs/src/manual.md -julia/Arrow/docs/src/reference.md -rust/ballista/rust/benchmarks/tpch/queries/q*.sql -rust/ballista/rust/scheduler/testdata/* -rust/ballista/ui/scheduler/yarn.lock +rust-toolchain +ballista/rust/benchmarks/tpch/queries/q*.sql +ballista/rust/scheduler/testdata/* +ballista/ui/scheduler/yarn.lock