Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

define pandas version as 1.4 #61

Merged
merged 1 commit into from
Aug 5, 2024
Merged

define pandas version as 1.4 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/installation.rst
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading