Fix pandas merge operation due to recent pandas update

* pandas [issue \#35609](pandas-dev/pandas#35609)

Author: appleparan

mise/data.py

@@ -1565,12 +1565,14 @@ def key_h(idx): return str(idx.hour).zfill(2)
         X_h['key_h'] = X_h.index.map(key_h)
 
         ## compute hourly populated seasonality from daily residuals
-        X_h_spop = df_sea_annual.merge(X_h, how='left',
-                                         on='key_md', left_index=True, validate="1:m").dropna()
+        X_h_spop = df_sea_annual.merge(X_h, how='right',
+                                         on='key_md', validate="1:m").dropna()
         X_h_spop = X_h_spop.rename(columns={'sea': 'sea_annual'})
-        X_h_spop = df_sea_weekly.merge(X_h_spop, how='left',
-                                         on='key_w', left_index=True, validate="1:m").dropna()
+        X_h_spop.set_index(X_h.index, inplace=True)
+        X_h_spop = df_sea_weekly.merge(X_h_spop, how='right',
+                                         on='key_w', validate="1:m").dropna()
         X_h_spop = X_h_spop.rename(columns={'sea': 'sea_weekly'})
+        X_h_spop.set_index(X_h.index, inplace=True)
 
         ## new hourly residual column from daily residuals
         X_h_spop['resid_d'] = X_h_spop['raw'] - X_h_spop['sea_annual'] - X_h_spop['sea_weekly']
@@ -1588,9 +1590,10 @@ def key_h(idx): return str(idx.hour).zfill(2)
         df_sea_hourly['key_h'] = df_sea_hourly.index
 
         ## merge hourly seasonality to orignal hourly DataFram
-        X_h_hourly = df_sea_hourly.merge(X_h, how='left',
-                                         on='key_h', left_index=True, validate="1:m").dropna()
+        X_h_hourly = df_sea_hourly.merge(X_h, how='right',
+                                         on='key_h', validate="1:m").dropna()
         X_h_hourly = X_h_hourly.rename(columns={'sea': 'sea_hourly'})
+        X_h_hourly.set_index(X_h.index, inplace=True)
         ## Subtract annual and weekly seasonality
         X_h_spop['sea_hourly']= X_h_hourly['sea_hourly']
         X_h_spop['resid'] = X_h_spop['resid_d'] - X_h_hourly['sea_hourly']

requirements.txt

@@ -59,7 +59,7 @@ openpyxl==3.0.7
 opt-einsum==3.3.0
 optuna==2.3.0
 packaging==20.4
-pandas==1.1.4
+pandas==1.2.3
 partd==1.1.0
 patsy==0.5.1
 pbr==5.5.1