resolve merge conflict

docs/_quarto.yml

@@ -79,6 +79,7 @@ quartodoc:
         - report.dtable
         - report.coefplot
         - report.iplot
+        - did.visualize.panelview
     - title: Misc / Utilities
       desc: |
         PyFixest internals and utilities

docs/_sidebar.yml

@@ -24,6 +24,7 @@ website:
       - reference/report.dtable.qmd
       - reference/report.coefplot.qmd
       - reference/report.iplot.qmd
+      - reference/did.visualize.panelview.qmd
       section: Summarize and Visualize
     - contents:
       - reference/estimation.demean.qmd

pyfixest/__init__.py

@@ -6,6 +6,7 @@
     report,
     utils,
 )
+from pyfixest.did import did2s, event_study, lpdid, panelview
 
 # Import frequently used functions and classes
 from pyfixest.estimation import (
@@ -41,6 +42,10 @@
     "estimation",
     "report",
     "utils",
+    "event_study",
+    "lpdid",
+    "did2s",
+    "panelview",
 ]
 
 from importlib.metadata import PackageNotFoundError, version

pyfixest/did/__init__.py

@@ -0,0 +1,15 @@
+from pyfixest.did.estimation import (
+    did2s,
+    event_study,
+    lpdid,
+)
+from pyfixest.did.visualize import (
+    panelview,
+)
+
+__all__ = [
+    "did2s",
+    "lpdid",
+    "panelview",
+    "event_study",
+]

pyfixest/did/estimation.py

@@ -56,12 +56,12 @@ def event_study(
     --------
     ```{python}
     import pandas as pd
-    from pyfixest.did.estimation import event_study
+    import pyfixest as pf
 
     url = "https://raw.githubusercontent.com/py-econometrics/pyfixest/master/pyfixest/did/data/df_het.csv"
     df_het = pd.read_csv(url)
 
-    fit_twfe = event_study(
+    fit_twfe = pf.event_study(
         df_het,
         yname="dep_var",
         idname="unit",
@@ -171,7 +171,7 @@ def did2s(
     ```{python}
     import pandas as pd
     import numpy as np
-    from pyfixest.did.estimation import did2s
+    import pyfixest as pf
 
     url = "https://raw.githubusercontent.com/py-econometrics/pyfixest/master/pyfixest/did/data/df_het.csv"
     df_het = pd.read_csv(url)
@@ -182,7 +182,7 @@ def did2s(
 
     ```{python}
     # estimate the model
-    fit = did2s(
+    fit = pf.did2s(
         df_het,
         yname="dep_var",
         first_stage="~ 0 | unit + year",
@@ -203,7 +203,7 @@ def did2s(
     To estimate a pooled effect, we need to slightly update the second stage formula:
 
     ```{python}
-    fit = did2s(
+    fit = pf.did2s(
         df_het,
         yname="dep_var",
         first_stage="~ 0 | unit + year",
@@ -319,12 +319,12 @@ def lpdid(
     --------
     ```{python}
     import pandas as pd
-    from pyfixest.did.estimation import lpdid
+    import pyfixest as pf
 
     url = "https://raw.githubusercontent.com/py-econometrics/pyfixest/master/pyfixest/did/data/df_het.csv"
     df_het = pd.read_csv(url)
 
-    fit = lpdid(
+    fit = pf.lpdid(
         df_het,
         yname="dep_var",
         idname="unit",
@@ -343,7 +343,7 @@ def lpdid(
     To get the ATT, set `att=True`:
 
     ```{python}
-    fit = lpdid(
+    fit = pf.lpdid(
         df_het,
         yname="dep_var",
         idname="unit",