Skip to content

Commit

Permalink
Merge branch 'main' into google-cloud-workload-id-federation
Browse files Browse the repository at this point in the history
  • Loading branch information
tswast authored Dec 26, 2024
2 parents 620bd00 + 2e1aa79 commit 17ec862
Show file tree
Hide file tree
Showing 173 changed files with 4,249 additions and 3,912 deletions.
43 changes: 41 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,43 @@
FROM mcr.microsoft.com/vscode/devcontainers/python:3.11
FROM mcr.microsoft.com/vscode/devcontainers/python:3.13
COPY --from=ghcr.io/astral-sh/uv:0.5.11 /uv /uvx /bin/
ARG USERNAME=vscode

RUN apt-get update && \
apt-get install -y --no-install-recommends libgdal-dev
apt-get install -y --no-install-recommends libgdal-dev && \
rm -rf /var/lib/apt/lists/*

RUN python3 -m pip install pipx --no-cache-dir
RUN python3 -m pipx ensurepath
RUN pipx install rust-just

WORKDIR /app

# Enable bytecode compilation
ENV UV_COMPILE_BYTECODE=1

# Copy from the cache instead of linking since it's a mounted volume
ENV UV_LINK_MODE=copy

COPY . /app

# Install the project's dependencies using the lockfile and settings
RUN --mount=type=cache,target=/root/.cache/uv \
--mount=type=bind,source=uv.lock,target=uv.lock \
--mount=type=bind,source=pyproject.toml,target=pyproject.toml \
uv venv && uv sync --group dev --group tests \
--extra duckdb --extra clickhouse --extra examples --extra geospatial

ENV VENV_DIR=.venv
RUN chown -R $USERNAME $VENV_DIR && chmod -R 755 $VENV_DIR

ENV IBIS_PROJECT=.
RUN chown -R $USERNAME $IBIS_PROJECT

# Place executables in the environment at the front of the path
ENV PATH="/app/.venv/bin:$PATH"

SHELL ["/bin/bash", "-c", "source .venv/bin/activate"]

ENTRYPOINT []

USER $USERNAME
7 changes: 5 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"build": { "dockerfile": "Dockerfile" },
"postCreateCommand": ".devcontainer/postCreate.sh",
"build": { "dockerfile": "Dockerfile", "context": ".." },
"containerUser": "vscode",
"remoteUser": "vscode",
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
"workspaceFolder": "/app",
"customizations": {
"codespaces": {
"openFiles": ["docs/tutorials/getting_started.qmd"]
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
flake.lock linguist-generated=true
poetry.lock linguist-generated=true
uv.lock linguist-generated=true
ibis/examples/pixi.lock linguist-generated=true
requirements-dev.txt linguist-generated=true
docs/_freeze/**/html.json linguist-generated=true
Expand Down
90 changes: 50 additions & 40 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
{
"rangeStrategy": "widen",
"extends": ["config:base", ":enablePreCommit", ":disableDependencyDashboard"],
"schedule": ["after 10pm and before 5am every weekday", "every weekend"],
"extends": ["config:recommended", ":enablePreCommit", ":dependencyDashboard"],
"schedule": [
"after 10pm every weekday",
"every weekend",
"before 5am every weekday"
],
"semanticCommits": "enabled",
"lockFileMaintenance": { "enabled": true },
"lockFileMaintenance": {
"enabled": true
},
"enabledManagers": [
"docker-compose",
"dockerfile",
Expand All @@ -20,74 +26,78 @@
},
{
"matchManagers": ["docker-compose"],
"matchPackagePatterns": ["postgres"],
"matchCurrentVersion": "/^13\\..+$/",
"allowedVersions": "/^13\\..+$/"
"allowedVersions": "/^13\\..+$/",
"matchPackageNames": ["/postgres/"]
},
{
"addLabels": ["pyspark"],
"matchPackageNames": ["/spark/"]
},
{
"matchPackagePrefixes": ["clickhouse"],
"addLabels": ["clickhouse"]
"addLabels": ["clickhouse"],
"matchPackageNames": ["/clickhouse/"]
},
{
"matchPackagePatterns": ["datafusion"],
"addLabels": ["datafusion"]
"addLabels": ["datafusion"],
"matchPackageNames": ["/datafusion/"]
},
{
"matchPackagePatterns": [
"db-dtypes",
"google-cloud-bigquery",
"google-cloud-bigquery-storage",
"pydata-google-auth"
],
"addLabels": ["bigquery"]
"addLabels": ["bigquery"],
"matchPackageNames": [
"/db-dtypes/",
"/google-cloud-bigquery/",
"/google-cloud-bigquery-storage/",
"/pydata-google-auth/"
]
},
{
"matchPackagePatterns": ["duckdb"],
"addLabels": ["duckdb"]
"addLabels": ["duckdb"],
"matchPackageNames": ["/duckdb/"]
},
{
"matchPackagePatterns": ["impyla", "impala", "kudu"],
"addLabels": ["impala"]
"addLabels": ["impala"],
"matchPackageNames": ["/impyla/", "/impala/", "/kudu/"]
},
{
"matchPackagePatterns": ["oracledb", "oracle-free"],
"addLabels": ["oracle"]
"addLabels": ["oracle"],
"matchPackageNames": ["/oracledb/", "/oracle-free/"]
},
{
"matchPackagePatterns": ["polars"],
"addLabels": ["polars"]
"addLabels": ["polars"],
"matchPackageNames": ["/polars/"]
},
{
"matchPackagePatterns": ["psycopg2", "postgres"],
"addLabels": ["postgres"]
"addLabels": ["postgres"],
"matchPackageNames": ["/psycopg2/", "/postgres/"]
},
{
"matchPackagePatterns": ["pydruid", "zookeeper", "druid"],
"addLabels": ["druid"]
"addLabels": ["druid"],
"matchPackageNames": ["/pydruid/", "/zookeeper/", "/druid/"]
},
{
"matchPackagePatterns": ["mysqlclient", "mariadb"],
"addLabels": ["mysql"]
"addLabels": ["mysql"],
"matchPackageNames": ["/mysqlclient/", "/mariadb/"]
},
{
"matchPackagePatterns": ["pymssql", "mssql"],
"addLabels": ["mssql"]
"addLabels": ["mssql"],
"matchPackageNames": ["/pymssql/", "/mssql/"]
},
{
"matchPackagePatterns": ["pyspark"],
"addLabels": ["pyspark"]
"addLabels": ["pyspark"],
"matchPackageNames": ["/pyspark/"]
},
{
"matchPackagePatterns": ["risingwave"],
"addLabels": ["risingwave"]
"addLabels": ["risingwave"],
"matchPackageNames": ["/risingwave/"]
},
{
"matchPackagePatterns": ["snowflake-connector-python"],
"addLabels": ["snowflake"]
"addLabels": ["snowflake"],
"matchPackageNames": ["/snowflake-connector-python/"]
},
{
"matchPackagePatterns": ["trino", "minio"],
"addLabels": ["trino"]
"addLabels": ["trino"],
"matchPackageNames": ["/trino/", "/minio/"]
},
{
"matchDepTypes": ["dev"],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
runs-on: ubuntu-latest
if: github.event.comment.body == '/take'
steps:
- uses: pozil/[email protected].0
- uses: pozil/[email protected].1
with:
assignees: ${{ github.event.comment.user.login }}
8 changes: 4 additions & 4 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
uses: actions/setup-python@v5
id: install_python
with:
python-version: "3.12"
python-version: "3.13"
cache: pip
cache-dependency-path: requirements-dev.txt

- name: install uv
uses: astral-sh/setup-uv@v3.2.2
uses: astral-sh/setup-uv@v5.1.0
with:
enable-cache: true
version: "0.4.x"

- name: update apt-get
run: sudo apt-get update -y -q
Expand All @@ -73,7 +73,7 @@ jobs:
- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
flags: core,${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/create-rotate-key-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Generate a GitHub token
uses: actions/[email protected].0
uses: actions/[email protected].1
id: generate_token
with:
app-id: ${{ secrets.SQUAWK_BOT_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
cancel-in-progress: true
if: github.event.label.name == 'docs-preview'
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
id: generate_token
with:
app-id: ${{ secrets.DOCS_BOT_APP_ID }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
matrix:
python-version:
- "3.10"
- "3.12"
- "3.13"
backend:
- name: snowflake
title: Snowflake
Expand All @@ -53,7 +53,7 @@ jobs:
title: BigQuery
extras:
- --extra bigquery
- python-version: "3.12"
- python-version: "3.13"
backend:
name: bigquery
title: BigQuery
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/[email protected].0
- uses: actions/[email protected].1
id: generate_token
with:
app-id: ${{ secrets.DOCS_BOT_APP_ID }}
Expand All @@ -113,9 +113,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install uv
uses: astral-sh/[email protected]
with:
enable-cache: true
uses: astral-sh/[email protected]

- name: install additional deps
if: matrix.backend.key == 'snowpark'
Expand Down Expand Up @@ -175,7 +173,7 @@ jobs:
- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
flags: backend,${{ matrix.backend.name }},${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
token: ${{ secrets.CODECOV_TOKEN }}
Loading

0 comments on commit 17ec862

Please sign in to comment.