Merge branch 'main' into datetime_coercion

dask-contrib · Nov 13, 2023 · 2c0894f · 2c0894f
2 parents 6fe5d2d + cd5ee43
commit 2c0894f
Show file tree

Hide file tree

Showing 26 changed files with 720 additions and 857 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,7 +1,7 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directory: "/dask_planner"
+    directory: "/"
     schedule:
       interval: "daily"
     ignore:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,7 +25,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      DOCKER_PUSH: ${{ contains(['push', 'release'], github.event_name) && github.repository == 'dask-contrib/dask-sql' }}
+      DOCKER_PUSH: ${{ contains(fromJSON('["push", "release"]'), github.event_name) && github.repository == 'dask-contrib/dask-sql' }}
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,12 +26,6 @@ jobs:
         target: [x86_64, aarch64]
     steps:
       - uses: actions/checkout@v3
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        if: matrix.target == 'aarch64'
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
@@ -43,11 +37,6 @@ jobs:
           args: --release --out dist
           sccache: 'true'
           manylinux: '2_17'
-          before-script-linux: >
-            DOWNLOAD_URL=$(curl --retry 6 --retry-delay 10 -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep -o '"browser_download_url": "[^"]*' | cut -d'"' -f4 | grep "\linux-x86_64.zip$") &&
-            curl --retry 6 --retry-delay 10 -LO $DOWNLOAD_URL &&
-            unzip protoc-*-linux-x86_64.zip -d $HOME/.local
-          docker-options: --env PROTOC=/root/.local/bin/protoc
       - name: Build wheels for aarch64
         if: matrix.target == 'aarch64'
         uses: PyO3/maturin-action@v1
@@ -79,11 +68,6 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
@@ -121,11 +105,6 @@ jobs:
         target: [x86_64, aarch64]
     steps:
       - uses: actions/checkout@v3
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,11 +30,6 @@ jobs:
         id: detect-trigger
         with:
           keyword: "[test-df-upstream]"
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
   # Check crate compiles
   linux-build-lib:
@@ -52,11 +47,6 @@ jobs:
         if: needs.detect-ci-trigger.outputs.triggered == 'true'
         run: |
           bash continuous_integration/scripts/update-dependencies.sh
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Check workspace in debug mode
         run: |
           cargo check
@@ -82,11 +72,6 @@ jobs:
         if: needs.detect-ci-trigger.outputs.triggered == 'true'
         run: |
           bash continuous_integration/scripts/update-dependencies.sh
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run tests
         run: |
           cargo test
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -15,11 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: nightly

diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
@@ -113,11 +113,6 @@ jobs:
           # https://github.com/dask-contrib/dask-sql/pull/1143
           python-version: "3.9"
           channel-priority: strict
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Optionally update upstream cargo dependencies
         if: env.which_upstream == 'DataFusion'
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -111,11 +111,6 @@ jobs:
           # https://github.com/dask-contrib/dask-sql/pull/1143
           python-version: ${{ needs.detect-ci-trigger.outputs.triggered == 'true' && '3.9' || '3.8' }}
           channel-priority: strict
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          version: '3.x'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install dependencies and nothing else
         run: |
           pip install -e . -vv