Skip to content

Commit

Permalink
Merge pull request #1372 from MDAnalysis/dcd-cython-rebase
Browse files Browse the repository at this point in the history
DCD-Cython
  • Loading branch information
kain88-de authored Jul 8, 2017
2 parents 77f5ea4 + 42c7105 commit 742d7c4
Show file tree
Hide file tree
Showing 26 changed files with 1,894 additions and 2,177 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ env:
- MAIN_CMD="pytest ${PYTEST_LIST} ${PYTEST_FLAGS}; python ./testsuite/MDAnalysisTests/mda_nosetests ${NOSE_TEST_LIST} ${NOSE_FLAGS}"
- SETUP_CMD=""
- BUILD_CMD="pip install -v package/ && pip install testsuite/"
- CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib scipy griddataformats pytest-cov pytest-xdist"
- CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy griddataformats seaborn coveralls clustalw=2.1 pytest-cov pytest-xdist"
- CONDA_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib scipy griddataformats pytest-cov pytest-xdist hypothesis"
- CONDA_ALL_DEPENDENCIES="mmtf-python nose=1.3.7 mock six biopython networkx cython joblib nose-timer matplotlib netcdf4 scikit-learn scipy griddataformats seaborn coveralls clustalw=2.1 pytest-cov pytest-xdist hypothesis"
# Install griddataformats from PIP so that scipy is only installed in the full build (#1147)
- PIP_DEPENDENCIES='pytest-raises'
- CONDA_CHANNELS='biobuilds conda-forge'
Expand Down
4 changes: 3 additions & 1 deletion package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ The rules for this file:
* release numbers follow "Semantic Versioning" http://semver.org

------------------------------------------------------------------------------
mm/dd/17 richardjgowers, rathann, orbeckst, tylerjereddy, mtiberti
mm/dd/17 richardjgowers, rathann, orbeckst, tylerjereddy, mtiberti, kain88-de

* 0.17.0

Enhancements
* add low level lib.formats.libdcd module for reading/writing DCD (PR #1372)
* replace old DCD reader with a Python 3 ready DCD reader (Issue #659)

Deprecations

Expand Down
784 changes: 273 additions & 511 deletions package/MDAnalysis/coordinates/DCD.py

Large diffs are not rendered by default.

195 changes: 0 additions & 195 deletions package/MDAnalysis/coordinates/include/correl.h

This file was deleted.

Loading

0 comments on commit 742d7c4

Please sign in to comment.