Merge pull request #299 from anth-volk/fix/original-microdf

Revert to using standard microdf
PolicyEngine · Oct 29, 2024 · f225d02 · f225d02
2 parents 0efe621 + 7d7c53f
commit f225d02
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 688 deletions.
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
@@ -0,0 +1,4 @@
+- bump: patch
+  changes:
+    changed:
+    - Replace custom implementation of microdf with deployed version
diff --git a/policyengine_core/charts/bar.py b/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
 

diff --git a/policyengine_core/simulations/microsimulation.py b/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

diff --git a/policyengine_core/weighting/__init__.py b/policyengine_core/weighting/__init__.py