Merge branch 'PolicyEngine:master' into parameternode-274

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.11.1] - 2024-10-29 20:04:02
+
+### Changed
+
+- Replace custom implementation of microdf with deployed version
+
 ## [3.11.0] - 2024-10-24 11:04:12
 
 ### Fixed
@@ -888,6 +894,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[3.11.1]: https://github.com/PolicyEngine/policyengine-core/compare/3.11.0...3.11.1
 [3.11.0]: https://github.com/PolicyEngine/policyengine-core/compare/3.10.0...3.11.0
 [3.10.0]: https://github.com/PolicyEngine/policyengine-core/compare/3.9.0...3.10.0
 [3.9.0]: https://github.com/PolicyEngine/policyengine-core/compare/3.8.2...3.9.0

changelog.yaml

@@ -716,3 +716,8 @@
     fixed:
     - Bug causing subsample to not work in some situations.
   date: 2024-10-24 11:04:12
+- bump: patch
+  changes:
+    changed:
+    - Replace custom implementation of microdf with deployed version
+  date: 2024-10-29 20:04:02

policyengine_core/charts/bar.py

@@ -1,7 +1,7 @@
 import pandas as pd
 from .formatting import *
 import plotly.express as px
-from policyengine_core.weighting import MicroSeries
+from microdf import MicroSeries
 from typing import Callable
 import numpy as np
 

policyengine_core/simulations/microsimulation.py

@@ -1,6 +1,6 @@
 from typing import Dict, Type
 
-from policyengine_core.weighting import MicroDataFrame, MicroSeries
+from microdf import MicroDataFrame, MicroSeries
 import numpy as np
 from policyengine_core.data.dataset import Dataset
 from policyengine_core.periods import Period