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

Converters API #2882

Merged
merged 41 commits into from
May 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d10357d
kwargs for converter + case insensitive package
Jul 30, 2020
515b108
fixes
Jul 30, 2020
95b768a
prototype for convert_to accessor
Jul 30, 2020
840bfd9
automatic addition of convert_to.lib() methods
Jul 30, 2020
db45e3e
doc + tests
Jul 30, 2020
a29ee62
move accessors
Jul 31, 2020
4ca5baf
pep8
Jul 31, 2020
2161177
fix unused import
cbouy Apr 24, 2021
e84273b
changed the Accessor and ConverterWrapper to cache the wrapped access…
cbouy Apr 25, 2021
9d9586f
fix pep8
cbouy Apr 25, 2021
b93076a
move tests
cbouy Apr 25, 2021
6b660c5
add changelog
cbouy May 5, 2021
9666c15
test ConverterWrapper
cbouy May 5, 2021
5867457
docs
cbouy May 5, 2021
27aa366
fix access from class
cbouy May 5, 2021
bfdbedf
fix test min-deps
cbouy May 6, 2021
8cea0e0
fix docs
cbouy May 6, 2021
9792cbc
Merge branch 'develop' into converters-api
cbouy May 6, 2021
e506380
fix min-deps tests
cbouy May 6, 2021
eb19fc6
Merge branch 'converters-api' of github.com:cbouy/mdanalysis into con…
cbouy May 6, 2021
18b58c4
show accessor and converter classes in docs
cbouy May 6, 2021
7442a4c
fixes to docs
cbouy May 7, 2021
71b0fa8
move to converters
cbouy May 7, 2021
85dbefd
ud changelog
cbouy May 7, 2021
399afb6
add deprecation warnings
cbouy May 7, 2021
8a5231e
Merge branch 'develop' into converters-api
cbouy May 7, 2021
63d953f
pep8
cbouy May 7, 2021
8456cf5
move accessors to core
cbouy May 7, 2021
18dc71e
fix tests
cbouy May 7, 2021
e5abca5
include openmm
cbouy May 7, 2021
fa7077c
fix and move openmm tests
cbouy May 7, 2021
47b798e
fix openmm docs
cbouy May 7, 2021
7f1fa38
fix imports
cbouy May 7, 2021
38ed979
fix docs
cbouy May 7, 2021
646c479
fix openmm relative imports
cbouy May 7, 2021
2f919cb
fix tests
cbouy May 7, 2021
7db6ddf
Merge branch 'develop' into converters-api
IAlibay May 9, 2021
249bc74
Fix docs
IAlibay May 9, 2021
5b25b49
Fix parmed imports, adds warning tests
IAlibay May 9, 2021
8b6c18f
Remove init.rst from converters docs
IAlibay May 10, 2021
26ebd6e
Update changelog
IAlibay May 10, 2021
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
10 changes: 10 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ The rules for this file:
* 2.0.0

Fixes
* Fixed OpenMM converter documentation not showing up in the Converters
section (Issue #3262, PR #2882)
* WaterBridgeAnalysis double counts the water (Issue #3119, PR #3120)
* NCDFReader now defaults to a dt value of 1.0 ps when it cannot estimate
it from the first two frames of the file (Issue #3166)
Expand Down Expand Up @@ -175,6 +177,12 @@ Enhancements
checking if it can be used in parallel analysis. (Issue #2996, PR #2950)

Changes
* Introduces a new converter API with all converters in MDAnalysis.converters
(Issue #2790, PR #2882)
* The ParmEd classes were moved to the `converters` module (PR #2882)
IAlibay marked this conversation as resolved.
Show resolved Hide resolved
* The `convert_to` method of the AtomGroup is now case-insensitive and
passes keyword arguments to the underlying converter. It can also be used
as `convert_to.lowercase_pkg_name()` for tab-completion (PR #2882)
* `analysis.polymer.PersistenceLength` class now stores `lb`,
`lp` and `fit` using the `analysis.base.Results` class
(Issues #3289, #3291)
Expand Down Expand Up @@ -250,6 +258,8 @@ Changes
* Added OpenMM coordinate and topology converters (Issue #2863, PR #2917)

Deprecations
* In 3.0.0 the ParmEd classes will only be accessible from the
`MDAnalysis.converters` module.
* The `analysis.polymer.PersistenceLength.lb`,
`analysis.polymer.PersistenceLength.lp` and
`analysis.polymer.PersistenceLength.fit` attributes are now deprecated in
Expand Down
1 change: 1 addition & 0 deletions package/MDAnalysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@

# After Universe import
from .coordinates.MMTF import fetch_mmtf
from . import converters

from .due import due, Doi, BibTeX

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787
#

"""OpenMM structure I/O --- :mod:`MDAnalysis.coordinates.OpenMM`
"""OpenMM structure I/O --- :mod:`MDAnalysis.converters.OpenMM`
================================================================


Expand Down Expand Up @@ -66,8 +66,7 @@

import numpy as np

from . import base
from .. import units
from ..coordinates import base


class OpenMMSimulationReader(base.SingleFrameReaderBase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787
#

"""OpenMM topology parser
=========================
"""OpenMM topology parser :mod:`MDAnalysis.converters.OpenMMParser`
===================================================================

.. versionadded:: 2.0.0


Converts an
`OpenMM <http://docs.openmm.org/latest/api-python/generated/simtk.openmm.app.topology.Topology.html#simtk.openmm.app.topology.Topology>`_
`OpenMM topology <http://docs.openmm.org/latest/api-python/generated/simtk.openmm.app.topology.Topology.html#simtk.openmm.app.topology.Topology>`_
Copy link
Member

Choose a reason for hiding this comment

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

sphinx was complaining about doubling of OpenMM link definition, so I renamed the topology as such.

:class:`simtk.openmm.app.topology.Topology` into a :class:`MDAnalysis.core.Topology`.

Also converts some objects within the
Expand Down Expand Up @@ -57,8 +57,7 @@

import numpy as np

from .base import TopologyReaderBase
from .guessers import guess_types
from ..topology.base import TopologyReaderBase
from ..core.topology import Topology
from ..core.topologyattrs import (
Atomids,
Expand Down
Loading