Changes for PR review

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 
 python:
-  - "3.4"
+  - "3.7"
   - "3.6"
 
 env: PYTHONPATH=$PYTHONPATH:$TRAVIS_BUILD_DIR/tests

idpflex/properties.py

@@ -34,7 +34,7 @@ def __init__(self, properties=None):
             self._properties.update({p.name: p for p in properties})
 
     def __iter__(self):
-        return iter(self._properties.values())
+        return iter(self._properties.keys())
 
     def __getitem__(self, name):
         r"""
@@ -116,9 +116,11 @@ def feature_vector(self, names=None):
         Feature vector for the specified sequence of names.
 
         The feature vector is a concatenation of the feature vectors for
-        each of the properties.
+        each of the properties and the concatenation follows the order of
+        names.
 
-        If names is None, return all features in the property dict.
+        If names is None, return all features in the property dict in the
+        order of insertion.
 
         Parameters
         ----------
@@ -131,14 +133,33 @@ def feature_vector(self, names=None):
         """
         if names is None:
             return np.concatenate([prop.feature_vector
-                                   for prop in self])
+                                   for prop in self.values()])
         return np.concatenate([self._properties[n].feature_vector
                                for n in names])
 
     def feature_weights(self, names=None):
+        r"""
+        Feature vector weights for the specified sequence of names.
+
+        The feature vector weights is a concatenation of the feature vectors
+        weights for each of the properties and the concatenation follows the
+        order of names.
+
+        If names is None, return all features in the property dict in the
+        order of insertion.
+
+        Parameters
+        ----------
+        names: list
+            List of property names
+
+        Returns
+        -------
+        numpy.ndarray
+        """
         if names is None:
             return np.concatenate([prop.feature_weights
-                                   for prop in self])
+                                   for prop in self.values()])
         return np.concatenate([self._properties[n].feature_weights
                                for n in names])
 

tests/test_properties.py

@@ -2,7 +2,6 @@
 import numpy as np
 import pytest
 import tempfile
-import os
 import shutil
 
 from idpflex import properties as ps
@@ -286,10 +285,9 @@ def test_to_and_from_ascii(self, sans_benchmark):
         sans_prop_ref = ps.SansProperty()
         sans_prop_ref.from_cryson_int(sans_benchmark['cryson_int'])
         sans_prop = ps.SansProperty()
-        f = tempfile.NamedTemporaryFile(delete=False)
-        sans_prop_ref.to_ascii(f.name)
-        sans_prop.from_ascii(f.name)
-        os.remove(f.name)
+        with tempfile.NamedTemporaryFile() as f:
+            sans_prop_ref.to_ascii(f.name)
+            sans_prop.from_ascii(f.name)
         np.testing.assert_array_almost_equal(
             sans_prop.qvalues, sans_prop_ref.qvalues)
 
@@ -328,10 +326,9 @@ def test_to_and_from_ascii(self, saxs_benchmark):
         saxs_prop_ref = ps.SaxsProperty()
         saxs_prop_ref.from_crysol_int(saxs_benchmark['crysol_int'])
         saxs_prop = ps.SaxsProperty()
-        f = tempfile.NamedTemporaryFile(delete=False)
-        saxs_prop_ref.to_ascii(f.name)
-        saxs_prop.from_ascii(f.name)
-        os.remove(f.name)
+        with tempfile.NamedTemporaryFile() as f:
+            saxs_prop_ref.to_ascii(f.name)
+            saxs_prop.from_ascii(f.name)
         np.testing.assert_array_almost_equal(
             saxs_prop.qvalues, saxs_prop_ref.qvalues)