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.

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

Feature/dssp #4304

Merged
merged 86 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
5065e2d
Add DSSP test files
marinegor Sep 29, 2023
1dfdb29
Add DSSP test files
marinegor Sep 29, 2023
f73fcda
First implementation of DSSP class
marinegor Sep 29, 2023
fe66c30
Remove pydssp dependency
marinegor Sep 29, 2023
13bc86a
Add documentation
marinegor Sep 29, 2023
cf79a89
Fix hydrogen selection issue
marinegor Sep 29, 2023
7230845
Remove unnecessary print
marinegor Sep 29, 2023
929d011
Fix problem with prolines and add example with average secondary stru…
marinegor Oct 2, 2023
7c966d5
Fix pep8 formatting issues
marinegor Oct 2, 2023
a5a4891
Fix pep8 formatting issues
marinegor Oct 2, 2023
c2a333c
Replace ndarray in results with list, and remove unnecessary code
marinegor Oct 4, 2023
bd5ba75
Add documentation for translate
marinegor Oct 4, 2023
0d6f734
Added a reference to Kabsch 983 DSSP paper
marinegor Oct 11, 2023
8840d9b
Update documentation and formatting
marinegor Nov 24, 2023
c6fca72
Make numpy docstrings
marinegor Jan 14, 2024
20e672f
Compress dssp pdb files
marinegor Jan 14, 2024
47c4123
Update documentation and add trajectory tests
marinegor Jan 14, 2024
c4cf7c9
Fix pep8 in docstrings and add pydssp license info
marinegor Jan 14, 2024
de2133d
Add versionadded
marinegor Jan 14, 2024
60e9f13
Merge remote-tracking branch 'upstream/develop' into feature/dssp
marinegor Jan 14, 2024
603d209
Update changelog
marinegor Jan 14, 2024
6044372
Fix datafiles DSSP error
marinegor Jan 14, 2024
78b5a4f
Add einops as dependency to analysis
marinegor Jan 14, 2024
2bd0af5
Move einops as required dependency
marinegor Jan 14, 2024
21a9403
Move einops to install_requires
marinegor Jan 14, 2024
a15ed16
Move einops to analysis dependencies
marinegor Jan 15, 2024
8161c55
Add skipped tests if einops not present
marinegor Jan 15, 2024
b0093fe
Fix dssp test without einops
marinegor Jan 15, 2024
f947c04
Remove _check_input function
marinegor Feb 6, 2024
3493443
Rewrite get_hbond_map function
marinegor Feb 6, 2024
9d34e49
Correct helix detection but bug in loops
marinegor Feb 6, 2024
30c958e
Remove unnecessary print
marinegor Feb 6, 2024
4c6c2a8
Fix big with loops
marinegor Feb 6, 2024
3eb3058
Implement no-einops dssp
marinegor Feb 6, 2024
a3c386a
Moved dssp into separate module and separated original pydssp and my …
marinegor Feb 6, 2024
1a4d4b8
Add pydssp as analysis dependency
marinegor Feb 6, 2024
82334c7
Update package/pyproject.toml
Feb 6, 2024
edcb713
Add suggestions from code review
marinegor Feb 6, 2024
04e33ae
Remove pydssp from pyproject.toml and add section in documentation
marinegor Feb 7, 2024
f7e4ac0
Update documentation
marinegor Feb 7, 2024
1baf1e2
Merge with develop
marinegor Feb 7, 2024
f31d6f5
Add @due for DSSP by Kabsch
marinegor Feb 7, 2024
742e19d
Update package/MDAnalysis/analysis/dssp/dssp.py
Feb 23, 2024
47ef5ad
Update package/MDAnalysis/analysis/dssp/dssp.py
Feb 23, 2024
530ca0c
Fix documentation
marinegor Feb 23, 2024
c0fdd99
Fix documentation issues
marinegor Feb 23, 2024
118be27
Fix code formatting and add coverage exceptions
marinegor Feb 23, 2024
8c33e83
Add dssp entry for documentation
marinegor Feb 23, 2024
25dae6f
Add one more no cover pragma
marinegor Feb 23, 2024
ac6f063
Remove unnecessary get_hbond_map import
marinegor Feb 23, 2024
42392f2
Move shape check to _prepare and add respective test
marinegor Feb 23, 2024
8de3630
Fix DSSP documentation issues
marinegor Feb 24, 2024
5a21c9a
Fix test for uneven number of atoms in universe
marinegor Feb 24, 2024
864a43e
Add entry for pydssp in LICENSE
marinegor Feb 24, 2024
001ce41
Merge remote-tracking branch 'upstream/develop' into feature/dssp
marinegor Feb 26, 2024
5b04387
Add DSSP entry to testuite/pyproject.toml
marinegor Feb 26, 2024
1484c5d
Merge branch 'develop' into feature/dssp
orbeckst Mar 25, 2024
9c28640
Apply suggestions from code review
Apr 8, 2024
7b30cdd
Add AtomGroup to DSSP
marinegor Apr 8, 2024
2d9efec
Fix documentation in pydssp_numpy
marinegor Apr 8, 2024
ebaf90a
Add test for AtomGroup in DSSP
marinegor Apr 8, 2024
5b783b3
Move functions after DSSP class
marinegor Apr 8, 2024
e203ab8
Fix docs in DSSP.translate
marinegor Apr 8, 2024
579a5f0
Fix citations
marinegor Apr 8, 2024
81112d4
Fix merge conflicts
marinegor Apr 8, 2024
38d6d1f
Update references.bib
yuxuanzhuang Apr 9, 2024
5c2fddf
add reference
yuxuanzhuang Apr 9, 2024
428e892
move functions below classes
yuxuanzhuang Apr 9, 2024
15ab7f5
Improve selection syntax and add configurable selection names
marinegor Apr 18, 2024
dcf22fe
Remove unnecessary nocover pragmas
marinegor Apr 18, 2024
eb10f00
Apply suggestions from codereview
marinegor Apr 19, 2024
858bef0
Make sure I add duecredit test
marinegor Apr 19, 2024
99b2164
Update `hydrogen_name` description with a Note
marinegor Apr 19, 2024
58c24c1
Add print line in dssp documentation
marinegor Apr 19, 2024
610b39f
Merge branch 'develop' into feature/dssp
orbeckst May 3, 2024
f50f5c3
Delete test_dssp.py
orbeckst May 3, 2024
848060e
Update testsuite/MDAnalysisTests/analysis/test_dssp.py
orbeckst May 3, 2024
84dd012
Update class documentation with "hydrogen_atom" argument explanation
marinegor May 29, 2024
ebcab2f
Add check for exactly 1 hydrogen on the atom
Jun 12, 2024
f4daa24
Apply suggestions from code review
marinegor Jun 12, 2024
2fef313
Generalize hydrogen checks
Jun 12, 2024
daf6529
Merge remote-tracking branch 'origin/feature/dssp' into feature/dssp
Jun 12, 2024
884630d
minor dssp reST fixes & updates
orbeckst Jun 13, 2024
8d503a2
fix dssp doc
orbeckst Jun 13, 2024
5438877
fixed docs for DSSP.results
orbeckst Jun 13, 2024
d3d2cf2
Update dssp.py
orbeckst Jun 13, 2024
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
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,33 @@ PyQCPROT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


==========================================================================
IAlibay marked this conversation as resolved.
Show resolved Hide resolved

DSSP module code for protein secondary structure assignment
- analysis/dssp/pydssp_numpy.py

MIT License

Copyright (c) 2022 Shintaro Minami

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

==========================================================================

MDAnalysis logo (see doc/sphinx/source/logos)
Expand Down
1 change: 1 addition & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Fixes
* Fix groups.py doctests using sphinx directives (Issue #3925, PR #4374)

Enhancements
* Add `analysis.DSSP` module for protein secondary structure assignment, based on [pydssp](https://github.com/ShintaroMinami/PyDSSP)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not going to block on this, but if you can wrap around at 79 chars here that would be grand.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

* Added a tqdm progress bar for `MDAnalysis.analysis.pca.PCA.transform()`
(PR #4531)
* Improved performance of PDBWriter (Issue #2785, PR #4472)
Expand Down
7 changes: 7 additions & 0 deletions package/MDAnalysis/analysis/dssp/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__all__ = [
"DSSP",
"assign",
"translate",
]

from .dssp import DSSP, assign, translate
Loading
Loading