-
Notifications
You must be signed in to change notification settings - Fork 664
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
deprecate Timestep argument to Writers (issue #2043)
- identified which Writers can currently use a ts (lots don't anyway) - deprecated Timestep as argument to Writer.write - Update package/MDAnalysis/coordinates/base.py - Update package/MDAnalysis/coordinates/XYZ.py - Update package/MDAnalysis/coordinates/GRO.py - add test_writer_api.py - removed obsolete test
- Loading branch information
1 parent
6a60c8a
commit 2a0f406
Showing
5 changed files
with
75 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# -*- Mode: python; tab-width: 4; indent-tabs-mode:nil; coding:utf-8 -*- | ||
# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 fileencoding=utf-8 | ||
# | ||
# MDAnalysis --- https://www.mdanalysis.org | ||
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors | ||
# (see the file AUTHORS for the full list of names) | ||
# | ||
# Released under the GNU Public Licence, v2 or any higher version | ||
# | ||
# Please cite your use of MDAnalysis in published work: | ||
# | ||
# R. J. Gowers, M. Linke, J. Barnoud, T. J. E. Reddy, M. N. Melo, S. L. Seyler, | ||
# D. L. Dotson, J. Domanski, S. Buchoux, I. M. Kenney, and O. Beckstein. | ||
# MDAnalysis: A Python package for the rapid analysis of molecular dynamics | ||
# simulations. In S. Benthall and S. Rostrup editors, Proceedings of the 15th | ||
# Python in Science Conference, pages 102-109, Austin, TX, 2016. SciPy. | ||
# | ||
# N. Michaud-Agrawal, E. J. Denning, T. B. Woolf, and O. Beckstein. | ||
# MDAnalysis: A Toolkit for the Analysis of Molecular Dynamics Simulations. | ||
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787 | ||
# | ||
from __future__ import absolute_import | ||
|
||
import itertools | ||
import pytest | ||
|
||
import MDAnalysis as mda | ||
|
||
|
||
# grab all known writers | ||
# sort so test order is predictable for parallel tests | ||
writers = sorted(set(mda._MULTIFRAME_WRITERS.values()) | | ||
set(mda._SINGLEFRAME_WRITERS.values()), | ||
key=lambda x: x.__name__) | ||
known_ts_haters = [ | ||
mda.coordinates.MOL2.MOL2Writer, | ||
mda.coordinates.PDB.PDBWriter, | ||
mda.coordinates.PDB.MultiPDBWriter, | ||
mda.coordinates.PQR.PQRWriter, | ||
mda.coordinates.PDBQT.PDBQTWriter, | ||
mda.coordinates.LAMMPS.DATAWriter, | ||
mda.coordinates.CRD.CRDWriter, | ||
] | ||
|
||
@pytest.mark.parametrize('writer', [w for w in writers | ||
if not w in known_ts_haters]) | ||
def test_ts_deprecated(writer, tmpdir): | ||
u = mda.Universe.empty(10, trajectory=True) | ||
|
||
fn = str(tmpdir.join('out.traj')) | ||
|
||
with writer(fn, n_atoms=10) as w: | ||
with pytest.warns(DeprecationWarning): | ||
w.write(u.trajectory.ts) |