Skip to content

Commit

Permalink
Merge pull request #61 from drorlab/57-use-the-mdanalysis-hydrogen-bo…
Browse files Browse the repository at this point in the history
…nd-module-to-calculate-the-bonds

define pandas version as 1.4
  • Loading branch information
martinvoegele authored Aug 5, 2024
2 parents bb8fdac + fc30a81 commit 815d860
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Create and activate a conda environment:

.. code:: bash
conda create --name pensa python=3.9 numpy==1.22 scipy>=1.2 matplotlib MDAnalysis==2.2 cython biotite -c conda-forge
conda create --name pensa python=3.9 numpy==1.22 scipy>=1.2 pandas==1.4 matplotlib MDAnalysis==2.2 cython biotite -c conda-forge
conda activate pensa
If you want to use PENSA with Jupyter notebooks:
Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ sphinxcontrib-qthelp
sphinxcontrib-serializinghtml
numpy==1.22
scipy>=1.2
pandas==1.4
matplotlib
deeptime
MDAnalysis==2.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
install_requires=[
'numpy==1.22', # density functions in MDAnalysis 2 use np.histogramdd() with keyword normed which is deprecated in numpy 1.21 and removed in numpy 1.24
'scipy>=1.2',
'pandas',
'pandas==1.4',
'matplotlib',
'deeptime',
'MDAnalysis==2.2', # some features we use will likely be removed in MDA 3
Expand Down

0 comments on commit 815d860

Please sign in to comment.