Skip to content

Commit

Permalink
chore: bump versions of Go, pre-commit hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
lidavidm committed Feb 25, 2025
1 parent 5ead7bb commit 5c351d2
Show file tree
Hide file tree
Showing 25 changed files with 66 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ MANYLINUX=2014
MAVEN=3.6.3
PLATFORM=linux/amd64
PYTHON=3.9
GO=1.22.9
ARROW_MAJOR_VERSION=14
GO=1.23.6
ARROW_MAJOR_VERSION=18
DOTNET=8.0

# Used through compose.yaml and serves as the default version for the
Expand Down
17 changes: 10 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0
hooks:
- id: check-xml
- id: check-yaml
Expand Down Expand Up @@ -50,39 +50,42 @@ repos:
- id: cmake-format
args: [--in-place]
- repo: https://github.com/cpplint/cpplint
rev: 1.6.1
rev: f4363d7fc0d5f38c4fd41b658e069e96583da0d5 # 2.0.0
hooks:
- id: cpplint
types_or: [c++]
args:
# From Arrow's config
- "--filter=-whitespace/comments,-whitespace/indent,-readability/braces,-readability/casting,-readability/todo,-readability/alt_tokens,-build/header_guard,-build/c++11,-build/include_order,-build/include_subdir,-runtime/references"
- "--linelength=90"
- "--verbose=2"
- repo: https://github.com/golangci/golangci-lint
rev: v1.61.0
rev: v1.64.5
hooks:
- id: golangci-lint
entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m'
types_or: [go, go-mod]
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.13.0
rev: v2.14.0
hooks:
- id: pretty-format-golang
args: [--autofix]
types_or: [go]
- id: pretty-format-java
args: [--autofix]
types_or: [java]
- repo: https://github.com/psf/black
rev: 24.4.2
rev: 25.1.0
hooks:
- id: black
types_or: [pyi, python]
- repo: https://github.com/PyCQA/flake8
rev: 7.1.0
rev: 7.1.2
hooks:
- id: flake8
types_or: [python]
- repo: https://github.com/PyCQA/isort
rev: 5.13.2
rev: 6.0.0
hooks:
- id: isort
types_or: [python]
Expand Down
2 changes: 2 additions & 0 deletions c/driver/bigquery/bigquery_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#include <algorithm>
#include <cstring>
#include <random>
#include <string>
#include <thread>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock-matchers.h>
Expand Down
3 changes: 3 additions & 0 deletions c/driver/flightsql/dremio_flightsql_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
// specific language governing permissions and limitations
// under the License.

#include <string>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock-matchers.h>
#include <gtest/gtest-matchers.h>
#include <gtest/gtest-param-test.h>
#include <gtest/gtest.h>
#include <nanoarrow/nanoarrow.h>

#include "validation/adbc_validation.h"
#include "validation/adbc_validation_util.h"

Expand Down
2 changes: 2 additions & 0 deletions c/driver/flightsql/sqlite_flightsql_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#include <chrono>
#include <optional>
#include <random>
#include <string>
#include <thread>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock-matchers.h>
Expand Down
1 change: 1 addition & 0 deletions c/driver/framework/objects.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "driver/framework/objects.h"

#include <string_view>
#include <vector>

#include "nanoarrow/nanoarrow.hpp"

Expand Down
2 changes: 2 additions & 0 deletions c/driver/postgresql/copy/postgres_copy_reader_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.

#include <string>

#include <gtest/gtest.h>
#include <nanoarrow/nanoarrow.hpp>

Expand Down
3 changes: 3 additions & 0 deletions c/driver/postgresql/copy/postgres_copy_writer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
// under the License.

#include <limits>
#include <memory>
#include <optional>
#include <string>
#include <tuple>
#include <vector>

#include <gtest/gtest-param-test.h>
#include <gtest/gtest.h>
Expand Down
1 change: 1 addition & 0 deletions c/driver/postgresql/database.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cinttypes>
#include <cstring>
#include <memory>
#include <string>
#include <utility>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion c/driver/postgresql/error.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "error.h"

#include <stdarg.h>
#include <stdio.h>
#include <cstdio>
#include <cstring>
#include <string>
#include <vector>
Expand Down
2 changes: 2 additions & 0 deletions c/driver/postgresql/postgres_type_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
// specific language governing permissions and limitations
// under the License.

#include <string>
#include <utility>
#include <vector>

#include <gtest/gtest.h>
#include <nanoarrow/nanoarrow.hpp>
Expand Down
3 changes: 3 additions & 0 deletions c/driver/postgresql/postgresql_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
#include <cstring>
#include <limits>
#include <optional>
#include <string>
#include <utility>
#include <variant>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gtest/gtest-param-test.h>
Expand Down
2 changes: 2 additions & 0 deletions c/driver/postgresql/result_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include <charconv>
#include <memory>
#include <string>
#include <vector>

#define ADBC_FRAMEWORK_USE_FMT
#include "driver/framework/status.h"
Expand Down
1 change: 1 addition & 0 deletions c/driver/postgresql/statement.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <iostream>
#include <limits>
#include <memory>
#include <string>
#include <utility>
#include <vector>

Expand Down
10 changes: 7 additions & 3 deletions c/driver/snowflake/snowflake_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,19 @@
// specific language governing permissions and limitations
// under the License.

#include <algorithm>
#include <cstring>
#include <random>
#include <string>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock-matchers.h>
#include <gtest/gtest-matchers.h>
#include <gtest/gtest-param-test.h>
#include <gtest/gtest.h>
#include <nanoarrow/nanoarrow.h>
#include <algorithm>
#include <cstring>
#include <random>

#include "validation/adbc_validation.h"
#include "validation/adbc_validation_util.h"

Expand Down
5 changes: 5 additions & 0 deletions c/driver/sqlite/sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
// specific language governing permissions and limitations
// under the License.

#include <cstdio>
#include <limits>
#include <memory>
#include <string>
#include <utility>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <sqlite3.h>
Expand Down
2 changes: 2 additions & 0 deletions c/driver/sqlite/sqlite_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <optional>
#include <string>
#include <string_view>
#include <utility>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock-matchers.h>
Expand Down
1 change: 1 addition & 0 deletions c/integration/duckdb/duckdb_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.

#include <cstdlib>
#include <string>

#include <arrow-adbc/adbc.h>
#include <arrow-adbc/adbc_driver_manager.h>
Expand Down
4 changes: 4 additions & 0 deletions c/validation/adbc_validation_connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@

#include "adbc_validation.h"

#include <algorithm>
#include <cstring>
#include <string>
#include <utility>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock.h>
Expand Down
3 changes: 3 additions & 0 deletions c/validation/adbc_validation_statement.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
#include "adbc_validation.h"

#include <cstring>
#include <string>
#include <utility>
#include <vector>

#include <arrow-adbc/adbc.h>
#include <gmock/gmock.h>
Expand Down
5 changes: 5 additions & 0 deletions c/validation/adbc_validation_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
// under the License.

#include "adbc_validation_util.h"

#include <string>
#include <utility>
#include <vector>

#include <arrow-adbc/adbc.h>

#include "adbc_validation.h"
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/golang-flightsql-sqlite.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM golang:${GO}

ARG ARROW_MAJOR_VERSION

RUN go install github.com/apache/arrow/go/v${ARROW_MAJOR_VERSION}/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server@latest
RUN go install github.com/apache/arrow-go/v${ARROW_MAJOR_VERSION}/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server@latest
EXPOSE 8080

ENTRYPOINT /go/bin/sqlite_flightsql_server -host 0.0.0.0 -port 8080
4 changes: 1 addition & 3 deletions go/adbc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@

module github.com/apache/arrow-adbc/go/adbc

go 1.22.7

toolchain go1.22.9
go 1.23.0

require (
cloud.google.com/go/bigquery v1.66.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <cstring>
#include <iostream>
#include <mutex>
#include <string>
#include <thread>

namespace pyadbc_driver_manager {
Expand Down
1 change: 1 addition & 0 deletions r/adbcdrivermanager/src/driver_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <Rinternals.h>

#include <cstring>
#include <string>
#include <unordered_map>

#include "driver/framework/base_driver.h"
Expand Down

0 comments on commit 5c351d2

Please sign in to comment.