Skip to content

Commit

Permalink
Merge branch 'main' into timestampdiff
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahyurick authored Nov 17, 2022
2 parents 8487140 + 4933d34 commit 86becde
Show file tree
Hide file tree
Showing 48 changed files with 3,008 additions and 349 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ updates:
update-types: ["version-update:semver-major"]
- dependency-name: "datafusion-*"
update-types: ["version-update:semver-major"]
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "weekly"
4 changes: 2 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
name: Build (and optionally upload) the conda nightly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: github.repository == 'dask-contrib/dask-sql'
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
output-dir: dist
config-file: "dask_planner/pyproject.toml"
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
outputs:
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: xarray-contrib/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Run pre-commit hooks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
- uses: actions-rs/toolchain@v1
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down Expand Up @@ -86,9 +86,9 @@ jobs:
name: "Test upstream dev in a dask cluster"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down Expand Up @@ -138,9 +138,9 @@ jobs:
name: "Test importing with bare requirements and upstream dev"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
python-version: "3.8"
mamba-version: "*"
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Report failures
uses: actions/github-script@v3
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
outputs:
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: xarray-contrib/[email protected]
Expand All @@ -44,9 +44,9 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down Expand Up @@ -87,9 +87,9 @@ jobs:
needs: [detect-ci-trigger]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
miniforge-variant: Mambaforge
use-mamba: true
Expand Down Expand Up @@ -137,9 +137,9 @@ jobs:
needs: [detect-ci-trigger]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v2.2.0
with:
python-version: "3.8"
mamba-version: "*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gpuci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.repository == 'dask-contrib/dask-sql'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Parse current axis YAML
uses: the-coding-turtle/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.10.0
hooks:
- id: black
language_version: python3
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
language_version: python3
- repo: https://github.com/pycqa/isort
rev: 5.7.0
rev: 5.10.1
hooks:
- id: isort
args:
Expand Down
3 changes: 3 additions & 0 deletions continuous_integration/environment-3.10-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ dependencies:
- pandas>=1.4.0
- pre-commit
- prompt_toolkit>=3.0.8
# TODO: remove once py is added to pytest downstream libraries
# https://github.com/pytest-dev/pytest-xdist/issues/832
- py
- psycopg2
- pyarrow>=6.0.1
- pygments>=2.7.1
Expand Down
3 changes: 3 additions & 0 deletions continuous_integration/environment-3.8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ dependencies:
- pre-commit
- prompt_toolkit=3.0.8
- psycopg2
# TODO: remove once py is added to pytest downstream libraries
# https://github.com/pytest-dev/pytest-xdist/issues/832
- py
- pyarrow=6.0.1
- pygments=2.7.1
- pyhive
Expand Down
3 changes: 3 additions & 0 deletions continuous_integration/environment-3.9-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ dependencies:
- pre-commit
- prompt_toolkit>=3.0.8
- psycopg2
# TODO: remove once py is added to pytest downstream libraries
# https://github.com/pytest-dev/pytest-xdist/issues/832
- py
- pyarrow>=6.0.1
- pygments>=2.7.1
- pyhive
Expand Down
3 changes: 3 additions & 0 deletions continuous_integration/gpuci/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ dependencies:
- pandas>=1.4.0
- pre-commit
- prompt_toolkit>=3.0.8
# TODO: remove once py is added to pytest downstream libraries
# https://github.com/pytest-dev/pytest-xdist/issues/832
- py
- psycopg2
- pyarrow>=6.0.1
- pygments>=2.7.1
Expand Down
Loading

0 comments on commit 86becde

Please sign in to comment.