Skip to content

Commit

Permalink
Remove pytables as a conda dependency (#104)
Browse files Browse the repository at this point in the history
* require pandas with hdf5 extras

* remove conda from tox config

* updated installation instructions
  • Loading branch information
niksirbi authored Jan 23, 2024
1 parent 9ee30c7 commit 5cd1922
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
7 changes: 2 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@ or [mamba](mamba:) to create a
development environment for movement. In the following we assume you have
`conda` installed, but the same commands will also work with `mamba`/`micromamba`.

First, create and activate a `conda` environment with some pre-requisites:
First, create and activate a `conda` environment:

```sh
conda create -n movement-dev -c conda-forge python=3.10 pytables
conda create -n movement-dev python=3.10
conda activate movement-dev
```

The above method ensures that you will get packages that often can't be
installed via `pip`, including [hdf5](https://www.hdfgroup.org/solutions/hdf5/).

To install movement for development, clone the GitHub repository,
and then run from inside the repository:

Expand Down
9 changes: 6 additions & 3 deletions docs/source/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

## Installation

:::{admonition} Use a conda environment
:class: note
We recommend you install movement inside a [conda](conda:)
or [mamba](mamba:) environment.
or [mamba](mamba:) environment, to avoid dependency conflicts with other packages.
In the following we assume you have `conda` installed,
but the same commands will also work with `mamba`/`micromamba`.

Expand All @@ -12,11 +14,12 @@ First, create and activate an environment.
You can call your environment whatever you like, we've used "movement-env".

```sh
conda create -n movement-env -c conda-forge python=3.10 pytables
conda create -n movement-env python=3.10
conda activate movement-env
```

Next install the `movement` package:
Then install the `movement` package as described below.
:::

::::{tab-set}

Expand Down
7 changes: 1 addition & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ license = {text = "BSD-3-Clause"}

dependencies = [
"numpy",
"pandas",
"pandas[hdf5]",
"h5py",
"attrs",
"pooch",
Expand Down Expand Up @@ -119,7 +119,6 @@ archs = ["x86_64", "arm64"]
[tool.tox]
legacy_tox_ini = """
[tox]
requires = tox-conda
envlist = py{39,310,311}
isolated_build = True
Expand All @@ -130,10 +129,6 @@ python =
3.11: py311
[testenv]
conda_deps =
pytables
conda_channels =
conda-forge
extras =
dev
commands =
Expand Down

0 comments on commit 5cd1922

Please sign in to comment.