Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve Docker build failures, update core dependency constraints #804

Merged
merged 1 commit into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions continuous_integration/environment-3.10-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/environment-3.8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/environment-3.9-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/gpuci/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions docker/cloud.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
18 changes: 13 additions & 5 deletions docker/main.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down