From 90af61a2f63e53ab0962d57db2d7c99af437a702 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 00:19:10 +0100 Subject: [PATCH 1/7] try dask.array --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d119cce..94aba32 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "Topic :: Scientific/Engineering", ] -INSTALL_REQUIRES = ["xarray>=0.12.0", "dask", "numpy>=1.17"] +INSTALL_REQUIRES = ["xarray>=0.12.0", "dask.array", "numpy>=1.17"] PYTHON_REQUIRES = ">=3.7" DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray" From b18ca5d0ebf85e6d10859a3536230e1ef071d3ba Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 00:28:05 +0100 Subject: [PATCH 2/7] Update setup.py Co-authored-by: Ryan Abernathey --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 94aba32..4481b45 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "Topic :: Scientific/Engineering", ] -INSTALL_REQUIRES = ["xarray>=0.12.0", "dask.array", "numpy>=1.17"] +INSTALL_REQUIRES = ["xarray>=0.12.0", "dask[array]", "numpy>=1.17"] PYTHON_REQUIRES = ">=3.7" DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray" From df118ed22b420081e50fa111949d395ce8bee630 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 00:36:51 +0100 Subject: [PATCH 3/7] dask[array] in environments --- ci/environment-3.7.yml | 2 +- ci/environment-3.8.yml | 2 +- ci/environment-3.9.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/environment-3.7.yml b/ci/environment-3.7.yml index b76c2b8..e4b341f 100644 --- a/ci/environment-3.7.yml +++ b/ci/environment-3.7.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.7 - xarray - - dask + - dask[array] - numpy=1.17 - pytest - hypothesis diff --git a/ci/environment-3.8.yml b/ci/environment-3.8.yml index 5c7d84b..5a5f529 100644 --- a/ci/environment-3.8.yml +++ b/ci/environment-3.8.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.8 - xarray - - dask + - dask[array] - numpy=1.18 - pytest - hypothesis diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index de46895..21f5ee3 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.9 - xarray - - dask + - dask[array] - numpy - pytest - hypothesis From b2e96de74809463cd31fcffb5b163d26462cabd1 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 01:28:57 +0100 Subject: [PATCH 4/7] env with dask-core --- ci/environment-3.7.yml | 2 +- ci/environment-3.8.yml | 2 +- ci/environment-3.9.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/environment-3.7.yml b/ci/environment-3.7.yml index e4b341f..6def570 100644 --- a/ci/environment-3.7.yml +++ b/ci/environment-3.7.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.7 - xarray - - dask[array] + - dask-core - numpy=1.17 - pytest - hypothesis diff --git a/ci/environment-3.8.yml b/ci/environment-3.8.yml index 5a5f529..c1b2ca5 100644 --- a/ci/environment-3.8.yml +++ b/ci/environment-3.8.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.8 - xarray - - dask[array] + - dask-core - numpy=1.18 - pytest - hypothesis diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index 21f5ee3..5e8ea80 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -4,7 +4,7 @@ channels: dependencies: - python=3.9 - xarray - - dask[array] + - dask-core - numpy - pytest - hypothesis From 7e25a310fe53f046a526396c9f3d3950e3930503 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 02:05:51 +0100 Subject: [PATCH 5/7] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4481b45..e85265e 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "Topic :: Scientific/Engineering", ] -INSTALL_REQUIRES = ["xarray>=0.12.0", "dask[array]", "numpy>=1.17"] +INSTALL_REQUIRES = ["numpy>=1.17", "xarray>=0.12.0", "dask[array]"] PYTHON_REQUIRES = ">=3.7" DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray" From 7235cf59867dcb4d70a77d25ae8cbd65fbf9a6fe Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 02:29:39 +0100 Subject: [PATCH 6/7] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e85265e..2c93868 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "Topic :: Scientific/Engineering", ] -INSTALL_REQUIRES = ["numpy>=1.17", "xarray>=0.12.0", "dask[array]"] +INSTALL_REQUIRES = ["xarray>=0.12.0", "dask[array]", "numpy>=1.17",] PYTHON_REQUIRES = ">=3.7" DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray" From 75f91842c348ffdcfb76630f798b9e4af1a2b682 Mon Sep 17 00:00:00 2001 From: Aaron Spring Date: Fri, 19 Nov 2021 02:40:46 +0100 Subject: [PATCH 7/7] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2c93868..4481b45 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "Topic :: Scientific/Engineering", ] -INSTALL_REQUIRES = ["xarray>=0.12.0", "dask[array]", "numpy>=1.17",] +INSTALL_REQUIRES = ["xarray>=0.12.0", "dask[array]", "numpy>=1.17"] PYTHON_REQUIRES = ">=3.7" DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray"