Skip to content

Commit

Permalink
refactor(deps): remove optional dependency on clickhouse-cityhash and…
Browse files Browse the repository at this point in the history
… lz4

BREAKING CHANGE: New environments will have a different default setting for `compression` in the ClickHouse backend due to removal of optional dependencies. Ibis is still capable of using the optional dependencies but doesn't include them by default. Install `clickhouse-cityhash` and `lz4` to preserve the previous behavior.
  • Loading branch information
cpcloud committed Apr 13, 2023
1 parent a5ec986 commit 736fe26
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 198 deletions.
48 changes: 20 additions & 28 deletions ci/conda-lock/generate.sh
Expand Up @@ -13,9 +13,12 @@ python_version_file="$(mktemp --suffix=.yml)"

extras=(
-e bigquery
-e clickhouse
-e dask
-e druid
-e duckdb
# this doesn't work on any platform yet (issues with resolving some google deps)
# -e geospatial
-e impala
-e mssql
-e mysql
Expand All @@ -31,32 +34,21 @@ extras=(
)
template="conda-lock/{platform}-${python_version}.lock"

linux_osx_extras=()
if [ "${python_version}" != "3.11" ]; then
# clickhouse cityhash doesn't exist for python 3.11
linux_osx_extras+=(-e clickhouse)
fi
function conda_lock() {
local platforms
platforms=(--platform "$1" --platform "$2")
shift 2
conda lock \
--file pyproject.toml \
--file "${python_version_file}" \
--kind explicit \
"${platforms[@]}" \
--filename-template "${template}" \
--filter-extras \
--conda="$(which conda)" \
--category dev --category test --category docs \
"${@}"
}

conda lock \
--file pyproject.toml \
--file "${python_version_file}" \
--kind explicit \
--platform linux-64 \
--platform osx-64 \
--filename-template "${template}" \
--filter-extras \
--conda="$(which conda)" \
--category dev --category test --category docs \
"${extras[@]}" "${linux_osx_extras[@]}" -e datafusion

conda lock \
--file pyproject.toml \
--file "${python_version_file}" \
--kind explicit \
--platform osx-arm64 \
--platform win-64 \
--filename-template "${template}" \
--filter-extras \
--conda="$(which conda)" \
--category dev --category test --category docs \
"${extras[@]}"
conda_lock linux-64 osx-64 "${extras[@]}" -e datafusion
conda_lock osx-arm64 win-64 "${extras[@]}"
3 changes: 1 addition & 2 deletions conda-lock/linux-64-3.10.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions conda-lock/osx-64-3.10.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion conda-lock/osx-arm64-3.10.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion conda-lock/win-64-3.10.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 736fe26

Please sign in to comment.