Merge pull request #77 from oscarbranson/dev

0.3.29
oscarbranson · Sep 13, 2023 · 9a6b060 · 9a6b060
2 parents 62471f9 + 4a3589c
commit 9a6b060
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,20 @@
 # Changelog
 All significant changes to the software will be documented here.
 
-## [0.3.29-dev] - LIVE
+## [0.3.30-dev] - LIVE
 
 ### TODO
 - implement different analyte lists for different stages (raw, ratios, mass_fractions), OR improve analyte_checker functionality. This has to propagate throught to filter assignment.
 
+## [0.3.29]
+
+More pandas 2.0 'indexing with set' compatibility updates...
+
+### Changed
+ - modify dataframe indexing in filt_obj to work with pandas>=2.0.0
+
+
+
 ## [0.3.28]
 
 ### Changed
@@ -14,7 +23,7 @@ All significant changes to the software will be documented here.
  - minor revisions to GitHub Actions scripts
 
 
-## [0.3.28] missed... oops!
+## [0.3.27] missed... oops!
 
 ## [0.3.26]
 

diff --git a/latools/__init__.py b/latools/__init__.py
@@ -17,7 +17,7 @@
 from .helpers import chemistry
 from . import preprocessing
 
-__version__ = '0.3.28'
+__version__ = '0.3.29'
 
 def cite(output='text'):
     """

diff --git a/latools/filtering/filt_obj.py b/latools/filtering/filt_obj.py
@@ -117,7 +117,7 @@ def check_analytes(self, analytes=None, single=False, allow_multiples=False):
                 return analytes[0]
             return valid.pop()
         else:
-            return valid
+            return list(valid)
 
     def add(self, name, filt, info='', params=(), setn=None):
         """
@@ -288,7 +288,7 @@ def make_analyte(self, analyte):
         analyte = self.check_analytes(analyte)
 
         key = []
-        for n, f in self.filter_table[list(analyte)].index[self.filter_table[list(analyte)].any(axis=1)]:
+        for n, f in self.filter_table[analyte].index[self.filter_table[analyte].any(axis=1)]:
             key.append(f'{n}:{f}')
 
         return self.make_fromkey('&'.join(key))

diff --git a/latools/latools.py b/latools/latools.py
@@ -23,6 +23,7 @@
 
 import uncertainties as unc
 import uncertainties.unumpy as un
+from uncertainties.unumpy import nominal_values, std_devs
 
 from sklearn.preprocessing import minmax_scale, scale
 from sklearn.cluster import KMeans
@@ -42,7 +43,7 @@
 from .helpers import logging
 from .helpers.logging import _log
 from .helpers.config import read_configuration, config_locator
-from .helpers.stat_fns import *
+from .helpers.stat_fns import gauss_weighted_stats, R2calc, stderr, un_interp1d, H15_mean, H15_std, H15_se
 from .helpers import utils
 from .helpers import srm as srms
 from .helpers.progressbars import progressbar