diff --git a/.github/cluster-upstream.yml b/.github/cluster-upstream.yml index a56eb5249..db864bedc 100644 --- a/.github/cluster-upstream.yml +++ b/.github/cluster-upstream.yml @@ -5,9 +5,6 @@ services: container_name: dask-scheduler image: daskdev/dask:dev command: dask-scheduler - environment: - USE_MAMBA: "true" - EXTRA_CONDA_PACKAGES: "dask/label/dev::dask" ports: - "8786:8786" dask-worker: @@ -16,6 +13,6 @@ services: command: dask-worker dask-scheduler:8786 environment: USE_MAMBA: "true" - EXTRA_CONDA_PACKAGES: "dask/label/dev::dask pyarrow>1.0.0" # required for parquet IO + EXTRA_CONDA_PACKAGES: "dask/label/dev::dask cloudpickle>=2.1.0 pyarrow>=1.0.0 libstdcxx-ng>=12.1.0" volumes: - /tmp:/tmp diff --git a/.github/cluster.yml b/.github/cluster.yml index 87431cd6f..d59624c7b 100644 --- a/.github/cluster.yml +++ b/.github/cluster.yml @@ -13,6 +13,6 @@ services: command: dask-worker dask-scheduler:8786 environment: USE_MAMBA: "true" - EXTRA_CONDA_PACKAGES: "pyarrow>1.0.0" # required for parquet IO + EXTRA_CONDA_PACKAGES: "cloudpickle>=2.1.0 pyarrow>=1.0.0 libstdcxx-ng>=12.1.0" volumes: - /tmp:/tmp diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml index cdee53be1..d04d81130 100644 --- a/continuous_integration/environment-3.10-jdk11-dev.yaml +++ b/continuous_integration/environment-3.10-jdk11-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml index 5dd991dfc..4a56a9ccf 100644 --- a/continuous_integration/environment-3.10-jdk8-dev.yaml +++ b/continuous_integration/environment-3.10-jdk8-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/continuous_integration/environment-3.8-jdk11-dev.yaml b/continuous_integration/environment-3.8-jdk11-dev.yaml index f4897110b..0e0ef3d7d 100644 --- a/continuous_integration/environment-3.8-jdk11-dev.yaml +++ b/continuous_integration/environment-3.8-jdk11-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/continuous_integration/environment-3.8-jdk8-dev.yaml b/continuous_integration/environment-3.8-jdk8-dev.yaml index 9928e4c8a..9f225bed5 100644 --- a/continuous_integration/environment-3.8-jdk8-dev.yaml +++ b/continuous_integration/environment-3.8-jdk8-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/continuous_integration/environment-3.9-jdk11-dev.yaml b/continuous_integration/environment-3.9-jdk11-dev.yaml index ecca5da20..1c368fbbd 100644 --- a/continuous_integration/environment-3.9-jdk11-dev.yaml +++ b/continuous_integration/environment-3.9-jdk11-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/continuous_integration/environment-3.9-jdk8-dev.yaml b/continuous_integration/environment-3.9-jdk8-dev.yaml index b2fa6d74d..c0dbe1cae 100644 --- a/continuous_integration/environment-3.9-jdk8-dev.yaml +++ b/continuous_integration/environment-3.9-jdk8-dev.yaml @@ -26,7 +26,7 @@ dependencies: - pre-commit>=2.11.1 - prompt_toolkit>=3.0.8 - psycopg2>=2.9.1 -- pyarrow>=0.15.1 +- pyarrow>=1.0.0 - pygments>=2.7.1 - pyhive>=0.6.4 - pytest-cov>=2.10.1 diff --git a/docker/conda.txt b/docker/conda.txt index 1796da131..e40d1069d 100644 --- a/docker/conda.txt +++ b/docker/conda.txt @@ -13,7 +13,7 @@ tzlocal>=2.1 fastapi>=0.61.1 nest-asyncio>=1.4.3 uvicorn>=0.11.3 -pyarrow>=0.15.1 +pyarrow>=1.0.0 prompt_toolkit>=3.0.8 pygments>=2.7.1 dask-ml>=2022.1.22 diff --git a/docker/main.dockerfile b/docker/main.dockerfile index 2ae85e507..848948dd5 100644 --- a/docker/main.dockerfile +++ b/docker/main.dockerfile @@ -13,7 +13,7 @@ RUN conda config --add channels conda-forge \ "tzlocal>=2.1" \ "fastapi>=0.61.1" \ "uvicorn>=0.11.3" \ - "pyarrow>=0.15.1" \ + "pyarrow>=1.0.0" \ "prompt_toolkit>=3.0.8" \ "pygments>=2.7.1" \ "dask-ml>=2022.1.22" \ diff --git a/setup.py b/setup.py index f3b59bba8..be50794e1 100755 --- a/setup.py +++ b/setup.py @@ -104,7 +104,7 @@ def build(self): "pytest-cov>=2.10.1", "mock>=4.0.3", "sphinx>=3.2.1", - "pyarrow>=0.15.1", + "pyarrow>=1.0.0", "dask-ml>=2022.1.22", "scikit-learn>=0.24.2", "intake>=0.6.0",