From 46a45787d793f3beb7fbe15c7bc8171ea3b147bf Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 10 Oct 2023 21:04:12 +0100 Subject: [PATCH 1/4] fix: declare pyarrow optional for 3.12 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 35bf16cf..3a89b4a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ Homepage = "https://github.com/dask-contrib/dask-awkward" [project.optional-dependencies] io = [ "aiohttp", - "pyarrow", + "pyarrow;python_version<\"3.12\"", ] complete = [ "dask-awkward[io]", From 079f711a43bb39a5233297ba391fffb3361e0f5f Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 10 Oct 2023 21:27:16 +0100 Subject: [PATCH 2/4] Revert "fix: declare pyarrow optional for 3.12" This reverts commit 46a45787d793f3beb7fbe15c7bc8171ea3b147bf. As this dependency is optional, let's not complicate things. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3a89b4a7..35bf16cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ Homepage = "https://github.com/dask-contrib/dask-awkward" [project.optional-dependencies] io = [ "aiohttp", - "pyarrow;python_version<\"3.12\"", + "pyarrow", ] complete = [ "dask-awkward[io]", From 256c18bab57a25539ca0d0fd762a20d4e0f670a8 Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 10 Oct 2023 21:30:15 +0100 Subject: [PATCH 3/4] ci: install dask components, not `complete` --- .github/workflows/coverage.yml | 2 +- .github/workflows/pypi-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c022bd2c..93005964 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: run: | pip install wheel pip install pytest-cov - pip install dask[complete] + pip install dask[array,dataframe,distributed,diagnostics] pip install -q --no-cache-dir -e .[complete,test] pytest --cov=dask_awkward --cov-report=xml - name: Upload Coverage to Codecov diff --git a/.github/workflows/pypi-tests.yml b/.github/workflows/pypi-tests.yml index 38c28a40..8109a9a5 100644 --- a/.github/workflows/pypi-tests.yml +++ b/.github/workflows/pypi-tests.yml @@ -33,7 +33,7 @@ jobs: - name: install run: | pip install pip wheel -U - pip install dask[complete] + pip install dask[array,dataframe,distributed,diagnostics] pip install -q --no-cache-dir .[complete,test] pip list - name: test From 71916e43b1da0055fd4be1bc4d880c1d9ba79135 Mon Sep 17 00:00:00 2001 From: Angus Hollands Date: Tue, 10 Oct 2023 21:36:24 +0100 Subject: [PATCH 4/4] fix: skip optional dependencies for 3.12 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 35bf16cf..f403c8ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,8 +48,8 @@ Homepage = "https://github.com/dask-contrib/dask-awkward" [project.optional-dependencies] io = [ - "aiohttp", - "pyarrow", + "aiohttp;python_version<\"3.12\"", + "pyarrow;python_version<\"3.12\"", ] complete = [ "dask-awkward[io]",