Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
9d29190
added datafile entry for h5md file
edisj Jun 23, 2020
b675a0d
committing first iteration of example h5md file converted from TRR_xv…
edisj Jun 25, 2020
8f224c5
Fixed box dimensions
edisj Jun 25, 2020
86b4ac5
updated file name
edisj Jun 25, 2020
9667b39
renamed H5MD_xvf.h5 to cobrotoxin.h5
edisj Jun 25, 2020
9cb909b
deleted H5MD_xvf.h5
edisj Jun 27, 2020
07f386e
changed file extension of cobrotoxin.h5 to cobrotoxin.h5md and added …
edisj Jun 30, 2020
67bb13b
added triclinic dimension
edisj Jun 30, 2020
7a25135
changed extension of cobrotoxin.h5 to cobrotoxin.h5md
edisj Jun 30, 2020
c239235
Adding first draft for H5MDReader and renamed atoms to trajectory in …
edisj Jul 2, 2020
a87057b
Removed masses from H5MDReader and adding first iteration of test_h5m…
edisj Jul 7, 2020
8b945c7
updated documentation
edisj Jul 7, 2020
b1aba46
added tests for velocity and force
edisj Jul 7, 2020
c3c6521
adding test.h5md, create_h5md_data.py which created test.h5md from te…
edisj Jul 9, 2020
51d4f97
added correct ts.data values into cobrotoxin.h5md, adjusted init.py t…
edisj Jul 9, 2020
c6b5d35
updated documentation, added additional ts.data values to be read, an…
edisj Jul 9, 2020
05f9e70
adding documenation change in this commit
edisj Jul 9, 2020
7951af7
updated test.h5md to include step, lambda, dt
edisj Jul 10, 2020
a3498b2
added MultiframeReaderTest derived tests
edisj Jul 10, 2020
b0902cf
changed .h5 to .h5md
edisj Jul 10, 2020
8df1ef2
added h5py into conda dependencies and pyh5md into pip dependencies
edisj Jul 10, 2020
873f0ce
trying to pip install h5py
edisj Jul 10, 2020
fe788c3
changed trajectory group to arbitrary name and testing failed import
edisj Jul 14, 2020
66c8ad0
updated rdkit version
edisj Jul 14, 2020
1df7f51
added unit reader in H5MD.py and added unit attributes to .h5md files
edisj Jul 14, 2020
7327bae
Merge branch 'develop' into h5md-format
edisj Jul 14, 2020
8727c1d
added ImportError to h5md and added h5md to sphinx
edisj Jul 14, 2020
0e9e94b
added h5md documentation
edisj Jul 14, 2020
dbcf2a2
lots of changes to h5md.py and added import error in test and create
edisj Jul 16, 2020
1fa45df
pulling from upstream
edisj Jul 16, 2020
db25936
changes to H5MD documenation, added -v to pytests, added time to ts.data
edisj Jul 17, 2020
69c8708
updated tests
edisj Jul 18, 2020
fc51cea
attempting to appease the pep8 bot
edisj Jul 18, 2020
521e372
pep8 round 2
edisj Jul 18, 2020
5293187
pep8 final round?
edisj Jul 18, 2020
e350f7c
removed -v
edisj Jul 18, 2020
4f128f9
hopefully fixes docstring error
edisj Jul 18, 2020
8503b55
pesky space...
edisj Jul 18, 2020
7b5b89f
addressing some of the requested changes
edisj Jul 21, 2020
618f764
addresses missing units, tried to make code look nicer
edisj Jul 22, 2020
fdb9deb
addressed comments, added parallel kwargs check, and updated CHANGELO…
edisj Jul 28, 2020
2ba47d2
merging with develop to fix conflicts
edisj Jul 28, 2020
12bc0b0
added unitcell dimension error, changed copy_data() method, changed r…
edisj Jul 29, 2020
13efff2
made changes to 'driver' and 'comm'
edisj Jul 31, 2020
d408d94
fixed underscores
edisj Jul 31, 2020
4055419
updated documentation and changed reopen()
edisj Aug 3, 2020
540d6d3
added tests to increase coverage and added pragma: no cover on mpi dr…
edisj Aug 3, 2020
4ecb1f5
added a test
edisj Aug 3, 2020
840a977
changed 'units' to 'unit' per H5MD documenation and made dimensions n…
edisj Aug 4, 2020
7079dd3
marked openstream test with xfail
edisj Aug 4, 2020
8427819
made close() actually close the file, updated documenation, updated h…
edisj Aug 6, 2020
53f28a8
updated docs for H5MD reader
orbeckst Aug 7, 2020
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
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cache:
environment:
global:
CONDA_CHANNELS: conda-forge
CONDA_DEPENDENCIES: pip setuptools wheel cython biopython networkx joblib matplotlib scipy vs2015_runtime pytest mmtf-python GridDataFormats hypothesis pytest-cov codecov chemfiles tqdm tidynamics>=1.0.0 rdkit>=2020.03.1
CONDA_DEPENDENCIES: pip setuptools wheel cython biopython networkx joblib matplotlib scipy vs2015_runtime pytest mmtf-python GridDataFormats hypothesis pytest-cov codecov chemfiles tqdm tidynamics>=1.0.0 rdkit>=2020.03.1 h5py
PIP_DEPENDENCIES: gsd==1.9.3 duecredit parmed
DEBUG: "False"
MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
Expand All @@ -22,7 +22,7 @@ environment:
# is fixed in ci-helpers https://github.com/astropy/ci-helpers/issues/406
# MINICONDA_VERSION: "latest"
MPLBACKEND: "agg"

matrix:
- PYTHON_VERSION: 3.6
PYTHON_ARCH: 64
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
- SETUP_CMD="${PYTEST_FLAGS}"
- BUILD_CMD="pip install -e package/ && (cd testsuite/ && python setup.py build)"
- CONDA_MIN_DEPENDENCIES="mmtf-python biopython networkx cython matplotlib scipy griddataformats hypothesis gsd codecov"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn joblib>=0.12 chemfiles tqdm>=4.43.0 tidynamics>=1.0.0 rdkit>=2020.03.1"
- CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn joblib>=0.12 chemfiles tqdm>=4.43.0 tidynamics>=1.0.0 rdkit>=2020.03.1 h5py"
- CONDA_CHANNELS='biobuilds conda-forge'
- CONDA_CHANNEL_PRIORITY=True
- PIP_DEPENDENCIES="duecredit parmed"
Expand Down Expand Up @@ -151,7 +151,7 @@ after_success:
fi

# can't use test here since this leads to travis fails even though the build passes
# turn off blocking as it causes large writes to stdout to fail
# turn off blocking as it causes large writes to stdout to fail
# (see https://github.com/travis-ci/travis-ci/issues/4704)
- |
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]] && [[ ${BUILD_DOCS} == "true" ]] ; then
Expand All @@ -162,4 +162,3 @@ after_success:
cd -
bash ${TRAVIS_BUILD_DIR}/maintainer/deploy_docs_via_travis.sh;
fi

5 changes: 3 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
pool:
vmImage: 'VS2017-Win2016'
variables:
MPLBACKEND: agg
MPLBACKEND: agg
strategy:
matrix:
Python37-32bit-full:
Expand Down Expand Up @@ -54,6 +54,7 @@ jobs:
pytest-xdist
scikit-learn
scipy
h5py
tqdm
displayName: 'Install dependencies'
# TODO: recent rdkit is not on PyPI
Expand All @@ -64,7 +65,7 @@ jobs:
duecredit
gsd==1.9.3
joblib
GridDataFormats
GridDataFormats
mmtf-python
networkx
parmed
Expand Down
1 change: 1 addition & 0 deletions package/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ Chronological list of authors
- Andrea Rizzi
- William Glass
- Marcello Sega
- Edis Jakupovic

External code
-------------
Expand Down
7 changes: 4 additions & 3 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The rules for this file:
Fixes
* Bond attribute is no longer set if PDB file contains no CONECT records
(Issue #2832)
* ResidueAttrs now have Atom as a target class by default; ICodes and
* ResidueAttrs now have Atom as a target class by default; ICodes and
Molnums now have default target_classes (#2803, PR #2805)
* Selections on emtpy AtomGroups now return an empty AtomGroup instead of an
error (Issue #2765)
Expand All @@ -36,8 +36,8 @@ Fixes
density=True; the keyword was available since 0.19.0 but with incorrect
semantics and not documented and did not produce correct results (Issue
#2811, PR #2812)
* In hydrogenbonds.hbond_analysis.HydrogenbondAnalysis an AttributeError
was thrown when finding D-H pairs via the topology if `hydrogens` was an
* In hydrogenbonds.hbond_analysis.HydrogenbondAnalysis an AttributeError
was thrown when finding D-H pairs via the topology if `hydrogens` was an
empty AtomGroup (Issue #2848)

Enhancements
Expand All @@ -58,6 +58,7 @@ Enhancements
* Added Hydrogen Bond Lifetime keyword "between" (PR #2791)
* Dead code removed from the TPR parser and increased test coverage (PR #2840)
* TPR parser exposes the elements topology attribute (PR #2858, see Issue #2553)
* Added `H5MDReader` to coordinate readers (Issue #762, PR #2787)

Changes
* deprecated NumPy type aliases have been replaced with their actual types
Expand Down
Loading