From 0dc9d499f5c0d11d5ecd822fbcf2b1a466584488 Mon Sep 17 00:00:00 2001 From: ncclementi Date: Mon, 14 Nov 2022 11:43:31 -0500 Subject: [PATCH 1/3] revert all but dask and coiled [test-upstream] --- recipe/meta.yaml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 31b1423ce0..c49fb1bce5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,34 +23,33 @@ requirements: - python >=3.8,<3.11 - pip - coiled >=0.2.41 - - numpy ==1.23.3 - - pandas ==1.5.1 + - numpy ==1.21.6 + - pandas ==1.4.2 - dask =={{ dask_version }} - distributed =={{ distributed_version }} - - fsspec ==2022.10.0 - - s3fs ==2022.10.0 - - gcsfs ==2022.10.0 - - pyarrow ==9.0.0 - - jupyterlab ==3.4.8 - - dask-labextension ==5.3.0 - - lz4 ==4.0.2 - - ipywidgets ==7.7.2 + - fsspec ==2022.5.0 + - s3fs ==2022.5.0 + - gcsfs ==2022.5.0 + - pyarrow ==8.0.0 + - jupyterlab ==3.4.2 + - dask-labextension ==5.2.0 + - lz4 ==4.0.0 + - ipywidgets ==7.7.0 - numba ==0.56.3 - - scikit-learn ==1.1.3 + - scikit-learn ==1.1.1 - ipycytoscape ==1.3.3 - click ==8.1.3 - - xarray ==2022.10.0 - - zarr ==2.13.3 - - msgpack-python ==1.0.4 - - cloudpickle ==2.2.0 + - xarray ==2022.3.0 + - zarr ==2.11.3 + - msgpack-python ==1.0.3 + - cloudpickle ==2.1.0 - tornado ==6.1 - toolz ==0.12.0 - zict ==2.2.0 - - xgboost ==1.6.2 + - xgboost ==1.6.1 - dask-ml ==2022.5.27 - openssl >1.1.0g - pynvml ==11.4.1 - - optuna ==3.0.3 - bokeh ==2.4.3 test: From 6f22adb1c26a91e276e8586af314612b7c26e153 Mon Sep 17 00:00:00 2001 From: ncclementi Date: Tue, 15 Nov 2022 17:07:59 -0500 Subject: [PATCH 2/3] revert to 0.1.0 packages versions add bokeh and coiled pins --- recipe/meta.yaml | 4 ++-- setup.py | 3 ++- tests/runtime/test_build.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c49fb1bce5..938bd9c04b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "coiled-runtime" %} {% set version = "0.2.0" + environ.get("VERSION_SUFFIX", '') %} -{% set dask_version = environ.get("DASK_VERSION", "2022.10.2") %} -{% set distributed_version = environ.get("DISTRIBUTED_VERSION", "2022.10.2") %} +{% set dask_version = environ.get("DASK_VERSION", "2022.6.0") %} +{% set distributed_version = environ.get("DISTRIBUTED_VERSION", "2022.6.0") %} package: name: {{ name|lower }} diff --git a/setup.py b/setup.py index ca96724783..ce23800a3d 100755 --- a/setup.py +++ b/setup.py @@ -24,6 +24,7 @@ def get_requirements(): requirements[requirement.name] = str(requirement.specifier) # Handle packages that have different names on conda-forge and PyPI + requirements["blosc"] = requirements.pop("python-blosc") requirements["msgpack"] = requirements.pop("msgpack-python") # Exclude packages not available on PyPI @@ -43,7 +44,7 @@ def get_requirements(): setup( name="coiled-runtime", - version="0.2.0", + version="0.1.1", description="Simple and fast way to get started with Dask", url="https://github.com/coiled/coiled-runtime", license="BSD", diff --git a/tests/runtime/test_build.py b/tests/runtime/test_build.py index e8a04dddca..96ff838b26 100644 --- a/tests/runtime/test_build.py +++ b/tests/runtime/test_build.py @@ -56,6 +56,7 @@ def get_meta_specifiers() -> dict[str, SpecifierSet]: _conda_to_pip_names = { "msgpack-python": "msgpack", + "python-blosc": "blosc", } _pip_to_conda_names = {v: k for k, v in _conda_to_pip_names.items()} From 5d457e400cc4d7c31f3892bb1d81eb89c3b9bbb8 Mon Sep 17 00:00:00 2001 From: ncclementi Date: Tue, 15 Nov 2022 17:13:16 -0500 Subject: [PATCH 3/3] put blosc back for consistency --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 938bd9c04b..d10a41befe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,6 +45,7 @@ requirements: - cloudpickle ==2.1.0 - tornado ==6.1 - toolz ==0.12.0 + - python-blosc ==1.10.2 - zict ==2.2.0 - xgboost ==1.6.1 - dask-ml ==2022.5.27