From ce0b10000acdbea04afd8d74dce4a2c3f6eef8f7 Mon Sep 17 00:00:00 2001 From: quantumjot Date: Tue, 18 Jul 2023 20:06:54 +0100 Subject: [PATCH 1/3] pin pydantic version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1dc49c1e..960ad5b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "h5py>=2.10.0", "numpy>=1.17.3", "pooch>=1.0.0", - "pydantic>=1.9.0", + "pydantic~=1.9.0", "scikit-image>=0.16.2", "scipy>=1.3.1", "tqdm>=4.65.0", From 9928e689bfe1e7d136943e7facb7e01e57628469 Mon Sep 17 00:00:00 2001 From: quantumjot Date: Tue, 18 Jul 2023 20:09:08 +0100 Subject: [PATCH 2/3] update readme for installation ordering --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 594c52b1..cfd1e643 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,15 @@ pip install btrack #### Installing on Apple Silicon -Run the above command with `pip` and then also install the following with -[conda](https://github.com/conda-forge/miniforge). +Install the following with +[conda](https://github.com/conda-forge/miniforge): ```sh conda install -c conda-forge cvxopt ``` +then run the above command with `pip`. + ## Usage examples Visit [btrack documentation](https://btrack.readthedocs.io) to learn how to use it and see other examples. From e49fbe961d570da5ad133ef6db88950eda80f2a0 Mon Sep 17 00:00:00 2001 From: quantumjot Date: Tue, 18 Jul 2023 20:21:35 +0100 Subject: [PATCH 3/3] fix version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 960ad5b8..972d5c07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "h5py>=2.10.0", "numpy>=1.17.3", "pooch>=1.0.0", - "pydantic~=1.9.0", + "pydantic~=1.9", "scikit-image>=0.16.2", "scipy>=1.3.1", "tqdm>=4.65.0",