microdf-python 1.1.1__tar.gz → 1.1.2__tar.gz

{microdf_python-1.1.1/microdf_python.egg-info → microdf_python-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microdf-python
-Version: 1.1.1
+Version: 1.1.2
 Summary: Weighted pandas DataFrames and Series for survey microdata
 Author-email: Max Ghenis <max@policyengine.org>
 License: MIT

{microdf_python-1.1.1 → microdf_python-1.1.2}/microdf/microdataframe.py

@@ -44,6 +44,10 @@ class _MicroLocIndexer:
         self._parent_loc[key] = value
         self._mdf._link_all_weights()
 
+    def __getattr__(self, name):
+        """Delegate unknown attributes to the parent loc indexer."""
+        return getattr(self._parent_loc, name)
+
 
 class _MicroILocIndexer:
     """Custom iloc indexer that returns MicroDataFrame with proper weights."""
@@ -85,6 +89,10 @@ class _MicroILocIndexer:
         self._parent_iloc[key] = value
         self._mdf._link_all_weights()
 
+    def __getattr__(self, name):
+        """Delegate unknown attributes to the parent iloc indexer."""
+        return getattr(self._parent_iloc, name)
+
 
 class MicroDataFrame(pd.DataFrame):
     def __init__(self, *args, weights=None, **kwargs):

{microdf_python-1.1.1 → microdf_python-1.1.2}/microdf/microseries.py

@@ -101,13 +101,32 @@ class MicroSeries(pd.Series):
         return self.weights.sum()
 
     @scalar_function
-    def mean(self) -> float:
+    def mean(self, skipna: bool = True) -> float:
         """Calculates the weighted mean of the MicroSeries.
 
+        :param skipna: Exclude NA/null values. If True (default), NaN values
+            are excluded. If False, returns NaN if any value is NaN.
+        :type skipna: bool
         :returns: The weighted mean.
         :rtype: float
         """
-        return np.average(self.values, weights=self.weights)
+        values = self.values
+        weights = self.weights
+
+        if skipna:
+            # Create mask for non-NaN values
+            mask = ~pd.isna(values)
+            if not mask.any():
+                # All values are NaN
+                return np.nan
+            values = values[mask]
+            weights = weights[mask]
+
+        # If skipna=False and there are any NaN values, return NaN
+        if not skipna and pd.isna(values).any():
+            return np.nan
+
+        return np.average(values, weights=weights)
 
     def quantile(self, q: np.array) -> pd.Series:
         """Calculates weighted quantiles of the MicroSeries.

{microdf_python-1.1.1 → microdf_python-1.1.2}/microdf/tests/test_microseries_dataframe.py

@@ -94,6 +94,36 @@ def test_mean() -> None:
         pass
 
 
+def test_mean_skipna() -> None:
+    # Test skipna=True (default) - should skip NaN values
+    arr = np.array([3.0, np.nan, 2.0])
+    w = np.array([4.0, 1.0, 1.0])
+    series = mdf.MicroSeries(arr, weights=w)
+
+    # skipna=True should exclude NaN and its weight
+    expected = np.average([3.0, 2.0], weights=[4.0, 1.0])
+    assert series.mean(skipna=True) == expected
+    assert series.mean() == expected  # Default should be skipna=True
+
+    # Test skipna=False - should return NaN if any value is NaN
+    assert np.isnan(series.mean(skipna=False))
+
+    # Test with all NaN values
+    arr_all_nan = np.array([np.nan, np.nan, np.nan])
+    w_all_nan = np.array([1.0, 2.0, 3.0])
+    series_all_nan = mdf.MicroSeries(arr_all_nan, weights=w_all_nan)
+    assert np.isnan(series_all_nan.mean(skipna=True))
+    assert np.isnan(series_all_nan.mean(skipna=False))
+
+    # Test with no NaN values - skipna should not affect result
+    arr_no_nan = np.array([3.0, 5.0, 2.0])
+    w_no_nan = np.array([4.0, 1.0, 1.0])
+    series_no_nan = mdf.MicroSeries(arr_no_nan, weights=w_no_nan)
+    expected_no_nan = np.average(arr_no_nan, weights=w_no_nan)
+    assert series_no_nan.mean(skipna=True) == expected_no_nan
+    assert series_no_nan.mean(skipna=False) == expected_no_nan
+
+
 def test_poverty_count() -> None:
     arr = np.array([10000, 20000, 50000])
     w = np.array([1123, 1144, 2211])

{microdf_python-1.1.1 → microdf_python-1.1.2/microdf_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microdf-python
-Version: 1.1.1
+Version: 1.1.2
 Summary: Weighted pandas DataFrames and Series for survey microdata
 Author-email: Max Ghenis <max@policyengine.org>
 License: MIT

{microdf_python-1.1.1 → microdf_python-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "microdf-python"
-version = "1.1.1"
+version = "1.1.2"
 description = "Weighted pandas DataFrames and Series for survey microdata"
 readme = "README.md"
 authors = [