diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml index 47e7a7d2d..a45d6e6e3 100644 --- a/continuous_integration/environment-3.10-dev.yaml +++ b/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 diff --git a/continuous_integration/environment-3.8-dev.yaml b/continuous_integration/environment-3.8-dev.yaml index 1c3185f11..13e76ff3a 100644 --- a/continuous_integration/environment-3.8-dev.yaml +++ b/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 diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml index 60335b7e2..ed8606e2a 100644 --- a/continuous_integration/environment-3.9-dev.yaml +++ b/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 diff --git a/continuous_integration/gpuci/environment.yaml b/continuous_integration/gpuci/environment.yaml index efbc41122..4c5ef8805 100644 --- a/continuous_integration/gpuci/environment.yaml +++ b/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 diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml index 51d4c5ac0..5349d3a43 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/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 diff --git a/docker/cloud.dockerfile b/docker/cloud.dockerfile index c63406504..30f7c59e3 100644 --- a/docker/cloud.dockerfile +++ b/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"] diff --git a/docker/main.dockerfile b/docker/main.dockerfile index c1b1aab62..0d1aaae25 100644 --- a/docker/main.dockerfile +++ b/docker/main.dockerfile @@ -6,15 +6,23 @@ LABEL author "Nils Braun " # 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 diff --git a/docs/environment.yml b/docs/environment.yml index 1709b592d..2bf710597 100644 --- a/docs/environment.yml +++ b/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 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 09d783488..235dd9e9a 100644 --- a/docs/requirements-docs.txt +++ b/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 diff --git a/setup.py b/setup.py index 0099071a7..caf4254e6 100644 --- a/setup.py +++ b/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", ],