Use xfail consistently for known failing tests

continuous_integration/environment-3.10-dev.yaml

@@ -4,7 +4,8 @@ channels:
 - nodefaults
 dependencies:
 - dask>=2022.3.0
-- fastapi>=0.69.0
+# FIXME: handling is needed for httpx-based fastapi>=0.87.0
+- fastapi>=0.69.0,<0.87.0
 - fugue>=0.7.3
 - intake>=0.6.0
 - jsonschema

continuous_integration/environment-3.9-dev.yaml

@@ -4,7 +4,8 @@ channels:
 - nodefaults
 dependencies:
 - dask>=2022.3.0
-- fastapi>=0.69.0
+# FIXME: handling is needed for httpx-based fastapi>=0.87.0
+- fastapi>=0.69.0,<0.87.0
 - fugue>=0.7.3
 - intake>=0.6.0
 - jsonschema

continuous_integration/gpuci/environment.yaml

@@ -7,7 +7,8 @@ channels:
 - nodefaults
 dependencies:
 - dask>=2022.3.0
-- fastapi>=0.69.0
+# FIXME: handling is needed for httpx-based fastapi>=0.87.0
+- fastapi>=0.69.0,<0.87.0
 - fugue>=0.7.3
 - intake>=0.6.0
 - jsonschema

continuous_integration/recipe/meta.yaml

@@ -32,7 +32,8 @@ requirements:
     - python
     - dask >=2022.3.0
     - pandas >=1.4.0
-    - fastapi >=0.69.0
+    # FIXME: handling is needed for httpx-based fastapi>=0.87.0
+    - fastapi >=0.69.0,<0.87.0
     - uvicorn >=0.13.4
     - tzlocal >=2.1
     - prompt-toolkit >=3.0.8

docker/conda.txt

@@ -10,7 +10,8 @@ pytest-xdist
 mock>=4.0.3
 sphinx>=3.2.1
 tzlocal>=2.1
-fastapi>=0.69.0
+# FIXME: handling is needed for httpx-based fastapi>=0.87.0
+fastapi>=0.69.0,<0.87.0
 nest-asyncio>=1.4.3
 uvicorn>=0.13.4
 pyarrow>=6.0.1

docker/main.dockerfile

@@ -18,7 +18,8 @@ RUN mamba install -y \
     # core dependencies
     "dask>=2022.3.0" \
     "pandas>=1.4.0" \
-    "fastapi>=0.69.0" \
+    # FIXME: handling is needed for httpx-based fastapi>=0.87.0
+    "fastapi>=0.69.0,<0.87.0" \
     "uvicorn>=0.13.4" \
     "tzlocal>=2.1" \
     "prompt_toolkit>=3.0.8" \

docs/environment.yml

@@ -11,7 +11,8 @@ dependencies:
   - pandas>=1.4.0
   - fugue>=0.7.3
   - jpype1>=1.0.2
-  - fastapi>=0.69.0
+  # FIXME: handling is needed for httpx-based fastapi>=0.87.0
+  - fastapi>=0.69.0,<0.87.0
   - uvicorn>=0.13.4
   - tzlocal>=2.1
   - prompt_toolkit>=3.0.8

docs/requirements-docs.txt

@@ -4,7 +4,8 @@ dask-sphinx-theme>=3.0.0
 dask>=2022.3.0
 pandas>=1.4.0
 fugue>=0.7.3
-fastapi>=0.69.0
+# FIXME: handling is needed for httpx-based fastapi>=0.87.0
+fastapi>=0.69.0,<0.87.0
 uvicorn>=0.13.4
 tzlocal>=2.1
 prompt_toolkit>=3.0.8

setup.py

@@ -44,7 +44,8 @@
     install_requires=[
         "dask[dataframe,distributed]>=2022.3.0",
         "pandas>=1.4.0",
-        "fastapi>=0.69.0",
+        # FIXME: handling is needed for httpx-based fastapi>=0.87.0
+        "fastapi>=0.69.0,<0.87.0",
         "uvicorn>=0.13.4",
         "tzlocal>=2.1",
         "prompt_toolkit>=3.0.8",

tests/integration/fixtures.py

@@ -332,15 +332,15 @@ def gpu_client(gpu_cluster):
 # client for all computations. otherwise, only connect to a client
 # when specified.
 @pytest.fixture(
-    scope="function" if SCHEDULER_ADDR is None else "session",
+    scope="function",
     autouse=False if SCHEDULER_ADDR is None else True,
 )
 def client():
     with Client(address=SCHEDULER_ADDR) as client:
         yield client
 
 
-skip_if_external_scheduler = pytest.mark.skipif(
-    os.getenv("DASK_SQL_TEST_SCHEDULER", None) is not None,
+xfail_if_external_scheduler = pytest.mark.xfail(
+    condition=os.getenv("DASK_SQL_TEST_SCHEDULER", None) is not None,
     reason="Can not run with external cluster",
 )