Merge pull request #258 from rbiswas4/Issue/257/use_in1d

Added a version dependent switch for working with `isin` and in1d`
LSSTDESC · Aug 2, 2018 · bbd7666 · bbd7666
2 parents 0685a18 + 9ef2956
commit bbd7666
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/opsimsummary/opsim_out.py b/opsimsummary/opsim_out.py
@@ -546,8 +546,13 @@ def dropDuplicates(df, propIDDict, opsimversion):
 
         orig_propID = df.propID.values
         df['orig_propID'] = orig_propID
-        ddfmask = np.isin(df.propID, ddfID)
-        wfdmask = np.isin(df.propID, wfdID)
+        # if np.__version__ >= 1.13:
+        #    ddfmask = np.isin(df.propID, ddfID)
+        #    wfdmask = np.isin(df.propID, wfdID)
+        # else:
+        ddfmask = np.in1d(df.propID, ddfID)
+        wfdmask = np.in1d(df.propID, wfdID)
+
         df.loc[ddfmask, 'propID'] = ddfPropID
         df.loc[wfdmask, 'propID'] = wfdPropID
 

diff --git a/opsimsummary/version.py b/opsimsummary/version.py
@@ -1 +1 @@
-__VERSION__ = "1.19.1"
+__VERSION__ = "1.19.3"