Merge pull request #76 from MDAnalysis/update-tests

update tests

Author: IAlibay

MDAnalysisData/base.py

@@ -31,7 +31,7 @@
 from os import environ, listdir, makedirs
 from os.path import dirname, exists, expanduser, isdir, join, splitext
 import hashlib
-from pkg_resources import resource_string
+import importlib.resources
 
 from tqdm import tqdm
 
@@ -207,9 +207,8 @@ def _read_description(filename, description_dir='descr'):
     """
     # The descr directory should be in the same directory as this file base.py.
     # `resource_string` returns bytes, which we need to decode to UTF-8
-    DESCR = resource_string(__name__,
-                            '{}/{}'.format(description_dir, filename)
-                           ).decode("utf-8")
+    path = importlib.resources.files('MDAnalysisData') / description_dir / filename
+    DESCR = path.read_bytes().decode("utf-8")
     return DESCR
 
 

MDAnalysisData/descr/__init__.py

@@ -0,0 +1 @@
+

MDAnalysisData/tests/test_datasets.py

@@ -27,6 +27,18 @@
 # For filetype=topology, the data are downloaded and cached.
 # For filetype=trajectory the cached data are used.
 # This test is not thread/parallel safe.
+#
+# These tests are not enabled by default and are only executed with
+# `pytest -m online` or `pytest --pyargs MDAnalysisData` because they
+# require downloading datasets.
+
+# CURRENT LIMITATIONS:
+#
+# Assertions related to DESCR will currently only pass on UNIX (and
+# not Windows) because of different line ending conventions (UNIX: \n,
+# Windows:\r\n); the tests could be rewritten (e.g., use
+# `DESCR.split()` to compare words) and using regex for matching the
+# first lines.
 
 @pytest.mark.online
 @pytest.mark.parametrize('filetype', ('topology', 'trajectory'))
@@ -159,7 +171,7 @@ def test_yiip_equilibrium(traj_len, filetype):
 
     metadata = yiip_equilibrium.ARCHIVE[traj_len]
 
-    assert len(data.DESCR) == 1511
+    assert len(data.DESCR) == 1536
     assert data.DESCR.startswith(".. -*- coding: utf-8 -*-\n\n.. _`yiip-equilibrium-dataset`:")
 
     assert os.path.basename(data[filetype]) == metadata[filetype].filename