Skip to content

Commit

Permalink
Merge pull request #70 from dwhswenson/pin_pandas
Browse files Browse the repository at this point in the history
pin pandas<1.0
  • Loading branch information
dwhswenson authored Feb 10, 2020
2 parents f3c770a + ddeda85 commit 87294f4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ requirements:
- mdtraj
- numpy
- scipy
- pandas
- pandas<1.0

test:
requires:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
future
numpy
scipy
pandas
pandas<1.0
mdtraj
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install_requires =
numpy
mdtraj
scipy
pandas
pandas<1.0
packages = find:

[bdist_wheel]
Expand Down

0 comments on commit 87294f4

Please sign in to comment.