Skip to content

Commit 1660970

Browse files
authored
Merge branch 'develop' into broken-link
2 parents 64f4488 + 6beace1 commit 1660970

File tree

6 files changed

+1021
-17
lines changed

6 files changed

+1021
-17
lines changed

LICENSE

Lines changed: 936 additions & 0 deletions
Large diffs are not rendered by default.

README.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88

99
MDAnalysis is a Python toolkit to analyse molecular dynamics files and trajectories in `many popular formats`_. MDAnalysis can write most of these formats, too, together with atom selections for use in visualisation tools or other analysis programs. It provides a fast framework for complex analysis tasks, as well as flexible tooling to construct your own analyses.
1010

11-
This repository contains the `user guide`_ for MDAnalysis. The user guide originated as a `project for Google Season of Docs 2019-2020`_ .
11+
This repository contains the `user guide`_ for MDAnalysis. The user guide originated as a `project for Google Season of Docs 2019-2020`_.
12+
13+
The code in the user guide is released under the `GNU LGPL v2.1+` license, while text and images are released under the `CC BY-SA 4.0 DEED`_ license.
1214

1315
.. Footnotes
1416
17+
.. _`CC BY-SA 4.0 DEED`: https://creativecommons.org/licenses/by-sa/4.0/
18+
.. _`GNU LGPL v2.1+`: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
1519
.. _`user guide`: https://www.mdanalysis.org/UserGuide/index.html
1620
.. _`many popular formats`: https://www.mdanalysis.org/UserGuide/formats/index.html
1721
.. _MDAnalysis: https://www.mdanalysis.org

doc/source/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ Getting started with Git
8585
setting up your SSH key, and configuring git. All these steps need to be completed before
8686
you can work seamlessly between your local repository and GitHub.
8787

88-
.. _`mdnalysis-discussion`:
89-
http://groups.google.com/group/mdnalysis-discussion
88+
.. _`GitHub Discussions`:
89+
https://github.com/MDAnalysis/mdanalysis/discussions
9090
.. _`Code of Conduct`: https://www.mdanalysis.org/pages/conduct/
9191
.. _`Issue Tracker`: https://github.com/MDAnalysis/mdanalysis/issues
9292
.. _`MDAKits registry`: https://mdakits.mdanalysis.org/mdakits.html

doc/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The typical use case for MDAnalysis is to manipulate or analyse molecular dynami
3939
Participating
4040
=============
4141

42-
MDAnalysis welcomes all contributions from its users. There are many ways you can help improve MDAnalysis, from asking questions on the `mdnalysis-discussion`_ mailing list, to raising issues on the `Issue Tracker`_, to adding your own code. Please see :ref:`contributing` for an introduction and guide to contributing to the code and documentation.
42+
MDAnalysis welcomes all contributions from its users. There are many ways you can help improve MDAnalysis, from asking questions on `GitHub Discussions`_, to raising issues on the `Issue Tracker`_, to adding your own code. Please see :ref:`contributing` for an introduction and guide to contributing to the code and documentation.
4343

4444
.. important::
4545

@@ -55,7 +55,7 @@ MDAnalysis welcomes all contributions from its users. There are many ways you ca
5555
Communications
5656
--------------
5757

58-
Questions and discussions about MDAnalysis take place on `GitHub Discussions`_ and this repository’s `Issue Tracker`_. Anybody is welcome to join these conversations. Please ask questions about the usage of MDAnalysis on the `mdnalysis-discussion`_ mailing list, and report problems on the `Issue Tracker`_.
58+
Questions and discussions about MDAnalysis take place on `GitHub Discussions`_ and this repository’s `Issue Tracker`_. Anybody is welcome to join these conversations. Please ask questions about the usage of MDAnalysis on `GitHub Discussions`_, and report problems on the `Issue Tracker`_.
5959

6060
Wherever possible, do not take these conversations to private channels, including contacting the maintainers directly. Keeping communication public means everybody can benefit and learn from the conversation.
6161

doc/source/releases.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
# MDAnalysis Release Notes
22

33

4+
## Release 2.8.0 of MDAnalysis
5+
6+
This a minor release of MDAnalysis.
7+
8+
As of this release MDAnalysis is packaged under a [LGPLv3+ license](https://www.gnu.org/licenses/lgpl-3.0.en.html), and all code contributions are provided under the [LGPLv2.1+ license](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html).
9+
10+
This release supports NumPy 2.0+ and offers backwards compatibility through to NumPy 1.23.2
11+
12+
Supported Python versions:
13+
- 3.10, 3.11, 3.12, 3.13
14+
15+
### Major features
16+
17+
See the [CHANGELOG](https://github.com/MDAnalysis/mdanalysis/blob/release-2.8.0/package/CHANGELOG) and our [release blog post](https://www.mdanalysis.org/blog/#mdanalysis-2.8-is-out) for more details.
18+
19+
* The MDAnalysis package license has changed from GPLv3+ to LGPLv3+ and all code contributions are now under LGPLv2.1+
20+
* MDAnalysis now has a brand new guesser API (PR #3753). See the DefaultGuesser class for more information. Please note that default guessing of types and masses will change in MDAnalysis v3.0.
21+
* DSSP analysis `analysis.DSSP` module for protein secondary structure assignment, based on [pydssp](https://github.com/ShintaroMinami/PyDSSP) was added.
22+
* An iterative average structure method was added to `analysis.align` based on DOI 10.1021/acs.jpcb.7b11988.
23+
* The TPR reader has been updated to support Gromacs 2024.
24+
* The AnalysisBase class was enhanced through the introduction of a parallelization API (Issue #4158, PR #4304). Various analyses now support parallel computation, including; RMSD, GNMAnalysis, BAT, dihdral calculations, DSSP, and HydrogenBondAnalysis.
25+
26+
### Notable changes / upcoming deprecations
27+
28+
* MMTF support is now deprecated and will be removed in MDAnalysis v3.0. The `fetch_mmtf` method has been disabled as it no longer works.
29+
* MDAnalysis.analysis.hole2 has been moved to its own mdakit ([mdahole2](https://github.com/MDAnalysis/mdahole2)) and will be fully removed from the core library in MDAnalysis v3.0.
30+
* MDAnalysis.analysis.encore has been deprecated in favour of its own mdakit ([mdaencore](https://github.com/MDAnalysis/mdaencore/)) and will be removed in MDAnalysis v3.0.
31+
* MDAnalysis.analysis.waterdynamics has been deprecated in favour of its own mdakit ([waterdynamics](https://github.com/MDAnalysis/waterdynamics)) and will be removed in MDAnalysis v3.0.
32+
* MDAnalysis.analysis.psa has been deprecated in favour of its own mdakit ([PathSimAnalysis](https://github.com/MDAnalysis/pathsimanalysis)) and will be removed in MDAnalysis v3.0.
33+
* The `guess_bonds`, `vdwradii`, `fudge_factor`, and `lower_bound` kwargs are deprecated for bond guessing during Universe creation.
34+
Instead, pass `("bonds", "angles", "dihedrals")` into `to_guess` or `force_guess` during Universe creation, and the associated `vdwradii`, `fudge_factor`, and `lower_bound` kwargs into `Guesser` creation. Alternatively, if `vdwradii`, `fudge_factor`, and `lower_bound` are passed into `Universe.guess_TopologyAttrs`, they will override the previous values of those kwargs.
35+
* MDAnalysis.topology.guessers and MDAnalysis.topology.tables are deprecated in favour of the new Guessers API and will be removed in MDAnalysis v3.0.
36+
* Unknown masses are set to 0.0 for current version, this will be depracated in MDAnalysis v3.0.0 and replaced by :class:`Masses`' no_value_label attribute (np.nan).
37+
438
## Release 2.7.0 of MDAnalysis
539

640
This a minor release of MDAnalysis.

doc/source/scripts/tests/snapshot/__snapshots__/test_gen_topologyparser_attrs.ambr

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@
139139
'',
140140
':ref:`DATA <DATA-format>`, :ref:`GSD <GSD-format>`, :ref:`PSF <PSF-format>`, :ref:`TOP, PRMTOP, PARM7 <TOP-format>`, :ref:`TPR <TPR-format>`, :ref:`XML <XML-format>`',
141141
]),
142+
list([
143+
'mass',
144+
'masses',
145+
'',
146+
':ref:`CONFIG <CONFIG-format>`, :ref:`CRD <CRD-format>`, :ref:`DATA <DATA-format>`, :ref:`DMS <DMS-format>`, :ref:`GMS <GMS-format>`, :ref:`GRO <GRO-format>`, :ref:`GSD <GSD-format>`, :ref:`HISTORY <HISTORY-format>`, :ref:`IN, FHIAIMS <IN-format>`, :ref:`LAMMPSDUMP <LAMMPSDUMP-format>`, :ref:`MMTF <MMTF-format>`, :ref:`MOL2 <MOL2-format>`, :ref:`PDB, ENT <PDB-format>`, :ref:`PDBQT <PDBQT-format>`, :ref:`PQR <PQR-format>`, :ref:`PSF <PSF-format>`, :ref:`TOP, PRMTOP, PARM7 <TOP-format>`, :ref:`TPR <TPR-format>`, :ref:`TXYZ, ARC <TXYZ-format>`, :ref:`XML <XML-format>`, :ref:`XPDB <XPDB-format>`, :ref:`XYZ <XYZ-format>`',
147+
]),
142148
list([
143149
'model',
144150
'models',
@@ -217,6 +223,12 @@
217223
'B-factor',
218224
':ref:`CRD <CRD-format>`, :ref:`MMTF <MMTF-format>`, :ref:`PDB, ENT <PDB-format>`, :ref:`PDBQT <PDBQT-format>`, :ref:`XPDB <XPDB-format>`',
219225
]),
226+
list([
227+
'type',
228+
'types',
229+
'',
230+
':ref:`CONFIG <CONFIG-format>`, :ref:`CRD <CRD-format>`, :ref:`DATA <DATA-format>`, :ref:`DMS <DMS-format>`, :ref:`GMS <GMS-format>`, :ref:`GRO <GRO-format>`, :ref:`GSD <GSD-format>`, :ref:`HISTORY <HISTORY-format>`, :ref:`IN, FHIAIMS <IN-format>`, :ref:`LAMMPSDUMP <LAMMPSDUMP-format>`, :ref:`MMTF <MMTF-format>`, :ref:`MOL2 <MOL2-format>`, :ref:`PDB, ENT <PDB-format>`, :ref:`PDBQT <PDBQT-format>`, :ref:`PQR <PQR-format>`, :ref:`PSF <PSF-format>`, :ref:`TOP, PRMTOP, PARM7 <TOP-format>`, :ref:`TPR <TPR-format>`, :ref:`TXYZ, ARC <TXYZ-format>`, :ref:`XML <XML-format>`, :ref:`XPDB <XPDB-format>`, :ref:`XYZ <XYZ-format>`',
231+
]),
220232
list([
221233
'type_index',
222234
'type_indices',
@@ -319,8 +331,11 @@
319331
'masses': set({
320332
':ref:`CONFIG <CONFIG-format>`',
321333
':ref:`CRD <CRD-format>`',
334+
':ref:`DATA <DATA-format>`',
335+
':ref:`DMS <DMS-format>`',
322336
':ref:`GMS <GMS-format>`',
323337
':ref:`GRO <GRO-format>`',
338+
':ref:`GSD <GSD-format>`',
324339
':ref:`HISTORY <HISTORY-format>`',
325340
':ref:`IN, FHIAIMS <IN-format>`',
326341
':ref:`LAMMPSDUMP <LAMMPSDUMP-format>`',
@@ -329,7 +344,11 @@
329344
':ref:`PDB, ENT <PDB-format>`',
330345
':ref:`PDBQT <PDBQT-format>`',
331346
':ref:`PQR <PQR-format>`',
347+
':ref:`PSF <PSF-format>`',
348+
':ref:`TOP, PRMTOP, PARM7 <TOP-format>`',
349+
':ref:`TPR <TPR-format>`',
332350
':ref:`TXYZ, ARC <TXYZ-format>`',
351+
':ref:`XML <XML-format>`',
333352
':ref:`XPDB <XPDB-format>`',
334353
':ref:`XYZ <XYZ-format>`',
335354
}),
@@ -408,13 +427,24 @@
408427
'types': set({
409428
':ref:`CONFIG <CONFIG-format>`',
410429
':ref:`CRD <CRD-format>`',
430+
':ref:`DATA <DATA-format>`',
411431
':ref:`DMS <DMS-format>`',
412432
':ref:`GMS <GMS-format>`',
413433
':ref:`GRO <GRO-format>`',
434+
':ref:`GSD <GSD-format>`',
414435
':ref:`HISTORY <HISTORY-format>`',
415436
':ref:`IN, FHIAIMS <IN-format>`',
437+
':ref:`LAMMPSDUMP <LAMMPSDUMP-format>`',
438+
':ref:`MMTF <MMTF-format>`',
439+
':ref:`MOL2 <MOL2-format>`',
416440
':ref:`PDB, ENT <PDB-format>`',
441+
':ref:`PDBQT <PDBQT-format>`',
417442
':ref:`PQR <PQR-format>`',
443+
':ref:`PSF <PSF-format>`',
444+
':ref:`TOP, PRMTOP, PARM7 <TOP-format>`',
445+
':ref:`TPR <TPR-format>`',
446+
':ref:`TXYZ, ARC <TXYZ-format>`',
447+
':ref:`XML <XML-format>`',
418448
':ref:`XPDB <XPDB-format>`',
419449
':ref:`XYZ <XYZ-format>`',
420450
}),
@@ -437,13 +467,13 @@
437467
list([
438468
':ref:`DATA <DATA-format>`',
439469
'LAMMPS data file',
440-
'angles, bonds, charges, dihedrals, impropers',
470+
'angles, bonds, charges, dihedrals, impropers, masses, types',
441471
'',
442472
]),
443473
list([
444474
':ref:`DMS <DMS-format>`',
445475
'DESRES Molecular Structure file',
446-
'atomnums, bonds, chainIDs, charges, names, resnames',
476+
'atomnums, bonds, chainIDs, charges, masses, names, resnames',
447477
'types',
448478
]),
449479
list([
@@ -461,7 +491,7 @@
461491
list([
462492
':ref:`GSD <GSD-format>`',
463493
'HOOMD GSD file',
464-
'angles, bonds, charges, dihedrals, impropers, names, radii, resnames',
494+
'angles, bonds, charges, dihedrals, impropers, masses, names, radii, resnames, types',
465495
'',
466496
]),
467497
list([
@@ -479,19 +509,19 @@
479509
list([
480510
':ref:`LAMMPSDUMP <LAMMPSDUMP-format>`',
481511
'LAMMPS ascii dump file',
512+
'masses, types',
482513
'',
483-
'masses',
484514
]),
485515
list([
486516
':ref:`MMTF <MMTF-format>`',
487517
'MMTF file',
488-
'altLocs, bonds, charges, icodes, models, names, occupancies, resnames, tempfactors',
518+
'altLocs, bonds, charges, icodes, models, names, occupancies, resnames, tempfactors, types',
489519
'masses',
490520
]),
491521
list([
492522
':ref:`MOL2 <MOL2-format>`',
493523
'Tripos MOL2 file',
494-
'bonds, charges, elements, names, resnames',
524+
'bonds, charges, elements, names, resnames, types',
495525
'masses',
496526
]),
497527
list([
@@ -503,7 +533,7 @@
503533
list([
504534
':ref:`PDBQT <PDBQT-format>`',
505535
'PDBQT file',
506-
'altLocs, chainIDs, charges, icodes, names, occupancies, record_types, resnames, tempfactors',
536+
'altLocs, chainIDs, charges, icodes, names, occupancies, record_types, resnames, tempfactors, types',
507537
'masses',
508538
]),
509539
list([
@@ -515,31 +545,31 @@
515545
list([
516546
':ref:`PSF <PSF-format>`',
517547
'CHARMM, NAMD, or XPLOR PSF file',
518-
'angles, bonds, charges, dihedrals, impropers, names, resnames',
548+
'angles, bonds, charges, dihedrals, impropers, masses, names, resnames, types',
519549
'',
520550
]),
521551
list([
522552
':ref:`TOP, PRMTOP, PARM7 <TOP-format>`',
523553
'AMBER topology file',
524-
'angles, bonds, charges, dihedrals, impropers, names, resnames, type_indices',
554+
'angles, bonds, charges, dihedrals, impropers, masses, names, resnames, type_indices, types',
525555
'',
526556
]),
527557
list([
528558
':ref:`TPR <TPR-format>`',
529559
'GROMACS run topology file',
530-
'angles, bonds, chainIDs, charges, dihedrals, elements, impropers, molnums, moltypes, names, resnames',
560+
'angles, bonds, chainIDs, charges, dihedrals, elements, impropers, masses, molnums, moltypes, names, resnames, types',
531561
'',
532562
]),
533563
list([
534564
':ref:`TXYZ, ARC <TXYZ-format>`',
535565
'Tinker file',
536-
'bonds, elements, names',
566+
'bonds, elements, names, types',
537567
'masses',
538568
]),
539569
list([
540570
':ref:`XML <XML-format>`',
541571
'HOOMD XML file',
542-
'angles, bonds, charges, dihedrals, impropers, radii',
572+
'angles, bonds, charges, dihedrals, impropers, masses, radii, types',
543573
'',
544574
]),
545575
list([

0 commit comments

Comments
 (0)