Merge remote-tracking branch 'upstream/main' into prep-2023.11

dask-contrib · Nov 13, 2023 · 1e98ca8 · 1e98ca8
2 parents 3939796 + cd5ee43
commit 1e98ca8
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 1 deletion.
diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml
@@ -33,6 +33,8 @@ dependencies:
 - sphinx
 - sqlalchemy<2
 - tpot>=0.12.0
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+- triad<0.9.2
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
diff --git a/continuous_integration/environment-3.8-dev.yaml b/continuous_integration/environment-3.8-dev.yaml
@@ -33,6 +33,8 @@ dependencies:
 - sphinx
 - sqlalchemy<2
 - tpot>=0.12.0
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+- triad<0.9.2
 - tzlocal=2.1
 - uvicorn=0.13.4
 - zlib
diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml
@@ -33,6 +33,8 @@ dependencies:
 - sphinx
 - sqlalchemy<2
 - tpot>=0.12.0
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+- triad<0.9.2
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml
@@ -37,6 +37,8 @@ dependencies:
 - sphinx
 - sqlalchemy<2
 - tpot>=0.12.0
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+- triad<0.9.2
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 # GPU-specific requirements

diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml
@@ -37,6 +37,8 @@ dependencies:
 - sphinx
 - sqlalchemy<2
 - tpot>=0.12.0
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+- triad<0.9.2
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 # GPU-specific requirements

diff --git a/docs/environment.yml b/docs/environment.yml
@@ -10,6 +10,8 @@ dependencies:
   - dask>=2022.3.0
   - pandas>=1.4.0
   - fugue>=0.7.3
+  # FIXME: https://github.com/fugue-project/fugue/issues/526
+  - triad<0.9.2
   - fastapi>=0.92.0
   - httpx>=0.24.1
   - uvicorn>=0.13.4

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
@@ -4,6 +4,8 @@ dask-sphinx-theme>=3.0.0
 dask>=2022.3.0
 pandas>=1.4.0
 fugue>=0.7.3
+# FIXME: https://github.com/fugue-project/fugue/issues/526
+triad<0.9.2
 fastapi>=0.92.0
 httpx>=0.24.1
 uvicorn>=0.13.4

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,11 @@ dev = [
     "black==22.10.0",
     "isort==5.12.0",
 ]
-fugue = ["fugue>=0.7.3"]
+fugue = [
+    "fugue>=0.7.3",
+    # FIXME: https://github.com/fugue-project/fugue/issues/526
+    "triad<0.9.2",
+]
 
 [project.entry-points."fugue.plugins"]
 dasksql = "dask_sql.integrations.fugue:_register_engines[fugue]"