Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Install HawkEye
uses: taiki-e/install-action@288e746965032cfcc232e09af2daf5f23c14d780 # v2.86.1
with:
tool: hawkeye@6.2.0
tool: hawkeye

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why did we drop the pinned version? wouldn't having tool: hawkeye@7.0.0 better.

- name: Run license header check
run: ci/scripts/license_header.sh

Expand Down
1 change: 0 additions & 1 deletion benchmarks/compile_profile.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python3

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
1 change: 0 additions & 1 deletion benchmarks/lineprotocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# specific language governing permissions and limitations
# under the License.


"""
Converts a given json to LineProtocol format that can be
visualised by grafana/other systems that support LineProtocol.
Expand Down
10 changes: 1 addition & 9 deletions ci/scripts/license_header.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,7 @@ fi

if [[ "$MODE" == "write" ]]; then
echo "[${SCRIPT_NAME}] \`hawkeye format --config ${HAWKEYE_CONFIG}\`"
if ! hawkeye format --config "${HAWKEYE_CONFIG}"; then
status=$?
# hawkeye returns exit code 1 when it applies fixes; treat that as success.
if [[ $status -eq 1 ]]; then
echo "[${SCRIPT_NAME}] hawkeye format applied fixes (exit 1 treated as success)"
else
exit $status
fi
fi
hawkeye format --config "${HAWKEYE_CONFIG}"
else
echo "[${SCRIPT_NAME}] \`hawkeye check --config ${HAWKEYE_CONFIG}\`"
hawkeye check --config "${HAWKEYE_CONFIG}"
Expand Down
2 changes: 0 additions & 2 deletions docs/scripts/update_committer_list.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python3

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand All @@ -17,7 +16,6 @@
# specific language governing permissions and limitations
# under the License.


"""
Utility for updating the committer list in the governance documentation
by reading from the Apache DataFusion phonebook and combining with existing data.
Expand Down
10 changes: 6 additions & 4 deletions licenserc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
# specific language governing permissions and limitations
# under the License.

headerPath = "Apache-2.0-ASF.txt"
[header]
builtin = "Apache-2.0-ASF"

[files]
includes = [
"*.rs",
"*.py",
Expand All @@ -25,7 +27,7 @@ includes = [

excludes = [
# generated code
"datafusion/proto/src/generated/",
"datafusion/proto-common/src/generated/",
"datafusion/proto-models/src/generated/",
"datafusion/proto/src/generated/**",
"datafusion/proto-common/src/generated/**",
"datafusion/proto-models/src/generated/**",
]
2 changes: 1 addition & 1 deletion test-utils/src/string_gen.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::array_gen::StringArrayGenerator;
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
Expand All @@ -16,6 +15,7 @@ use crate::array_gen::StringArrayGenerator;
// specific language governing permissions and limitations
// under the License.

use crate::array_gen::StringArrayGenerator;
use crate::stagger_batch;
use arrow::record_batch::RecordBatch;
use rand::rngs::StdRng;
Expand Down