Skip to content
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 @@ -5,9 +5,9 @@ channels:
dependencies:
- c-compiler
- dask>=2022.3.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
Comment on lines -8 to -9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For more context, fastapi version 0.86.0 pins to starlette version 0.20.4, which was the last release before 0.87.0 (and so the latest version of fastapi allowed by this pin). Hence why the starlette installed has that CVE

- fastapi>=0.92.0
- fugue>=0.7.3
- httpx>=0.24.1
- intake>=0.6.0
- jsonschema
- lightgbm
Expand Down
3 changes: 2 additions & 1 deletion continuous_integration/environment-3.8-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ channels:
dependencies:
- c-compiler
- dask=2022.3.0
- fastapi=0.69.0
- fastapi=0.92.0
- fugue=0.7.3
- httpx=0.24.1
- intake=0.6.0
- jsonschema
- lightgbm
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 @@ -5,9 +5,9 @@ channels:
dependencies:
- c-compiler
- dask>=2022.3.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fastapi>=0.92.0
- fugue>=0.7.3
- httpx>=0.24.1
- intake>=0.6.0
- jsonschema
- lightgbm
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/gpuci/environment-3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ channels:
dependencies:
- c-compiler
- dask>=2022.3.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fastapi>=0.92.0
- fugue>=0.7.3
- httpx>=0.24.1
- intake>=0.6.0
- jsonschema
- lightgbm
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/gpuci/environment-3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ channels:
dependencies:
- c-compiler
- dask>=2022.3.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fastapi>=0.92.0
- fugue>=0.7.3
- httpx>=0.24.1
- intake>=0.6.0
- jsonschema
- lightgbm
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 @@ -37,8 +37,8 @@ requirements:
- python
- dask >=2022.3.0
- pandas >=1.4.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi >=0.69.0,<0.87.0
- fastapi >=0.92.0
- httpx>=0.24.1
- uvicorn >=0.13.4
- tzlocal >=2.1
- prompt-toolkit >=3.0.8
Expand Down
4 changes: 2 additions & 2 deletions docker/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pytest-xdist
mock>=4.0.3
sphinx>=3.2.1
tzlocal>=2.1
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
fastapi>=0.69.0,<0.87.0
fastapi>=0.92.0
httpx>=0.24.1
uvicorn>=0.13.4
pyarrow>=6.0.1
prompt_toolkit>=3.0.8
Expand Down
4 changes: 2 additions & 2 deletions docker/main.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ RUN mamba install -y \
# core dependencies
"dask>=2022.3.0" \
"pandas>=1.4.0" \
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
"fastapi>=0.69.0,<0.87.0" \
"fastapi>=0.92.0" \
"httpx>=0.24.1" \
"uvicorn>=0.13.4" \
"tzlocal>=2.1" \
"prompt_toolkit>=3.0.8" \
Expand Down
4 changes: 2 additions & 2 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies:
- dask>=2022.3.0
- pandas>=1.4.0
- fugue>=0.7.3
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fastapi>=0.92.0
- httpx>=0.24.1
- uvicorn>=0.13.4
- tzlocal>=2.1
- prompt_toolkit>=3.0.8
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dask-sphinx-theme>=3.0.0
dask>=2022.3.0
pandas>=1.4.0
fugue>=0.7.3
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
fastapi>=0.69.0,<0.87.0
fastapi>=0.92.0
httpx>=0.24.1
uvicorn>=0.13.4
tzlocal>=2.1
prompt_toolkit>=3.0.8
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"dask[dataframe]>=2022.3.0",
"distributed>=2022.3.0",
"pandas>=1.4.0",
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
"fastapi>=0.69.0,<0.87.0",
"fastapi>=0.92.0",
"httpx>=0.24.1",
"uvicorn>=0.13.4",
"tzlocal>=2.1",
"prompt_toolkit>=3.0.8",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def get_result_or_error(app_client, response):

def test_routes(app_client):
assert app_client.post("/v1/statement", data="SELECT 1 + 1").status_code == 200
assert app_client.get("/v1/statement", data="SELECT 1 + 1").status_code == 405
assert app_client.get("/v1/statement").status_code == 405
assert app_client.get("/v1/empty").status_code == 200
assert app_client.get("/v1/status/some-wrong-uuid").status_code == 404
assert app_client.delete("/v1/cancel/some-wrong-uuid").status_code == 404
Expand Down