fix merge

Author: lkstrp

linopy/common.py

@@ -42,9 +42,13 @@ def set_int_index(series: pd.Series) -> pd.Series:
     """
     Convert string index to int index.
     """
+
     if not series.empty and not pd.api.types.is_integer_dtype(series.index):
         cutoff = count_initial_letters(str(series.index[0]))
-        series.index = series.index.str[cutoff:].astype(int)
+        try:
+            series.index = series.index.str[cutoff:].astype(int)
+        except ValueError:
+            series.index = series.index.str.replace(".*#", "", regex=True).astype(int)
     return series
 
 

linopy/solvers.py

@@ -15,7 +15,7 @@
 import sys
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable, Sequence
+from typing import TYPE_CHECKING, Callable
 
 import numpy as np
 import pandas as pd
@@ -133,17 +133,6 @@
 )
 
 
-def set_int_index(series: Series) -> Series:
-    """
-    Convert string index to int index.
-    """
-    try:
-        series.index = series.index.str[1:].astype(int)
-    except ValueError as _:
-        series.index = series.index.str.replace(".*#", "", regex=True).astype(int)
-    return series
-
-
 # using enum to match solver subclasses with names
 class SolverName(enum.Enum):
     CBC = "cbc"