maint: avoid click regression and declare our dependency

dask · Apr 6, 2022 · e522f83 · e522f83
1 parent b7559fd
commit e522f83
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/dask-gateway/Dockerfile b/dask-gateway/Dockerfile
@@ -64,11 +64,12 @@ ARG DISTRIBUTED_VERSION=2022.02.0
 # - Removes unnecessary *.js.map files
 # - Removes unminified bokeh js
 RUN /opt/conda/bin/conda install -c conda-forge --freeze-installed -y \
-        aiohttp=3.8.1 \
-        dask==$DASK_VERSION \
-        distributed==$DISTRIBUTED_VERSION \
-        numpy==1.21.4 \
-        pandas==1.3.4 \
+        "aiohttp==3.8.1" \
+        "click<8.1.0" \
+        "dask==$DASK_VERSION" \
+        "distributed==$DISTRIBUTED_VERSION" \
+        "numpy==1.21.4" \
+        "pandas==1.3.4" \
     && /opt/conda/bin/conda clean -afy \
     && find /opt/conda/ -follow -type f -name '*.a' -delete \
     && find /opt/conda/ -follow -type f -name '*.js.map' -delete \

diff --git a/dask-gateway/setup.py b/dask-gateway/setup.py
@@ -9,7 +9,18 @@
 
 # NOTE: changes to the dependencies here must also be reflected
 # in ../dev-environment.yaml
-install_requires = ["aiohttp", "dask>=2.2.0", "distributed>=2.2.0", "tornado"]
+install_requires = [
+    "aiohttp",
+    # FIXME: click 8.0.4 works, but 8.1.0-8.1.2 has found to cause failures for
+    #        currently unknown reasons.
+    #
+    #        This is tracked in https://github.com/dask/dask-gateway/issues/522.
+    #
+    "click<8.1.0",
+    "dask>=2.2.0",
+    "distributed>=2.2.0",
+    "tornado",
+]
 
 extras_require = {
     "kerberos": [

diff --git a/dev-environment.yaml b/dev-environment.yaml
@@ -13,6 +13,7 @@ dependencies:
   # - dask-gateway/setup.py
   # - dask-gateway-server/setup.py
   - aiohttp # dask-gateway, dask-gateway-server
+  - click # dask-gateway
   - dask # dask-gateway
   - distributed # dask-gateway
   - tornado # dask-gateway, dask-gateway-server