Test against Python 3.11 and 3.12

.github/workflows/run-tests.yml

@@ -75,7 +75,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
     defaults:
       run:
         shell: bash -l {0}
@@ -121,18 +121,18 @@ jobs:
         shell: bash -l {0}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.10
     - name: Install dependencies
       uses: conda-incubator/setup-miniconda@v2
       with:
         miniforge-variant: Mambaforge
         miniforge-version: latest
         use-mamba: true
         environment-file: envs/testing.yml
-        python-version: 3.9
+        python-version: 3.10
         activate-environment: testing-env
         auto-activate-base: false
         auto-update-conda: false

envs/testing.yml

@@ -23,4 +23,5 @@ dependencies:
   - nbmake
   - openmatrix
   - zarr
-  - larch>=5.7.1
+  - pip:
+    - larch6

sharrow/nested_logit.py

@@ -157,7 +157,10 @@ def construct_nesting_tree(alternatives, nesting_settings):
     -------
     NestingTree
     """
-    from larch.model.tree import NestingTree
+    try:
+        from larch.model.tree import NestingTree
+    except ImportError:
+        raise ImportError("larch is required to construct nesting trees") from None
 
     if not isinstance(alternatives, Mapping):
         alt_names = list(alternatives)

sharrow/omx.py

@@ -15,7 +15,10 @@ def split_omx(source_file, dest_directory, global_lookups=False, n_chunks=None):
     global_lookups : bool
 
     """
-    from larch import OMX
+    try:
+        from larch import OMX
+    except ImportError:
+        raise ImportError("larch is required to split OMX files") from None
 
     source = OMX(source_file, mode="r")
     os.makedirs(dest_directory, exist_ok=True)

sharrow/translate.py

@@ -3,7 +3,6 @@
 import numpy as np
 import pandas as pd
 import xarray as xr
-from larch import OMX
 
 from sharrow.dataset import Dataset
 
@@ -21,6 +20,11 @@ def omx_to_zarr(
     time_periods=None,
     time_period_sep="__",
 ):
+    try:
+        from larch import OMX
+    except ImportError:
+        raise ImportError("larch is required to read OMX files") from None
+
     bucket = {}
 
     r1 = r2 = None