Skip to content

Commit 5cd1922

Browse files
authored
Remove pytables as a conda dependency (#104)
* require pandas with hdf5 extras * remove conda from tox config * updated installation instructions
1 parent 9ee30c7 commit 5cd1922

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ or [mamba](mamba:) to create a
99
development environment for movement. In the following we assume you have
1010
`conda` installed, but the same commands will also work with `mamba`/`micromamba`.
1111

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

1414
```sh
15-
conda create -n movement-dev -c conda-forge python=3.10 pytables
15+
conda create -n movement-dev python=3.10
1616
conda activate movement-dev
1717
```
1818

19-
The above method ensures that you will get packages that often can't be
20-
installed via `pip`, including [hdf5](https://www.hdfgroup.org/solutions/hdf5/).
21-
2219
To install movement for development, clone the GitHub repository,
2320
and then run from inside the repository:
2421

docs/source/getting_started.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
## Installation
44

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

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

1416
```sh
15-
conda create -n movement-env -c conda-forge python=3.10 pytables
17+
conda create -n movement-env python=3.10
1618
conda activate movement-env
1719
```
1820

19-
Next install the `movement` package:
21+
Then install the `movement` package as described below.
22+
:::
2023

2124
::::{tab-set}
2225

pyproject.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license = {text = "BSD-3-Clause"}
1313

1414
dependencies = [
1515
"numpy",
16-
"pandas",
16+
"pandas[hdf5]",
1717
"h5py",
1818
"attrs",
1919
"pooch",
@@ -119,7 +119,6 @@ archs = ["x86_64", "arm64"]
119119
[tool.tox]
120120
legacy_tox_ini = """
121121
[tox]
122-
requires = tox-conda
123122
envlist = py{39,310,311}
124123
isolated_build = True
125124
@@ -130,10 +129,6 @@ python =
130129
3.11: py311
131130
132131
[testenv]
133-
conda_deps =
134-
pytables
135-
conda_channels =
136-
conda-forge
137132
extras =
138133
dev
139134
commands =

0 commit comments

Comments
 (0)