Skip to content

Commit

Permalink
update versions in CI
Browse files Browse the repository at this point in the history
Signed-off-by: xadupre <[email protected]>
  • Loading branch information
xadupre committed Dec 19, 2024
1 parent 99ba2e4 commit 1d921e1
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 14 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/windows-macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOGS.md
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <versions/v1.17.0/>`_
* `1.16.0 <versions/v1.16.0/>`_
2 changes: 1 addition & 1 deletion skl2onnx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
3 changes: 0 additions & 3 deletions skl2onnx/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils/reference_implementation_zipmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 1d921e1

Please sign in to comment.