Skip to content

Commit

Permalink
Merge branch 'main' into patch-5
Browse files Browse the repository at this point in the history
  • Loading branch information
deepyaman authored Feb 6, 2024
2 parents fb6c6e0 + 4f0aa51 commit 9c45544
Show file tree
Hide file tree
Showing 64 changed files with 1,430 additions and 763 deletions.
5 changes: 5 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[codespell]
# local codespell matches `./docs`, pre-commit codespell matches `docs`
skip = *.lock,.direnv,.git,./docs/_freeze,./docs/_output/**,./docs/_inv/**,docs/_freeze/**,*.svg,*.css,*.html,*.js
ignore-regex = \b(i[if]f|I[IF]F|AFE)\b
builtin = clear,rare,names
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"features": {
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {
"version": "1.4.339"
"version": "1.4.549"
}
}
}
1 change: 1 addition & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
],
"automerge": false,
"labels": ["dependencies"],
"nix": { "enabled": true },
"packageRules": [
{
"matchManagers": ["docker-compose", "dockerfile", "github-actions"],
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: core,${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
4 changes: 4 additions & 0 deletions .github/workflows/docs-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
types:
- labeled

concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
docs_preview:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: backend,${{ matrix.backend.name }},${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
2 changes: 2 additions & 0 deletions .github/workflows/ibis-backends-skip-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- "**/*.qmd"
- "codecov.yml"
- ".envrc"
- ".codespellrc"
branches:
- main
- "*.x.x"
Expand All @@ -20,6 +21,7 @@ on:
- "**/*.qmd"
- "codecov.yml"
- ".envrc"
- ".codespellrc"
branches:
- main
- "*.x.x"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/ibis-backends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- "**/*.qmd"
- "codecov.yml"
- ".envrc"
- ".codespellrc"
branches:
- main
- "*.x.x"
Expand All @@ -20,6 +21,7 @@ on:
- "**/*.qmd"
- "codecov.yml"
- ".envrc"
- ".codespellrc"
branches:
- main
- "*.x.x"
Expand Down Expand Up @@ -397,6 +399,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: backend,${{ matrix.backend.name }},${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
Expand Down Expand Up @@ -524,6 +527,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: backend,${{ matrix.backend.name }},${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
Expand Down Expand Up @@ -596,6 +600,7 @@ jobs:
- name: upload code coverage
# only upload coverage for jobs that aren't mostly xfails
if: success() && matrix.python-version != '3.11'
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: backend,pyspark,${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
Expand Down Expand Up @@ -711,6 +716,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: backend,${{ matrix.backend.name }},${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ibis-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: core,${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
Expand Down Expand Up @@ -177,6 +178,7 @@ jobs:

- name: upload code coverage
if: success()
continue-on-error: true
uses: codecov/codecov-action@v4
with:
flags: core,doctests,${{ runner.os }},python-${{ steps.install_python.outputs.python-version }}
115 changes: 0 additions & 115 deletions .github/workflows/update-deps.yml

This file was deleted.

4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
clickhouse:
image: clickhouse/clickhouse-server:23.12.2.59-alpine
image: clickhouse/clickhouse-server:23.12.3.40-alpine
ports:
- 8123:8123 # http port
- 9000:9000 # native protocol port
Expand Down Expand Up @@ -94,7 +94,7 @@ services:
- trino

minio:
image: bitnami/minio:2024.1.29
image: bitnami/minio:2024.2.4
environment:
MINIO_ROOT_USER: accesskey
MINIO_ROOT_PASSWORD: secretkey
Expand Down
15 changes: 0 additions & 15 deletions docs/_freeze/how-to/extending/builtin/execute-results/html.json

This file was deleted.

16 changes: 16 additions & 0 deletions docs/_freeze/posts/lms-for-data/index/execute-results/html.json

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 9 additions & 18 deletions docs/_tabsets/install.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ installers = [
{"name": "pixi", "line": "Add the `ibis-{extra}` package:", "cmd": "pixi add ibis-{extra}"},
]
with open("./_callouts/pypi_warning.qmd") as f:
pypi_warning = f.read()
for installer in installers:
installer_name = installer["name"]
cmd = installer["cmd"]
Expand All @@ -53,22 +56,10 @@ for installer in installers:
print(f"## {backend_name}")
print()
if backend_name == "Flink":
if installer_name == "pip":
print("Install alongside the `apache-flink` package:")
print()
print(f"```bash\npip install ibis-framework apache-flink\n```")
else:
print(
dedent(
"""\
::: {.callout-important}
## PyFlink is not available on conda-forge; please use `pip` to install the PyFlink backend instead.
:::"""
)
)
continue
if backend_name == "Flink" and installer_name == "pip":
print("Install alongside the `apache-flink` package:")
print()
print(f"```bash\npip install ibis-framework apache-flink\n```")
else:
extra = backend.get("extra", mod)
Expand All @@ -81,8 +72,8 @@ for installer in installers:
print(f"Connect using [`ibis.{mod}.connect`](./backends/{backend_name.lower()}.qmd#ibis.{mod}.connect).")
print()
if installer_name == "pip":
print("{{< include /_callouts/pypi_warning.qmd >}}")
if installer_name == "pip":
print(pypi_warning)
print()
print(":::")
Expand Down
Loading

0 comments on commit 9c45544

Please sign in to comment.