Skip to content
This repository has been archived by the owner on Sep 11, 2023. It is now read-only.

Commit

Permalink
Merge branch 'devel' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
sroet authored Jul 20, 2021
2 parents e7c754a + d6eba9d commit 9ea8c4d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions doc/source/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Changelog
determined from hardware, falls back to logical number of cpus. :pr:`1488`
- import from :code:`collections.abc` instead of base :code:`collections`
:pr:`1503`
- Use :code:`int` instead of :code:`numpy.int` to solve :code:`numpy` 1.20
DeprecationWarning :pr:`1504`

2.5.7 (9-24-2019)
-----------------
Expand Down
2 changes: 1 addition & 1 deletion pyemma/coordinates/data/featurization/featurizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def _check_indices(self, pair_inds, pair_n=2):
"""ensure pairs are valid (shapes, all atom indices available?, etc.)
"""

pair_inds = np.array(pair_inds).astype(dtype=np.int, casting='safe')
pair_inds = np.array(pair_inds).astype(dtype=int, casting='safe')

if pair_inds.ndim != 2:
raise ValueError("pair indices has to be a matrix.")
Expand Down

0 comments on commit 9ea8c4d

Please sign in to comment.