Skip to content

Commit 5140993

Browse files
committed
Merge branch 'main' into ibis-project#8989
2 parents a14012d + 88de65d commit 5140993

18 files changed

+118
-1457
lines changed

.devcontainer/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM mcr.microsoft.com/vscode/devcontainers/python:3.11
2+
3+
RUN apt-get update && \
4+
apt-get install -y --no-install-recommends libgdal-dev

.devcontainer/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"image": "mcr.microsoft.com/vscode/devcontainers/python:3.11",
3-
"updateContentCommand": ".devcontainer/updateContent.sh",
2+
"build": { "dockerfile": "Dockerfile" },
3+
"postCreateCommand": ".devcontainer/postCreate.sh",
44
"customizations": {
55
"codespaces": {
66
"openFiles": ["docs/tutorials/getting_started.qmd"]

.devcontainer/postCreate.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
# install ibis
4+
python3 -m pip install ipython
5+
POETRY_DYNAMIC_VERSIONING=false python3 -m pip install -e '.[duckdb,clickhouse,examples,geospatial]'

.devcontainer/updateContent.sh

-5
This file was deleted.

.github/workflows/ibis-backends-skip-helper.yml

+5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,16 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- run: echo "No build required"
38+
test_pyspark:
39+
runs-on: ubuntu-latest
40+
steps:
41+
- run: echo "No build required"
3842
backends:
3943
# this job exists so that we can use a single job from this workflow to gate merging
4044
runs-on: ubuntu-latest
4145
needs:
4246
- test_backends_min_version
4347
- test_backends
48+
- test_pyspark
4449
steps:
4550
- run: exit 0

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ This allows you to combine the flexibility of Python with the scale and performa
135135

136136
Ibis supports 20+ backends:
137137

138-
- [Apache Arrow DataFusion](https://ibis-project.org/backends/datafusion/)
138+
- [Apache DataFusion](https://ibis-project.org/backends/datafusion/)
139139
- [Apache Druid](https://ibis-project.org/backends/druid/)
140140
- [Apache Flink](https://ibis-project.org/backends/flink)
141141
- [Apache Impala](https://ibis-project.org/backends/impala/)

compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ services:
9494
- trino
9595

9696
minio:
97-
image: bitnami/minio:2024.4.6
97+
image: bitnami/minio:2024.4.18
9898
environment:
9999
MINIO_ROOT_USER: accesskey
100100
MINIO_ROOT_PASSWORD: secretkey

conda/environment-arm64-flink.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- python =3.10
77
- atpublic >=2.3
88
- bidict >=0.22.1
9+
- black >=22.1.0,<25
910
- clickhouse-connect >=0.5.23
1011
- dask >=2022.9.1
1112
- datafusion >=0.6

conda/environment-arm64.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- python >=3.10
77
- atpublic >=2.3
88
- bidict >=0.22.1
9+
- black >=22.1.0,<25
910
- clickhouse-connect >=0.5.23
1011
- dask >=2022.9.1
1112
- datafusion >=0.6

conda/environment.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- apache-flink
77
- atpublic >=2.3
88
- bidict >=0.22.1
9+
- black >=22.1.0,<25
910
- clickhouse-connect >=0.5.23
1011
- dask >=2022.9.1
1112
- datafusion >=0.6

docs/contribute/01_environment.qmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ for manager, params in managers.items():
9797
)
9898
print()
9999
print(" ```sh")
100-
print(" pip install -e '.[all]'")
100+
print(" pip install -e .")
101101
print(" ```")
102102
print()
103103
```
@@ -200,7 +200,7 @@ For a better development experience see the `conda/mamba` or `nix` setup instruc
200200
1. Install ibis in development mode
201201

202202
```sh
203-
pip install -e '.[all]'
203+
pip install -e .
204204
```
205205

206206
:::

0 commit comments

Comments
 (0)