From 11788227d094bf30eac7945f6b5f9ab622f132af Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Fri, 23 Aug 2024 11:19:45 -0500 Subject: [PATCH 1/3] Remove defaults from CI --- continuous_integration/condarc | 1 - continuous_integration/environment-3.10.yaml | 1 - continuous_integration/environment-3.11.yaml | 1 - continuous_integration/environment-3.12.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/continuous_integration/condarc b/continuous_integration/condarc index 258ac5fa5db..ee8a8d25398 100644 --- a/continuous_integration/condarc +++ b/continuous_integration/condarc @@ -1,6 +1,5 @@ channels: - conda-forge - - defaults channel_priority: true auto_activate_base: false remote_backoff_factor: 20 diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index a3209963dc2..b30c76e7404 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -1,7 +1,6 @@ name: dask-distributed channels: - conda-forge - - defaults dependencies: - python=3.10 - packaging diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index dfc2a56be7a..994b70a3e91 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -1,7 +1,6 @@ name: dask-distributed channels: - conda-forge - - defaults dependencies: - python=3.11 - packaging diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index 39a313d5ef7..bc2213bc85b 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -1,7 +1,6 @@ name: dask-distributed channels: - conda-forge - - defaults dependencies: - python=3.12 - packaging From 9bd3a3601e026b5e3a7bf9365794a712067f8292 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Fri, 23 Aug 2024 14:42:46 -0500 Subject: [PATCH 2/3] Use pip for torch and friends --- continuous_integration/environment-3.10.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index b30c76e7404..db9498f337d 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -37,7 +37,6 @@ dependencies: - pytest-rerunfailures - pytest-timeout - python-snappy # Only tested here - - pytorch # Only tested here - requests - s3fs # overridden by git tip below - scikit-learn @@ -45,7 +44,6 @@ dependencies: - sortedcollections - tblib - toolz - - torchvision # Only tested here - tornado - zict # overridden by git tip below - zstandard @@ -60,3 +58,5 @@ dependencies: # - git+https://github.com/dask/s3fs # - git+https://github.com/fsspec/filesystem_spec - keras + - pytorch # Only tested here (using pip due to lack of Windows conda-forge builds) + - torchvision # Only tested here (using pip due to lack of Windows conda-forge builds) From 9046b2d6357577c6820858cc5257fdc38766edec Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Fri, 23 Aug 2024 14:43:26 -0500 Subject: [PATCH 3/3] Use correct package name on pypi --- continuous_integration/environment-3.10.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index db9498f337d..d06b4bd2126 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -58,5 +58,5 @@ dependencies: # - git+https://github.com/dask/s3fs # - git+https://github.com/fsspec/filesystem_spec - keras - - pytorch # Only tested here (using pip due to lack of Windows conda-forge builds) + - torch # Only tested here (using pip due to lack of Windows conda-forge builds) - torchvision # Only tested here (using pip due to lack of Windows conda-forge builds)