Resolve docker build failures, update dependencies

Author: charlesbluca

continuous_integration/environment-3.10-dev.yaml

@@ -16,10 +16,10 @@ dependencies:
 - nest-asyncio
 - pandas>=1.4.0
 - pre-commit
-- prompt_toolkit
+- prompt_toolkit>=3.0.8
 - psycopg2
 - pyarrow>=6.0.1
-- pygments
+- pygments>=2.7.1
 - pyhive
 - pytest-cov
 - pytest-xdist

continuous_integration/environment-3.8-dev.yaml

@@ -16,10 +16,10 @@ dependencies:
 - nest-asyncio
 - pandas=1.4.0
 - pre-commit
-- prompt_toolkit
+- prompt_toolkit=3.0.8
 - psycopg2
 - pyarrow=6.0.1
-- pygments
+- pygments=2.7.1
 - pyhive
 - pytest-cov
 - pytest-xdist

continuous_integration/environment-3.9-dev.yaml

@@ -16,10 +16,10 @@ dependencies:
 - nest-asyncio
 - pandas>=1.4.0
 - pre-commit
-- prompt_toolkit
+- prompt_toolkit>=3.0.8
 - psycopg2
 - pyarrow>=6.0.1
-- pygments
+- pygments>=2.7.1
 - pyhive
 - pytest-cov
 - pytest-xdist

continuous_integration/gpuci/environment.yaml

@@ -19,10 +19,10 @@ dependencies:
 - nest-asyncio
 - pandas>=1.4.0
 - pre-commit
-- prompt_toolkit
+- prompt_toolkit>=3.0.8
 - psycopg2
 - pyarrow>=6.0.1
-- pygments
+- pygments>=2.7.1
 - pyhive
 - pytest-cov
 - pytest-xdist

continuous_integration/recipe/meta.yaml

@@ -35,8 +35,8 @@ requirements:
     - fastapi >=0.69.0
     - uvicorn >=0.11.3
     - tzlocal >=2.1
-    - prompt-toolkit
-    - pygments
+    - prompt-toolkit >=3.0.8
+    - pygments >=2.7.1
     - nest-asyncio
     - tabulate
 

docker/cloud.dockerfile

@@ -2,10 +2,10 @@ ARG DOCKER_META_VERSION
 FROM nbraun/dask-sql:${DOCKER_META_VERSION}
 
 RUN conda config --add channels conda-forge \
-    && /opt/conda/bin/conda install --freeze-installed \
-    "s3fs" \
-    "dask-cloudprovider" \
-    && pip install awscli \
+    && /opt/conda/bin/mamba install --freeze-installed -y \
+    s3fs \
+    dask-cloudprovider \
+    awscli \
     && conda clean -ay
 
 ENTRYPOINT ["tini", "-g", "--", "/usr/bin/prepare.sh"]

docker/main.dockerfile

@@ -6,15 +6,23 @@ LABEL author "Nils Braun <[email protected]>"
 # Install dependencies for dask-sql
 COPY docker/conda.txt /opt/dask_sql/
 RUN conda config --add channels conda-forge \
-    && /opt/conda/bin/conda install --freeze-installed \
-    "tzlocal>=2.1" \
+    && /opt/conda/bin/mamba install --freeze-installed -y \
+    # build requirements
+    "rust=1.62.1" \
+    "setuptools-rust>=1.4.1" \
+    # core dependencies
+    "dask>=2022.3.0" \
+    "pandas>=1.4.0" \
     "fastapi>=0.69.0" \
     "uvicorn>=0.11.3" \
-    "pyarrow>=6.0.1" \
+    "tzlocal>=2.1" \
     "prompt_toolkit>=3.0.8" \
     "pygments>=2.7.1" \
+    tabulate \
+    nest-asyncio \
+    # additional dependencies
+    "pyarrow>=6.0.1" \
     "dask-ml>=2022.1.22" \
-    "setuptools-rust>=1.4.1" \
     "scikit-learn>=1.0.0" \
     "intake>=0.6.0" \
     && conda clean -ay
@@ -27,7 +35,7 @@ COPY .git /opt/dask_sql/.git
 COPY dask_planner /opt/dask_sql/dask_planner
 COPY dask_sql /opt/dask_sql/dask_sql
 RUN cd /opt/dask_sql/ \
-    && pip install -e .
+    && pip install -e . -vv
 
 # Set the script to execute
 COPY scripts/startup_script.py /opt/dask_sql/startup_script.py

docs/environment.yml

@@ -14,8 +14,8 @@ dependencies:
   - fastapi>=0.69.0
   - uvicorn>=0.11.3
   - tzlocal>=2.1
-  - prompt_toolkit
-  - pygments
+  - prompt_toolkit>=3.0.8
+  - pygments>=2.7.1
   - tabulate
   - nest-asyncio
   - setuptools-rust>=1.4.1

docs/requirements-docs.txt

@@ -7,8 +7,8 @@ fugue>=0.7.0
 fastapi>=0.69.0
 uvicorn>=0.11.3
 tzlocal>=2.1
-prompt_toolkit
-pygments
+prompt_toolkit>=3.0.8
+pygments>=2.7.1
 tabulate
 nest-asyncio
 setuptools-rust>=1.4.1

setup.py

@@ -47,8 +47,8 @@
         "fastapi>=0.69.0",
         "uvicorn>=0.11.3",
         "tzlocal>=2.1",
-        "prompt_toolkit",
-        "pygments",
+        "prompt_toolkit>=3.0.8",
+        "pygments>=2.7.1",
         "tabulate",
         "nest-asyncio",
     ],