diff --git a/continuous_integration/gpuci/build.sh b/continuous_integration/gpuci/build.sh index f559ce125..347674834 100644 --- a/continuous_integration/gpuci/build.sh +++ b/continuous_integration/gpuci/build.sh @@ -41,13 +41,13 @@ gpuci_logger "Activate conda env" conda activate dask_sql gpuci_logger "Install dask" -python -m pip install git+https://github.com/dask/dask +python -m pip install git+https://github.com/dask/dask --use-feature=2020-resolver gpuci_logger "Install distributed" -python -m pip install git+https://github.com/dask/distributed +python -m pip install git+https://github.com/dask/distributed --use-feature=2020-resolver gpuci_logger "Install dask-sql" -pip install -e ".[dev]" +python -m pip install -e ".[dev]" python setup.py java gpuci_logger "Check Python version" diff --git a/tests/integration/fixtures.py b/tests/integration/fixtures.py index 0c812dfa9..53cbd07ef 100644 --- a/tests/integration/fixtures.py +++ b/tests/integration/fixtures.py @@ -1,23 +1,19 @@ import os import tempfile +import cudf import dask.dataframe as dd + +# importing to check for JVM segfault +import dask_cudf # noqa: F401 import numpy as np import pandas as pd import pytest from dask.datasets import timeseries from dask.distributed import Client +from dask_cuda import LocalCUDACluster # noqa: F401 from pandas.testing import assert_frame_equal -try: - import cudf - - # importing to check for JVM segfault - import dask_cudf # noqa: F401 - from dask_cuda import LocalCUDACluster # noqa: F401 -except ImportError: - cudf = None - @pytest.fixture() def timeseries_df(c):