From 1d921e177877203fe97879905109fb5f8f0a8f69 Mon Sep 17 00:00:00 2001 From: xadupre Date: Thu, 19 Dec 2024 16:11:24 +0100 Subject: [PATCH] update versions in CI Signed-off-by: xadupre --- .github/workflows/linux-ci.yml | 13 ++++++++++--- .github/workflows/windows-macos-ci.yml | 8 +++++++- CHANGELOGS.md | 15 +++++++++++++++ docs/index.rst | 5 ----- skl2onnx/__init__.py | 2 +- skl2onnx/convert.py | 3 --- .../test_utils/reference_implementation_zipmap.py | 2 +- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 6a2657fcd..1b19acdd5 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -7,14 +7,21 @@ jobs: strategy: matrix: os: [ubuntu-latest] - sklearn_version: ['==1.5.2', '==1.4.2', '==1.3.2', '==1.2.2', '==1.1.3'] + sklearn_version: ['==1.6.0', '==1.5.2', '==1.4.2', '==1.3.2', '==1.2.2', '==1.1.3'] include: - - sklearn_version: '==1.5.2' + - sklearn_version: '==1.6.0' documentation: 1 + numpy_version: '>=2.0' + scipy_version: '>=1.7.0' + onnx_version: 'onnx>=1.17.0' + onnxrt_version: 'onnxruntime>=1.20.1' + python_version: '3.11' + - sklearn_version: '==1.5.2' + documentation: 0 numpy_version: '>=1.21.1,<2.0' scipy_version: '>=1.7.0' onnx_version: 'onnx>=1.17.0' - onnxrt_version: 'onnxruntime>=1.19.2' + onnxrt_version: 'onnxruntime==1.19.2' python_version: '3.11' - sklearn_version: '==1.5.2' documentation: 0 diff --git a/.github/workflows/windows-macos-ci.yml b/.github/workflows/windows-macos-ci.yml index 6560b907f..bf56ffd7b 100644 --- a/.github/workflows/windows-macos-ci.yml +++ b/.github/workflows/windows-macos-ci.yml @@ -7,8 +7,14 @@ jobs: strategy: matrix: os: [windows-latest, macos-latest] - sklearn_version: ['==1.5.2', '==1.4.2', '==1.3.2', '==1.2.2', '==1.1.3'] + sklearn_version: ['==1.6.0', '==1.5.2', '==1.4.2', '==1.3.2', '==1.2.2', '==1.1.3'] include: + - sklearn_version: '==1.6.0' + python_version: '3.12' + numpy_version: '>=2.0' + scipy_version: '>=1.7.0' + onnx_version: 'onnx==1.17.0' + onnxrt_version: 'onnxruntime==1.20.1' - sklearn_version: '==1.5.2' python_version: '3.12' numpy_version: '>=1.21.1,<2.0' diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 97de28f5c..5f4efbef2 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,9 @@ # Change Logs +## 1.19.0 + +In progress. + ## 1.18.0 * Converter for OneHotEncoder does not add a concat operator if not needed, @@ -9,6 +13,17 @@ [#1109](https://github.com/onnx/sklearn-onnx/pull/1109) * Add converter for TunedThresholdClassifierCV, [#1107](https://github.com/onnx/sklearn-onnx/pull/1107) +* Update and Fix documentation + [#1113](https://github.com/onnx/sklearn-onnx/pull/1113) +* Support fill_value for SimpleImputer with string data + [#1123](https://github.com/onnx/sklearn-onnx/pull/1123) +* Remove unnecessary options for Regressor + [#1124](https://github.com/onnx/sklearn-onnx/pull/1124) +* OrdinalEncoder handle encoded_missing_value and unknown_value + [#1132](https://github.com/onnx/sklearn-onnx/pull/1132) +* Create output_onnx_single_probability.py + [#1139](https://github.com/onnx/sklearn-onnx/pull/1139), + [#1141](https://github.com/onnx/sklearn-onnx/pull/1141) ## 1.17.0 (development) diff --git a/docs/index.rst b/docs/index.rst index 226bd9bb0..7d036bcb3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -126,8 +126,3 @@ Shouheng Yi, Shauheen Zahirazami, Yiwen Zhu, Du Li, Xuan Li, Wenbing Li. **License** It is licensed with `Apache License v2.0 <../LICENSE>`_. - -**Older versions** - -* `1.17.0 `_ -* `1.16.0 `_ diff --git a/skl2onnx/__init__.py b/skl2onnx/__init__.py index a3fadf515..bf70a2525 100644 --- a/skl2onnx/__init__.py +++ b/skl2onnx/__init__.py @@ -4,7 +4,7 @@ Main entry point to the converter from the *scikit-learn* to *onnx*. """ -__version__ = "1.18.0" +__version__ = "1.19.0" __author__ = "Microsoft" __producer__ = "skl2onnx" __producer_version__ = __version__ diff --git a/skl2onnx/convert.py b/skl2onnx/convert.py index 6ef138cce..d6e357b3b 100644 --- a/skl2onnx/convert.py +++ b/skl2onnx/convert.py @@ -290,9 +290,6 @@ def to_onnx( :class:`OnnxOperatorMixin`, it calls method *to_onnx* in that case otherwise it calls :func:`convert_sklearn`. - .. versionchanged:: 1.10.0 - Parameter *naming* was added. - .. versionchanged:: 1.18.0 The main opset is now equal to target_opset and not a value equal or less than the given value. diff --git a/tests/test_utils/reference_implementation_zipmap.py b/tests/test_utils/reference_implementation_zipmap.py index 80724b316..efc2da3db 100644 --- a/tests/test_utils/reference_implementation_zipmap.py +++ b/tests/test_utils/reference_implementation_zipmap.py @@ -20,7 +20,7 @@ class ZipMapDictionary(dict): :param mat: matrix if values is a row index, one or two dimensions """ - __slots__ = ["_mat", "_rev_keys", "_values", ] + __slots__ = ["_mat", "_rev_keys", "_values"] @staticmethod def build_rev_keys(keys):