Fix project data interface and add unittests for job and project data interfaces

signac/contrib/job.py

@@ -53,6 +53,7 @@ class Job(object):
     "The job's document filename."
 
     KEY_DATA = 'signac_data'
+    "The job's datastore key."
 
     def __init__(self, project, statepoint, _id=None):
         self._project = project

signac/contrib/project.py

@@ -156,6 +156,9 @@ def __init__(self, config=None, _ignore_schema_version=False):
         self._fn_doc = os.path.join(self._rd, self.FN_DOCUMENT)
         self._document = None
 
+        # Prepare project h5-stores
+        self._stores = H5StoreManager(self._rd)
+
         # Prepare Workspace Directory
         if not os.path.isdir(self._wd):
             try:
@@ -378,7 +381,7 @@ def stores(self):
         :return: The HDF5-Store manager for this project.
         :rtype: :class:`~..core.h5store.H5StoreManager`
         """
-        return H5StoreManager(self._rd)
+        return self._stores
 
     @property
     def data(self):

tests/test_project.py

@@ -12,6 +12,7 @@
 import json
 import pickle
 import string
+import warnings
 from tarfile import TarFile
 from zipfile import ZipFile
 from tempfile import TemporaryDirectory
@@ -30,6 +31,7 @@
 from signac.common.config import get_config
 
 from test_job import BaseJobTest
+import test_h5store
 
 
 try:
@@ -45,6 +47,11 @@
 except ImportError:
     H5PY = False
 
+try:
+    import numpy    # noqa
+    NUMPY = True
+except ImportError:
+    NUMPY = False
 
 # Skip linked view tests on Windows
 WINDOWS = (sys.platform == 'win32')
@@ -155,6 +162,7 @@ def test_doc(self):
         self.assertEqual(self.project.doc, {'a': {'b': 45}})
 
     @unittest.skipIf(not H5PY, 'test requires the h5py package')
+    @unittest.skipIf(not NUMPY, 'test requires the numpy package')
     def test_data(self):
         with self.project.data:
             self.assertFalse(self.project.data)
@@ -178,6 +186,7 @@ def test_data(self):
             self.assertEqual(self.project.data, {'a': {'b': 43}})
             self.project.data.a.b = 44
             self.assertEqual(self.project.data, {'a': {'b': 44}})
+            self.project.data['c'] = numpy.zeros(10)
         # This setter will overwrite the file. We leave the context manager so
         # that the file is closed before overwriting it.
         self.project.data = {'a': {'b': 45}}
@@ -2110,5 +2119,46 @@ def test_input_args(self):
                 tmp_project.detect_schema()
 
 
+class BaseProjectStoreTest(test_h5store.BaseH5StoreTest):
+
+    project_class = signac.Project
+
+    def setUp(self):
+        self._tmp_dir = TemporaryDirectory(prefix='signac_')
+        self.addCleanup(self._tmp_dir.cleanup)
+        self._tmp_pr = os.path.join(self._tmp_dir.name, 'pr')
+        self._tmp_wd = os.path.join(self._tmp_dir.name, 'wd')
+        os.mkdir(self._tmp_pr)
+        self.config = signac.common.config.load_config()
+        self.project = self.project_class.init_project(
+            name='testing_test_project',
+            root=self._tmp_pr,
+            workspace=self._tmp_wd)
+
+        warnings.filterwarnings('ignore', category=DeprecationWarning, module='signac')
+
+    def get_h5store(self):
+        return self.project.data
+
+    def get_other_h5store(self):
+        return self.project.stores['other']
+
+
+class ProjectStoreTest(BaseProjectStoreTest, test_h5store.H5StoreTest):
+    pass
+
+
+class ProjectStoreNestedTest(BaseProjectStoreTest, test_h5store.H5StoreNestedDataTest):
+    pass
+
+
+class ProjectStoreNestedClosedTest(BaseProjectStoreTest, test_h5store.H5StoreNestedDataClosedTest):
+    pass
+
+
+class ProjectStorePandasTest(BaseProjectStoreTest, test_h5store.H5StorePandasDataTest):
+    pass
+
+
 if __name__ == '__main__':
     unittest.main()