diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml index a867996d1..08af189eb 100644 --- a/continuous_integration/environment-3.10-dev.yaml +++ b/continuous_integration/environment-3.10-dev.yaml @@ -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 diff --git a/continuous_integration/environment-3.8-dev.yaml b/continuous_integration/environment-3.8-dev.yaml index 18b478472..15abe79b5 100644 --- a/continuous_integration/environment-3.8-dev.yaml +++ b/continuous_integration/environment-3.8-dev.yaml @@ -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 diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml index 7424529d6..47e64e8fc 100644 --- a/continuous_integration/environment-3.9-dev.yaml +++ b/continuous_integration/environment-3.9-dev.yaml @@ -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 diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index 2467e144a..d312844d3 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -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 diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml index 917892f24..565869411 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -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 diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml index 5f42f10d9..f6c34cbee 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/continuous_integration/recipe/meta.yaml @@ -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 diff --git a/docker/conda.txt b/docker/conda.txt index d24d217aa..83b176843 100644 --- a/docker/conda.txt +++ b/docker/conda.txt @@ -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 diff --git a/docker/main.dockerfile b/docker/main.dockerfile index da965a53c..c3dbbf8d2 100644 --- a/docker/main.dockerfile +++ b/docker/main.dockerfile @@ -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" \ diff --git a/docs/environment.yml b/docs/environment.yml index 96a727465..e9366eaa4 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -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 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index c9d8c6b0e..c039df54a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -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 diff --git a/setup.py b/setup.py index d149ac5f0..387c93125 100644 --- a/setup.py +++ b/setup.py @@ -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", diff --git a/tests/integration/test_server.py b/tests/integration/test_server.py index 655f91881..75cb7ca81 100644 --- a/tests/integration/test_server.py +++ b/tests/integration/test_server.py @@ -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