chore: rebase on upstream

.asf.yaml

@@ -16,27 +16,29 @@
 # under the License.
 
 # Documentation can be found here:
-# https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=127405038
+# https://github.com/apache/infrastructure-asfyaml/blob/main/README.md
 
 notifications:
   commits:      [email protected]
   issues:       [email protected]
   pullrequests: [email protected]
+  discussions: [email protected]
   jira_options: link label worklog
 github:
   description: "Official Rust implementation of Apache Arrow"
   homepage: https://arrow.apache.org/
   labels:
     - arrow
     - parquet
-    - object-store
     - rust
   enabled_merge_buttons:
     squash: true
+    squash_commit_message: PR_TITLE_AND_DESC
     merge: false
     rebase: false
   features:
     issues: true
+    discussions: true
   protected_branches:
     main:
       required_status_checks:

.github/dependabot.yml

@@ -1,22 +1,26 @@
 version: 2
 updates:
   - package-ecosystem: cargo
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    target-branch: main
-    labels: [ auto-dependencies, arrow ]
-  - package-ecosystem: cargo
-    directory: "/object_store"
+    directories:
+      - "/"
+      - "/arrow-pyarrow-integration-testing"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
     target-branch: main
-    labels: [ auto-dependencies, object_store ]
+    labels: [auto-dependencies, arrow]
+    groups:
+      prost:
+        applies-to: version-updates
+        patterns:
+          - "prost*"
+      tonic:
+        applies-to: version-updates
+        patterns:
+          - "tonic*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
-    labels: [ auto-dependencies ]
+    labels: [auto-dependencies]

.github/pull_request_template.md

@@ -1,31 +1,28 @@
 # Which issue does this PR close?
 
-<!--
-We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
--->
+We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax.
 
-Closes #.
+- Closes #NNN.
 
 # Rationale for this change
-
-<!--
+
 Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
 Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
--->
 
 # What changes are included in this PR?
 
-<!--
 There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
--->
 
-# Are there any user-facing changes?
+# Are these changes tested?
+
+We typically require tests for all PRs in order to:
+1. Prevent the code from being accidentally broken by subsequent changes
+2. Serve as another way to document the expected behavior of the code
 
+If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
+
+# Are there any user-facing changes?
 
-<!--
 If there are user-facing changes then we may require documentation to be updated before approving the PR.
--->
 
-<!---
 If there are any breaking changes to public APIs, please call them out.
--->

.github/workflows/arrow.yml

@@ -146,11 +146,11 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
-          target: wasm32-unknown-unknown,wasm32-wasi
+          target: wasm32-unknown-unknown,wasm32-wasip1
       - name: Build wasm32-unknown-unknown
         run: cargo build -p arrow --no-default-features --features=json,csv,ipc,ffi --target wasm32-unknown-unknown
-      - name: Build wasm32-wasi
-        run: cargo build -p arrow --no-default-features --features=json,csv,ipc,ffi --target wasm32-wasi
+      - name: Build wasm32-wasip1
+        run: cargo build -p arrow --no-default-features --features=json,csv,ipc,ffi --target wasm32-wasip1
 
   clippy:
     name: Clippy

.github/workflows/arrow_flight.yml

@@ -60,7 +60,7 @@ jobs:
           cargo test -p arrow-flight --all-features
       - name: Test --examples
         run: |
-          cargo test -p arrow-flight  --features=flight-sql-experimental,tls --examples
+          cargo test -p arrow-flight  --features=flight-sql,tls-ring --examples
 
   vendor:
     name: Verify Vendored Code

.github/workflows/dev_pr/labeler.yml

@@ -44,12 +44,10 @@ arrow-flight:
 
 parquet:
   - changed-files:
-    - any-glob-to-any-file: [ 'parquet/**/*' ]
+    - any-glob-to-any-file:
+      - 'parquet/**/*'
+      - 'parquet-variant/**/*'
 
 parquet-derive:
   - changed-files:
     - any-glob-to-any-file: [ 'parquet_derive/**/*' ]
-
-object-store:
-  - changed-files:
-    - any-glob-to-any-file: [ 'object_store/**/*' ]

.github/workflows/integration.yml

@@ -41,6 +41,7 @@ on:
       - arrow-avro/**
       - arrow-ord/**
       - arrow-pyarrow-integration-testing/**
+      - arrow-pyarrow/**
       - arrow-schema/**
       - arrow-select/**
       - arrow-sort/**
@@ -61,12 +62,11 @@ jobs:
       BUILD_DOCS_CPP: OFF
       ARROW_INTEGRATION_CPP: ON
       ARROW_INTEGRATION_CSHARP: ON
-      ARROW_INTEGRATION_GO: ON
-      ARROW_INTEGRATION_JAVA: ON
-      ARROW_INTEGRATION_JS: ON
       ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS: "rust"
-      # Disable nanoarrow integration, due to https://github.com/apache/arrow-rs/issues/5052
-      ARCHERY_INTEGRATION_WITH_NANOARROW: "0"
+      ARCHERY_INTEGRATION_WITH_GO: "1"
+      ARCHERY_INTEGRATION_WITH_JAVA: "1"
+      ARCHERY_INTEGRATION_WITH_JS: "1"
+      ARCHERY_INTEGRATION_WITH_NANOARROW: "1"
       # https://github.com/apache/arrow/pull/38403/files#r1371281630
       ARCHERY_INTEGRATION_WITH_RUST: "1"
       # These are necessary because the github runner overrides $HOME
@@ -98,16 +98,26 @@ jobs:
         with:
           path: rust
           fetch-depth: 0
+      - name: Checkout Arrow Go
+        uses: actions/checkout@v4
+        with:
+          repository: apache/arrow-go
+          path: go
+      - name: Checkout Arrow Java
+        uses: actions/checkout@v4
+        with:
+          repository: apache/arrow-java
+          path: java
+      - name: Checkout Arrow JavaScript
+        uses: actions/checkout@v4
+        with:
+          repository: apache/arrow-js
+          path: js
       - name: Checkout Arrow nanoarrow
         uses: actions/checkout@v4
         with:
           repository: apache/arrow-nanoarrow
           path: nanoarrow
-          fetch-depth: 0
-      # Workaround https://github.com/rust-lang/rust/issues/125067
-      - name: Downgrade rust
-        working-directory: rust
-        run: rustup override set 1.77
       - name: Build
         run: conda run --no-capture-output ci/scripts/integration_arrow_build.sh $PWD /build
       - name: Run
@@ -155,8 +165,9 @@ jobs:
       - name: Run Rust tests
         run: |
           source venv/bin/activate
-          cargo test -p arrow --test pyarrow --features pyarrow
-      - name: Run tests
+          cd arrow-pyarrow-testing
+          cargo test
+      - name: Run Python tests
         run: |
           source venv/bin/activate
           cd arrow-pyarrow-integration-testing