-
Notifications
You must be signed in to change notification settings - Fork 653
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
Release 0.16.2 #1421
Release 0.16.2 #1421
Conversation
Start of 0.16.2
point to new conda-forge release version
Removed TestCase usage
Issue 1395 gro resid truncate
This fixes ERRORs and FAILs in the testsuite on 32bit: TypeError: Cannot cast array data from dtype('int64') to dtype('int32') according to the rule 'safe' and assert_(out[0].dtype == np.int64) File "/usr/lib/python2.7/site-packages/numpy/testing/utils.py", line 92, in assert_ raise AssertionError(smsg) AssertionError
- Added tests for 32 bit index support - added @rathann to AUTHORS
Issue #1362 : use np.intp types for indexing instead of np.int64 - According to numpy/numpy#4384 (comment), `np.intp` is the recommended dtype for indexing: "... use np.intp as dtype whenever things have to do with indexing or are logically related to indexing/array sizes. This is the natural dtype for it and it will normally also be the fastest one. - see https://docs.scipy.org/doc/numpy/user/basics.types.html - see also PR #1391 for discussion - This change should go some way towards increasing compatibility with i386/i696 (32 bit) platforms. NOTE: No dedicated testing on 32 bit yet (see WIP PR #1392 )
Groups (AtomGroup, ResidueGroup, SegmentGroup) cannot be stored in sets or used as dict key if they are not hashable. In python 3, the __hash__ method is not defined implicitly anymore when a class has a __eq__ method. Fixes #1397
- Explicitly define __hash__ for groups: Groups (AtomGroup, ResidueGroup, SegmentGroup) cannot be stored in sets or used as dict key if they are not hashable. In python 3, the hash method is not defined implicitly anymore when a class has a eq method. - fixes #1397
Merge into single command Fix for root dir files Move files in root dir to utils folder Drop plugins directory Merge coverage files Fix covage run command Fix test list env variable Fix output coverage file Fix covegae file Fix case Commnet out test__set_verbose Fix minimal build Fix merge command Undo minial build change Fix multiline command Fix lint build Remove plugins from the minimal build Try to fix the doc build Adds the test flags to the minimal build Reactivate tests that pass in test_log.py Remove if-else logic from "script" phase Adds missing call to evail in "script" phase Filip test flags and test directories Adds cover package argument Split command into constituent variables Fix MAIN_CMD in full build Have the same order of execution for all builds Add lib folder to the testing command Make the lib folder a python package * Adds __init__.py file to the lib folder Adds __future__ import
- closes #1383 - included deprecations: - #1373 Timeseries (targeted for 0.17) Note that the deprecation for core.Timeseries will always show up; this is deliberate so that users WILL see it as it will be gone in the next release! - #1377 Quick selectors (target 1.0) - #782 flags (target 1.0) - updated CHANGELOG
- improved installation instructions (minimal/full install for pip, always full install for conda; also added entry on installation of tests) - analysis landing page: better explained optional packages, removed scipy as example and replaced with sklearn and HOLE.
- removed imports in core and MDAnalysis - replaced MDAnalysis.collection with a mock object that issues warnings and raises NotImplementedError - added a test for MDAnalysis.collection
- instant selectors AtomGroup['<name>'], AtomGroup.<name>, ResidueGroup.<name>, Segment.<segid>, Segment.r<resid>, SegmentGroup.<segid> emit warnings - added tests - updated docs with detailed deprecation and alternatives Thanks to @richardjgowers for insights #1403 (comment)
It turns out that with this warning in place we raise two deprecation warnings because we also have a warning on _get_named_atom(item). Example output: >>> w.atoms['AAA'] .../mdanalysis/package/MDAnalysis/core/groups.py:1520: DeprecationWarning: Using the [] operator with strings is deprecated and will be removed in 1.0. Please use `select_atoms('name AAA')` instead. category=DeprecationWarning) .../mdanalysis/package/MDAnalysis/core/groups.py:1522: DeprecationWarning: `_get_named_atom` is deprecated! Instant selector AtomGroup['<name>'] or AtomGroup.<name> is deprecated and will be removed in 1.0. Use AtomGroup.select_atoms('name <name>') instead. return self._get_named_atom(item) <Atom 1: AAA of resname RsA, resid 1 and segid SegA>
This allows code to use the `getattr` function and only throw an error if the requested attribute is an atom name.
- updated all modules - removed any code that guards against scipy or matplotlib import - conforms to style guide https://github.com/MDAnalysis/mdanalysis/wiki/Style-Guide#module-imports-in-mdanalysisanalysis - fixes #1159 - fixes #1361
Looks good to me.
Thanks for working on it!
…--
Oliver Beckstein
email: [email protected]
Am Jun 21, 2017 um 12:38 schrieb Max Linke ***@***.***>:
This is how a release 0.16.2 branch could look like. It starts from e24da32 and cherry-picks the commits from #1404.
I think I can do it that we merge #1404 into develop and I do a similar cherry picking after that. I think that is the cleanest option and keeps a steady development history in the develop branch while master continues to point to the latest stable release version.
@MDAnalysis/coredevs are you OK with this model?
You can view, comment on, or merge this pull request online at:
#1421
Commit Summary
Started version 0.16.2
Merge pull request #1381 from MDAnalysis/start-0162
change definition of tests (#1382)
update conda badge (#1386)
Aesthetic fixes to test_gro
Added tests for issue #1395
Added lib.util.ltruncate_integer
Changed coordinate writers to use ltruncate_int
Merge pull request #1396 from MDAnalysis/issue-1395-gro_resid_truncate
use correct int types
relax test_symmetry test due to lower precision on 32bit
More work on making indexing arrays use intp (#1362)
Merge pull request #1393 from MDAnalysis/issue-1362-int_types
Explicitly define __hash__ for groups
Merge pull request #1398 from MDAnalysis/issue-1397-group-hash
Use common setup script rather than OS specific ones (#1408)
update copyright year
fix int type in asserts in TestDownshiftArrays (#1410)
Break build packagewise (#1370)
deprecated core.Timeseries module
Deprecated DCDReader.correl
add deprecation warnings for API changes
mention optional/full dependencies in docs
removed top-level imports of Timeseries
new MDAnalysisTests.core.util.assert_nowarns() function
make instant selectors emit DeprecationWarning
fix sphinx warnings
add getitem warning message
use explicit deprecation warning
test for no warnings raised by AtomGroup.segid
minor cleanups in tests
AtomGroup.__getitem__ depreaction warning: added removal release
removed explicit DeprecationWarning for AtomGroup["name"]
only issue _get_named_atom warning on successful call
make scipy and matplotlib full dependencies (#1159)
scipy and matplotlib are imported at top in analysis
removed conditional skipping of tests when scipy or matplotlib are missing
minor clean ups
File Changes
M .travis.yml (37)
M README.rst (4)
M package/AUTHORS (2)
M package/CHANGELOG (19)
M package/MDAnalysis/__init__.py (40)
M package/MDAnalysis/analysis/__init__.py (2)
M package/MDAnalysis/analysis/align.py (2)
M package/MDAnalysis/analysis/base.py (2)
M package/MDAnalysis/analysis/contacts.py (2)
M package/MDAnalysis/analysis/density.py (2)
M package/MDAnalysis/analysis/diffusionmap.py (2)
M package/MDAnalysis/analysis/distances.py (25)
M package/MDAnalysis/analysis/encore/__init__.py (2)
M package/MDAnalysis/analysis/encore/bootstrap.py (2)
M package/MDAnalysis/analysis/encore/clustering/ClusterCollection.py (2)
M package/MDAnalysis/analysis/encore/clustering/ClusteringMethod.py (2)
M package/MDAnalysis/analysis/encore/clustering/__init__.py (2)
M package/MDAnalysis/analysis/encore/clustering/affinityprop.pyx (2)
M package/MDAnalysis/analysis/encore/clustering/caffinityprop.pxd (2)
M package/MDAnalysis/analysis/encore/clustering/cluster.py (2)
M package/MDAnalysis/analysis/encore/confdistmatrix.py (2)
M package/MDAnalysis/analysis/encore/covariance.py (2)
M package/MDAnalysis/analysis/encore/cutils.pyx (2)
M package/MDAnalysis/analysis/encore/dimensionality_reduction/DimensionalityReductionMethod.py (2)
M package/MDAnalysis/analysis/encore/dimensionality_reduction/__init__.py (2)
M package/MDAnalysis/analysis/encore/dimensionality_reduction/cstochasticproxembed.pxd (2)
M package/MDAnalysis/analysis/encore/dimensionality_reduction/reduce_dimensionality.py (2)
M package/MDAnalysis/analysis/encore/dimensionality_reduction/stochasticproxembed.pyx (2)
M package/MDAnalysis/analysis/encore/similarity.py (38)
M package/MDAnalysis/analysis/encore/utils.py (2)
M package/MDAnalysis/analysis/gnm.py (2)
M package/MDAnalysis/analysis/hbonds/__init__.py (2)
M package/MDAnalysis/analysis/hbonds/hbond_analysis.py (2)
M package/MDAnalysis/analysis/hbonds/hbond_autocorrel.py (28)
M package/MDAnalysis/analysis/helanal.py (2)
M package/MDAnalysis/analysis/hole.py (18)
M package/MDAnalysis/analysis/leaflet.py (2)
M package/MDAnalysis/analysis/legacy/__init__.py (2)
M package/MDAnalysis/analysis/legacy/x3dna.py (7)
M package/MDAnalysis/analysis/lineardensity.py (2)
M package/MDAnalysis/analysis/nuclinfo.py (2)
M package/MDAnalysis/analysis/pca.py (9)
M package/MDAnalysis/analysis/polymer.py (9)
M package/MDAnalysis/analysis/psa.py (108)
M package/MDAnalysis/analysis/rdf.py (2)
M package/MDAnalysis/analysis/rms.py (2)
M package/MDAnalysis/analysis/waterdynamics.py (2)
M package/MDAnalysis/analysis/x3dna.py (2)
M package/MDAnalysis/auxiliary/XVG.py (2)
M package/MDAnalysis/auxiliary/__init__.py (2)
M package/MDAnalysis/auxiliary/base.py (2)
M package/MDAnalysis/auxiliary/core.py (2)
M package/MDAnalysis/coordinates/CRD.py (8)
M package/MDAnalysis/coordinates/DCD.py (59)
M package/MDAnalysis/coordinates/DLPoly.py (2)
M package/MDAnalysis/coordinates/DMS.py (2)
M package/MDAnalysis/coordinates/GMS.py (2)
M package/MDAnalysis/coordinates/GRO.py (6)
M package/MDAnalysis/coordinates/INPCRD.py (2)
M package/MDAnalysis/coordinates/LAMMPS.py (2)
M package/MDAnalysis/coordinates/MMTF.py (2)
M package/MDAnalysis/coordinates/MOL2.py (2)
M package/MDAnalysis/coordinates/PDB.py (6)
M package/MDAnalysis/coordinates/PDBQT.py (6)
M package/MDAnalysis/coordinates/PQR.py (2)
M package/MDAnalysis/coordinates/TRJ.py (2)
M package/MDAnalysis/coordinates/TRR.py (2)
M package/MDAnalysis/coordinates/TRZ.py (2)
M package/MDAnalysis/coordinates/XDR.py (2)
M package/MDAnalysis/coordinates/XTC.py (2)
M package/MDAnalysis/coordinates/XYZ.py (2)
M package/MDAnalysis/coordinates/__init__.py (6)
M package/MDAnalysis/coordinates/base.py (2)
M package/MDAnalysis/coordinates/chain.py (2)
M package/MDAnalysis/coordinates/core.py (2)
M package/MDAnalysis/coordinates/dcdtimeseries.pyx (2)
M package/MDAnalysis/coordinates/memory.py (4)
M package/MDAnalysis/coordinates/null.py (2)
M package/MDAnalysis/core/AtomGroup.py (2)
M package/MDAnalysis/core/Timeseries.py (176)
M package/MDAnalysis/core/__init__.py (32)
M package/MDAnalysis/core/groups.py (101)
M package/MDAnalysis/core/selection.py (2)
M package/MDAnalysis/core/topology.py (16)
M package/MDAnalysis/core/topologyattrs.py (50)
M package/MDAnalysis/core/topologyobjects.py (2)
M package/MDAnalysis/core/universe.py (13)
M package/MDAnalysis/exceptions.py (2)
M package/MDAnalysis/lib/NeighborSearch.py (2)
M package/MDAnalysis/lib/__init__.py (2)
M package/MDAnalysis/lib/c_distances.pyx (2)
M package/MDAnalysis/lib/c_distances_openmp.pyx (2)
M package/MDAnalysis/lib/distances.py (2)
M package/MDAnalysis/lib/formats/__init__.py (2)
M package/MDAnalysis/lib/formats/cython_util.pxd (2)
M package/MDAnalysis/lib/formats/cython_util.pyx (2)
M package/MDAnalysis/lib/formats/libmdaxdr.pyx (2)
M package/MDAnalysis/lib/log.py (2)
M package/MDAnalysis/lib/mdamath.py (2)
M package/MDAnalysis/lib/util.py (27)
M package/MDAnalysis/selections/__init__.py (2)
M package/MDAnalysis/selections/base.py (2)
M package/MDAnalysis/selections/charmm.py (2)
M package/MDAnalysis/selections/gromacs.py (2)
M package/MDAnalysis/selections/jmol.py (2)
M package/MDAnalysis/selections/pymol.py (2)
M package/MDAnalysis/selections/vmd.py (2)
M package/MDAnalysis/tests/__init__.py (2)
M package/MDAnalysis/tests/datafiles.py (2)
M package/MDAnalysis/topology/CRDParser.py (2)
M package/MDAnalysis/topology/DLPolyParser.py (2)
M package/MDAnalysis/topology/DMSParser.py (2)
M package/MDAnalysis/topology/ExtendedPDBParser.py (2)
M package/MDAnalysis/topology/GMSParser.py (2)
M package/MDAnalysis/topology/GROParser.py (2)
M package/MDAnalysis/topology/HoomdXMLParser.py (2)
M package/MDAnalysis/topology/LAMMPSParser.py (2)
M package/MDAnalysis/topology/MMTFParser.py (2)
M package/MDAnalysis/topology/MOL2Parser.py (2)
M package/MDAnalysis/topology/PDBParser.py (2)
M package/MDAnalysis/topology/PDBQTParser.py (2)
M package/MDAnalysis/topology/PQRParser.py (2)
M package/MDAnalysis/topology/PSFParser.py (2)
M package/MDAnalysis/topology/TOPParser.py (2)
M package/MDAnalysis/topology/TPRParser.py (2)
M package/MDAnalysis/topology/XYZParser.py (2)
M package/MDAnalysis/topology/__init__.py (2)
M package/MDAnalysis/topology/_elements.py (2)
M package/MDAnalysis/topology/base.py (2)
M package/MDAnalysis/topology/core.py (2)
M package/MDAnalysis/topology/guessers.py (2)
M package/MDAnalysis/topology/tables.py (2)
M package/MDAnalysis/topology/tpr/__init__.py (2)
M package/MDAnalysis/topology/tpr/obj.py (2)
M package/MDAnalysis/topology/tpr/setting.py (2)
M package/MDAnalysis/topology/tpr/utils.py (2)
M package/MDAnalysis/units.py (2)
M package/MDAnalysis/version.py (4)
M package/MDAnalysis/visualization/__init__.py (2)
M package/MDAnalysis/visualization/streamlines.py (2)
M package/MDAnalysis/visualization/streamlines_3D.py (2)
M package/doc/sphinx/source/documentation_pages/analysis/encore.rst (2)
M package/doc/sphinx/source/documentation_pages/analysis_modules.rst (46)
M package/doc/sphinx/source/documentation_pages/selections.rst (30)
M package/doc/sphinx/source/index.rst (42)
M package/setup.py (13)
M testsuite/CHANGELOG (4)
M testsuite/MDAnalysisTests/__init__.py (7)
M testsuite/MDAnalysisTests/analysis/test_align.py (2)
M testsuite/MDAnalysisTests/analysis/test_base.py (2)
M testsuite/MDAnalysisTests/analysis/test_contacts.py (2)
M testsuite/MDAnalysisTests/analysis/test_density.py (9)
M testsuite/MDAnalysisTests/analysis/test_diffusionmap.py (2)
M testsuite/MDAnalysisTests/analysis/test_distances.py (69)
M testsuite/MDAnalysisTests/analysis/test_encore.py (33)
M testsuite/MDAnalysisTests/analysis/test_gnm.py (2)
M testsuite/MDAnalysisTests/analysis/test_hbonds.py (2)
M testsuite/MDAnalysisTests/analysis/test_helanal.py (2)
M testsuite/MDAnalysisTests/analysis/test_hole.py (11)
M testsuite/MDAnalysisTests/analysis/test_hydrogenbondautocorrel.py (5)
M testsuite/MDAnalysisTests/analysis/test_leaflet.py (4)
M testsuite/MDAnalysisTests/analysis/test_lineardensity.py (2)
M testsuite/MDAnalysisTests/analysis/test_nuclinfo.py (2)
M testsuite/MDAnalysisTests/analysis/test_pca.py (4)
M testsuite/MDAnalysisTests/analysis/test_persistencelength.py (16)
M testsuite/MDAnalysisTests/analysis/test_psa.py (20)
M testsuite/MDAnalysisTests/analysis/test_rdf.py (2)
M testsuite/MDAnalysisTests/analysis/test_rms.py (2)
M testsuite/MDAnalysisTests/analysis/test_waterdynamics.py (2)
M testsuite/MDAnalysisTests/auxiliary/base.py (2)
M testsuite/MDAnalysisTests/auxiliary/test_xvg.py (2)
M testsuite/MDAnalysisTests/coordinates/base.py (2)
M testsuite/MDAnalysisTests/coordinates/reference.py (2)
M testsuite/MDAnalysisTests/coordinates/test_amber_inpcrd.py (2)
M testsuite/MDAnalysisTests/coordinates/test_chainreader.py (2)
M testsuite/MDAnalysisTests/coordinates/test_crd.py (2)
M testsuite/MDAnalysisTests/coordinates/test_dcd.py (2)
M testsuite/MDAnalysisTests/coordinates/test_dlpoly.py (2)
M testsuite/MDAnalysisTests/coordinates/test_dms.py (2)
M testsuite/MDAnalysisTests/coordinates/test_gms.py (2)
M testsuite/MDAnalysisTests/coordinates/test_gro.py (47)
M testsuite/MDAnalysisTests/coordinates/test_lammps.py (2)
M testsuite/MDAnalysisTests/coordinates/test_memory.py (2)
M testsuite/MDAnalysisTests/coordinates/test_mmtf.py (2)
M testsuite/MDAnalysisTests/coordinates/test_mol2.py (2)
M testsuite/MDAnalysisTests/coordinates/test_netcdf.py (2)
M testsuite/MDAnalysisTests/coordinates/test_null.py (2)
M testsuite/MDAnalysisTests/coordinates/test_pdb.py (2)
M testsuite/MDAnalysisTests/coordinates/test_pdbqt.py (2)
M testsuite/MDAnalysisTests/coordinates/test_pqr.py (2)
M testsuite/MDAnalysisTests/coordinates/test_reader_api.py (2)
M testsuite/MDAnalysisTests/coordinates/test_timestep_api.py (2)
M testsuite/MDAnalysisTests/coordinates/test_trj.py (2)
M testsuite/MDAnalysisTests/coordinates/test_trz.py (2)
M testsuite/MDAnalysisTests/coordinates/test_writer_registration.py (2)
M testsuite/MDAnalysisTests/coordinates/test_xdr.py (2)
M testsuite/MDAnalysisTests/coordinates/test_xyz.py (2)
M testsuite/MDAnalysisTests/core/test_atom.py (2)
M testsuite/MDAnalysisTests/core/test_atomgroup.py (2)
M testsuite/MDAnalysisTests/core/test_atomselections.py (2)
M testsuite/MDAnalysisTests/core/test_fragments.py (2)
M testsuite/MDAnalysisTests/core/test_group_traj_access.py (2)
M testsuite/MDAnalysisTests/core/test_groups.py (104)
A testsuite/MDAnalysisTests/core/test_index_dtype.py (92)
M testsuite/MDAnalysisTests/core/test_residue.py (2)
M testsuite/MDAnalysisTests/core/test_residuegroup.py (2)
M testsuite/MDAnalysisTests/core/test_segment.py (2)
M testsuite/MDAnalysisTests/core/test_segmentgroup.py (2)
M testsuite/MDAnalysisTests/core/test_topology.py (4)
M testsuite/MDAnalysisTests/core/test_topologyattrs.py (2)
M testsuite/MDAnalysisTests/core/test_topologyobjects.py (2)
M testsuite/MDAnalysisTests/core/test_universe.py (2)
M testsuite/MDAnalysisTests/core/test_updating_atomgroup.py (2)
M testsuite/MDAnalysisTests/core/util.py (2)
M testsuite/MDAnalysisTests/datafiles.py (2)
M testsuite/MDAnalysisTests/formats/test_libmdaxdr.py (2)
A testsuite/MDAnalysisTests/lib/__init__.py (0)
M testsuite/MDAnalysisTests/lib/test_util.py (20)
M testsuite/MDAnalysisTests/plugins/__init__.py (2)
M testsuite/MDAnalysisTests/plugins/capture_err.py (2)
M testsuite/MDAnalysisTests/plugins/cleanup.py (2)
M testsuite/MDAnalysisTests/plugins/knownfailure.py (2)
M testsuite/MDAnalysisTests/plugins/memleak.py (2)
M testsuite/MDAnalysisTests/plugins/open_files.py (2)
M testsuite/MDAnalysisTests/topology/base.py (2)
M testsuite/MDAnalysisTests/topology/test_crd.py (2)
M testsuite/MDAnalysisTests/topology/test_dlpoly.py (2)
M testsuite/MDAnalysisTests/topology/test_dms.py (2)
M testsuite/MDAnalysisTests/topology/test_gms.py (2)
M testsuite/MDAnalysisTests/topology/test_gro.py (2)
M testsuite/MDAnalysisTests/topology/test_guessers.py (2)
M testsuite/MDAnalysisTests/topology/test_hoomdxml.py (2)
M testsuite/MDAnalysisTests/topology/test_lammpsdata.py (2)
M testsuite/MDAnalysisTests/topology/test_mol2.py (2)
M testsuite/MDAnalysisTests/topology/test_pdb.py (2)
M testsuite/MDAnalysisTests/topology/test_pdbqt.py (2)
M testsuite/MDAnalysisTests/topology/test_pqr.py (2)
M testsuite/MDAnalysisTests/topology/test_psf.py (2)
M testsuite/MDAnalysisTests/topology/test_top.py (2)
M testsuite/MDAnalysisTests/topology/test_tprparser.py (2)
M testsuite/MDAnalysisTests/topology/test_xpdb.py (2)
M testsuite/MDAnalysisTests/topology/test_xyz.py (2)
M testsuite/MDAnalysisTests/util.py (50)
A testsuite/MDAnalysisTests/utils/__init__.py (0)
R testsuite/MDAnalysisTests/utils/test_altloc.py (2)
R testsuite/MDAnalysisTests/utils/test_authors.py (2)
R testsuite/MDAnalysisTests/utils/test_datafiles.py (2)
R testsuite/MDAnalysisTests/utils/test_deprecated.py (13)
R testsuite/MDAnalysisTests/utils/test_distances.py (2)
R testsuite/MDAnalysisTests/utils/test_failure.py (4)
R testsuite/MDAnalysisTests/utils/test_imports.py (2)
R testsuite/MDAnalysisTests/utils/test_log.py (10)
R testsuite/MDAnalysisTests/utils/test_meta.py (2)
R testsuite/MDAnalysisTests/utils/test_modelling.py (2)
R testsuite/MDAnalysisTests/utils/test_nuclinfo.py (2)
R testsuite/MDAnalysisTests/utils/test_persistence.py (2)
R testsuite/MDAnalysisTests/utils/test_qcprot.py (2)
R testsuite/MDAnalysisTests/utils/test_selections.py (2)
R testsuite/MDAnalysisTests/utils/test_streamio.py (2)
R testsuite/MDAnalysisTests/utils/test_transformations.py (2)
R testsuite/MDAnalysisTests/utils/test_units.py (2)
A testsuite/__init__.py (0)
M testsuite/setup.py (4)
Patch Links:
https://github.com/MDAnalysis/mdanalysis/pull/1421.patch
https://github.com/MDAnalysis/mdanalysis/pull/1421.diff
—
You are receiving this because you are on a team that was mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Given that Travis full is timing out, I am trying to do a quick local test. |
So #1404 is merged now. There haven't been any changes since I made the original PR. This is a viable branch for release 0.16.2 now. |
@richardjgowers you need to fix the merge conflicts during the merge. I can't get rid of them. I'm not sure why to be honest. |
FYI: Running the full tests (including ncdf, HOLE, ClustalW, ...) on Linux x86_64
mostly passes:
The errors are due to trajectory index files not being readable by numpy/zipfile (see testlog.txt), which I think is actually due to race conditions when running the tests at high parallelization levels (I used 12 processes); I will re-run with 2 procs and will post results when that is done. EDIT: Running with 2 procs passes everything:
Side note: It took me a while that (at least at the moment – perhaps due to #1370 ?) we cannot run the tests in the way we recommend testing for developers:
If I try to have |
really I always collect with mda_nosetests and it works fine. |
Then I don't really have a good explanation why it does not work for me (see
I work in a venv, actually pip-uninstalled MDAtests before
It's not worth making a big fuss about it given that the testing is changing anyway. |
I can run all tests on my machine in a single process. Only the testsuite_test_authors test files for a reason that is unkown to me. |
6643700
to
85c0c56
Compare
I removed the TRZ fix |
@kain88-de can you rebase the CHANGELOG/fix the conflict with @utkbansal now needing to be in 16.2 |
@richardjgowers I'd love to solve the merge conflict but I can't I honestly don't know why there is an error in the first place. I tried yesterday to fix it on my laptop with local test merges but I just can't get git to work right on this one. |
Conflicts: package/CHANGELOG
This is how a release 0.16.2 branch could look like. It starts from e24da32 and cherry-picks the commits from #1404.
I think I can do it that we merge #1404 into develop and I do a similar cherry picking after that. I think that is the cleanest option and keeps a steady development history in the
develop
branch whilemaster
continues to point to the latest stable release version.@MDAnalysis/coredevs are you OK with this model?