update CI

Signed-off-by: xadupre <[email protected]>
onnx · Oct 3, 2024 · e27ed95 · e27ed95
1 parent 3ae696a
commit e27ed95
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on: [push, pull_request]
 jobs:
   run:
-    name: ${{ matrix.os }} py==${{ matrix.python_version }} - sklearn${{ matrix.sklearn_version }} - ${{ matrix.onnxrt_version }}
+    name: ${{ matrix.os }} py==${{ matrix.python_version }} - sklearn${{ matrix.sklearn_version }} - ${{ matrix.onnxrt_version }} - ${{ matrix.onnx_version }} - lgbm${{ matrix.lgbm_version }} - xgb${{ matrix.xgboost_version }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -13,7 +13,16 @@ jobs:
             documentation: 0
             numpy_version: '>=1.21.1'
             scipy_version: '>=1.7.0'
-            onnx_version: 'onnx==1.16.0'
+            onnx_version: 'onnx==1.17.0'
+            onnxrt_version: 'onnxruntime==1.19.2'
+            sklearn_version: '==1.5.2'
+            lgbm_version: ">=4"
+            xgboost_version: ">=2"
+          - python_version: '3.12'
+            documentation: 0
+            numpy_version: '>=1.21.1'
+            scipy_version: '>=1.7.0'
+            onnx_version: 'onnx==1.16.2'
             onnxrt_version: 'onnxruntime==1.18.0'
             sklearn_version: '==1.4.2'
             lgbm_version: ">=4"

diff --git a/onnxmltools/convert/coreml/shape_calculators/OneHotEncoder.py b/onnxmltools/convert/coreml/shape_calculators/OneHotEncoder.py
@@ -26,7 +26,10 @@ def calculate_one_hot_encoder_output_shapes(operator):
         operator.outputs[0].type = FloatTensorType(
             [N, len(int_categories)], doc_string=operator.outputs[0].type.doc_string
         )
-    elif len(str_categories) > 0 and type(operator.inputs[0].type) == StringTensorType:
+    elif (
+        len(str_categories) > 0
+        and type(operator.inputs[0].type) == StringTensorType  # noqa: E721
+    ):
         operator.outputs[0].type = FloatTensorType(
             [N, len(str_categories)], doc_string=operator.outputs[0].type.doc_string
         )

diff --git a/onnxmltools/convert/main.py b/onnxmltools/convert/main.py
@@ -433,12 +433,12 @@ def convert_tensorflow(
     custom_op_conversions=None,
     **kwargs
 ):
-    import pkgutil
-
-    if not pkgutil.find_loader("tf2onnx"):
-        raise RuntimeError(
+    try:
+        import tf2onnx  # noqa: F401
+    except ImportError as e:
+        raise ImportError(
             "tf2onnx is not installed, please install it before calling this function."
-        )
+        ) from e
 
     return _convert_tf_wrapper(
         frozen_graph_def,