From 19ada2f7ddbf52850b53f0116214341e9f4fee57 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 25 Jan 2022 09:25:53 -0500 Subject: [PATCH 1/2] Unpin dask/distributed post release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 387878954..ef29d76b0 100755 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ def run(self): python_requires=">=3.6", setup_requires=["setuptools_scm"] + sphinx_requirements, install_requires=[ - "dask[dataframe,distributed]>=2021.11.1,<=2022.01.0", + "dask[dataframe,distributed]>=2021.11.1", "pandas>=1.0.0", # below 1.0, there were no nullable ext. types "jpype1>=1.0.2", "fastapi>=0.61.1", From 924117cdba1c7b248e6900236de66becfc708390 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Fri, 8 Apr 2022 06:27:15 -0700 Subject: [PATCH 2/2] Remove dask/distributed version ceiling --- continuous_integration/environment-3.10-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.10-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.8-jdk8-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk11-dev.yaml | 2 +- continuous_integration/environment-3.9-jdk8-dev.yaml | 2 +- continuous_integration/recipe/meta.yaml | 2 +- docker/conda.txt | 2 +- docs/environment.yml | 2 +- docs/requirements-docs.txt | 2 +- setup.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml index f82f8f31c..85a25a2f7 100644 --- a/continuous_integration/environment-3.10-jdk11-dev.yaml +++ b/continuous_integration/environment-3.10-jdk11-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml index 4a836dd7f..c543f6b14 100644 --- a/continuous_integration/environment-3.10-jdk8-dev.yaml +++ b/continuous_integration/environment-3.10-jdk8-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/environment-3.8-jdk11-dev.yaml b/continuous_integration/environment-3.8-jdk11-dev.yaml index cfca7d119..d77245681 100644 --- a/continuous_integration/environment-3.8-jdk11-dev.yaml +++ b/continuous_integration/environment-3.8-jdk11-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/environment-3.8-jdk8-dev.yaml b/continuous_integration/environment-3.8-jdk8-dev.yaml index b98213e0c..63c9528d6 100644 --- a/continuous_integration/environment-3.8-jdk8-dev.yaml +++ b/continuous_integration/environment-3.8-jdk8-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/environment-3.9-jdk11-dev.yaml b/continuous_integration/environment-3.9-jdk11-dev.yaml index 1c476937b..6923ebab8 100644 --- a/continuous_integration/environment-3.9-jdk11-dev.yaml +++ b/continuous_integration/environment-3.9-jdk11-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/environment-3.9-jdk8-dev.yaml b/continuous_integration/environment-3.9-jdk8-dev.yaml index 7dd3b0afa..4404b5f8a 100644 --- a/continuous_integration/environment-3.9-jdk8-dev.yaml +++ b/continuous_integration/environment-3.9-jdk8-dev.yaml @@ -8,7 +8,7 @@ dependencies: - black=22.3.0 - ciso8601>=2.2.0 - dask-ml>=2022.1.22 -- dask>=2022.3.0,<2022.4.1 +- dask>=2022.3.0 - fastapi>=0.61.1 - fs>=2.4.11 - intake>=0.6.0 diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml index 518c167bb..128a1e62e 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/continuous_integration/recipe/meta.yaml @@ -29,7 +29,7 @@ requirements: - python >=3.8 run: - python - - dask >=2022.3.0,<2022.4.1 + - dask >=2022.3.0 - pandas >=1.0.0 - jpype1 >=1.0.2 - openjdk >=8 diff --git a/docker/conda.txt b/docker/conda.txt index 0eaae245b..1796da131 100644 --- a/docker/conda.txt +++ b/docker/conda.txt @@ -1,5 +1,5 @@ python>=3.8 -dask>=2022.3.0,<2022.4.1 +dask>=2022.3.0 pandas>=1.0.0 # below 1.0, there were no nullable ext. types jpype1>=1.0.2 openjdk>=8 diff --git a/docs/environment.yml b/docs/environment.yml index 1371863a7..ffd29270b 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -8,7 +8,7 @@ dependencies: - sphinx-tabs - dask-sphinx-theme>=2.0.3 - maven>=3.6.0 - - dask>=2022.3.0,<2022.4.1 + - dask>=2022.3.0 - pandas>=1.0.0 - fugue>=0.5.3 - jpype1>=1.0.2 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index dbfc08369..0cc941db8 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,7 +1,7 @@ sphinx>=4.0.0 sphinx-tabs dask-sphinx-theme>=2.0.3 -dask>=2022.3.0,<2022.4.1 +dask>=2022.3.0 pandas>=1.0.0 fugue>=0.5.3 jpype1>=1.0.2 diff --git a/setup.py b/setup.py index d8bbabfb4..e140a0421 100755 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ def build(self): python_requires=">=3.8", setup_requires=sphinx_requirements, install_requires=[ - "dask[dataframe,distributed]>=2022.3.0,<2022.4.1", + "dask[dataframe,distributed]>=2022.3.0", "pandas>=1.0.0", # below 1.0, there were no nullable ext. types "jpype1>=1.0.2", "fastapi>=0.61.1",