From 6844fc996b48ddc01fafed0ef32b8985bba48e13 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sat, 11 May 2024 10:28:16 -0400 Subject: [PATCH] Fixes package conflicts --- devtools/conda-envs/full-environment.yaml | 6 +++--- devtools/conda-envs/min-ver-environment.yaml | 2 +- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devtools/conda-envs/full-environment.yaml b/devtools/conda-envs/full-environment.yaml index 12355290..0a59546d 100644 --- a/devtools/conda-envs/full-environment.yaml +++ b/devtools/conda-envs/full-environment.yaml @@ -3,14 +3,14 @@ channels: - conda-forge dependencies: # Base depends - - python + - python >=3.8 - numpy >=1.23 - nomkl # Backends - - tensorflow-base + - tensorflow-cpu - dask - # - sparse + - sparse - pytorch-cpu # - autograd - jax diff --git a/devtools/conda-envs/min-ver-environment.yaml b/devtools/conda-envs/min-ver-environment.yaml index 7e9a905d..04d3000e 100644 --- a/devtools/conda-envs/min-ver-environment.yaml +++ b/devtools/conda-envs/min-ver-environment.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: # Base depends - - python + - python >=3.8 - numpy >=1.23 - nomkl diff --git a/pyproject.toml b/pyproject.toml index 2f7cc3f4..4e42573b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.black] line-length = 120 -target-version = ['py37'] +target-version = ['py38']