Skip to content

Commit

Permalink
Merge pull request #276 from KhiopsML/275-prepare-release-10230
Browse files Browse the repository at this point in the history
Update CHANGELOG
  • Loading branch information
popescu-v authored Nov 13, 2024
2 parents dd82f80 + 074ef13 commit 2ebfb69
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
type: boolean
default: false
image-tag:
default: 10.2.3-b.5.0
default: 10.2.3.0
description: Development Docker Image Tag
pull_request:
paths:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.2.3-b.5.0' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.2.3.0' }}
# Use the 'runner' user (1001) from github so checkout actions work properly
# https://github.com/actions/runner/issues/2033#issuecomment-1598547465
options: --user 1001
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ env:
DEFAULT_SAMPLES_VERSION: 10.2.0
# Note: The default Khiops version must never be an alpha release as they are
# ephemeral. To test alpha versions run the workflow manually.
DEFAULT_KHIOPS_CORE_VERSION: 10.2.3b.5
DEFAULT_KHIOPS_CORE_VERSION: 10.2.3
on:
workflow_dispatch:
inputs:
khiops-core-version:
default: 10.2.3b.5
default: 10.2.3
description: khiops-core version for testing
khiops-samples-version:
default: 10.2.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-docker.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Dev Docker
env:
DEFAULT_KHIOPS_REVISION: 10.2.3-b.5
DEFAULT_KHIOPS_REVISION: 10.2.3
DEFAULT_IMAGE_INCREMENT: 0
DEFAULT_SERVER_REVISION: main
DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12
Expand All @@ -12,7 +12,7 @@ on:
inputs:
khiops-revision:
type: string
default: 10.2.3-b.5
default: 10.2.3
description: Khiops Revision
image-increment:
type: number
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
default: main
description: khiops-samples repo revision
image-tag:
default: 10.2.3-b.5.0
default: 10.2.3.0
description: Development Docker Image Tag
pull_request:
push:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.2.3-b.5.0' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.2.3.0' }}
steps:
- name: Set parameters as env
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
name: Unit Tests
env:
DEFAULT_SAMPLES_REVISION: main
DEFAULT_KHIOPS_DESKTOP_REVISION: 10.2.3-b.4
DEFAULT_KHIOPS_DESKTOP_REVISION: 10.2.3
on:
workflow_dispatch:
inputs:
samples-revision:
default: main
description: Git tag, branch or commit for the khiops-samples repository
image-tag:
default: 10.2.3-b.5.0
default: 10.2.3.0
description: Development Docker Image Tag
khiops-desktop-revision:
default: 10.2.3-b.5
default: 10.2.3
description: Khiops Windows Desktop Application Version
run-long-tests:
type: boolean
Expand All @@ -36,7 +36,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.2.3-b.5.0' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-ubuntu22.04:${{ inputs.image-tag || '10.2.3.0' }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
# because the `env` context is only accessible at the step level;
# hence, it is hard-coded
image: |-
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.2.3-b.5.0' }}
ghcr.io/khiopsml/khiops-python/khiopspydev-${{ matrix.container }}:${{ inputs.image-tag || '10.2.3.0' }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@
- Example: 10.2.1.4 is the 5th version that supports khiops 10.2.1.
- Internals: Changes in *Internals* sections are unlikely to be of interest for data scientists.

## Unreleased
## 10.2.3.0 - 2024-11-13

### Added

- (General) `train_test_split_dataset` helper function to ease the splitting in train/test for
- (`sklearn`) `train_test_split_dataset` helper function to ease the splitting in train/test for
multi-table datasets.
- (`sklearn`) Complete support for `core` API functions parameters in the `sklearn` estimators.

### Changed

- (General) The Conda package only depends on the `conda-forge` and `khiops` channels.
- *Internals*:
- Improve and simplify the integration with the `khiops-core` package via its `khiops_env`
script.

## 10.2.2.4 - 2024-08-05

Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ in two ways:
## Installation

```bash
# Windows
conda install khiops -c khiops

# Linux/macOS
conda install khiops -c khiops -c conda-forge
conda install -c conda-forge -c khiops khiops
```
Other install method are documented at the [Khiops website][khiops-install].

Expand Down
7 changes: 1 addition & 6 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ Installation
Khiops is better installed with `conda package manager <https://docs.conda.io/en/latest/>`_

.. code-block:: shell
# Windows
conda install khiops -c khiops
# Linux/macOS
conda install khiops -c conda-forge -c khiops
conda install -c conda-forge -c khiops khiops
More details and other install methods are documented at the `Khiops website
<https://www.khiops.org/setup>`_.
Expand Down

0 comments on commit 2ebfb69

Please sign in to comment.