Skip to content

Commit a575d5c

Browse files
authored
Merge branch 'main' into add-xz-host-deps
2 parents 65b8f19 + 2c5a492 commit a575d5c

5 files changed

Lines changed: 7 additions & 21 deletions

File tree

.github/workflows/release.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ jobs:
8282
use-mamba: true
8383
python-version: "3.8"
8484
channel-priority: strict
85-
# FIXME: aarch64 builds require glibc>=2.32 to prevent TLS allocation error when importing;
86-
# is there any way we could modify the TLS model of its shared object to avoid this?
87-
# https://bugzilla.redhat.com/show_bug.cgi?id=1722181
88-
# xref: https://github.com/dask-contrib/dask-sql/issues/1169
89-
- name: Update platform tag for aarch64 wheel
90-
if: matrix.os == 'ubuntu-latest'
91-
run: |
92-
mamba install wheel
93-
94-
wheel tags --platform-tag=manylinux_2_32_aarch64 \
95-
--remove \
96-
dist/*_aarch64.whl
9785
- name: Check dist files
9886
run: |
9987
mamba install twine

continuous_integration/recipe/meta.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ requirements:
4444
- prompt-toolkit >=3.0.8
4545
- pygments >=2.7.1
4646
- tabulate
47-
run_constrained:
48-
# FIXME: aarch64 builds require glibc>=2.32 to prevent TLS allocation error when importing;
49-
# is there any way we could modify the TLS model of its shared object to avoid this?
50-
# https://bugzilla.redhat.com/show_bug.cgi?id=1722181
51-
# xref: https://github.com/dask-contrib/dask-sql/issues/1169
52-
- __glibc >=2.32 # [aarch64]
5347

5448
test:
5549
imports:

dask_planner/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dask_planner/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ datafusion-python = { git = "https://github.com/apache/arrow-datafusion-python.g
1414
env_logger = "0.10"
1515
log = "^0.4"
1616
pyo3 = { version = "0.18.3", features = ["extension-module", "abi3", "abi3-py38"] }
17-
pyo3-log = "0.8.2"
17+
pyo3-log = "0.8.3"
1818

1919
[build-dependencies]
2020
pyo3-build-config = "0.19.1"

dask_sql/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# FIXME: can we modify TLS model of Rust object to avoid aarch64 glibc bug?
2+
# https://github.com/dask-contrib/dask-sql/issues/1169
3+
import dask_planner.rust
4+
15
from . import _version, config
26
from .cmd import cmd_loop
37
from .context import Context

0 commit comments

Comments
 (0)