Skip to content

Commit 8e5a69c

Browse files
authored
Merge pull request #270 from KhiopsML/support_python_3.13
239 Add support for python 3.13
2 parents b25fa95 + 1f9d475 commit 8e5a69c

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/conda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
66+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
6767
env:
6868
- {os: ubuntu-20.04, json-image: '{"image": null}'}
6969
- {os: ubuntu-22.04, json-image: '{"image": null}'}
7070
- {os: ubuntu-22.04, json-image: '{"image": "rockylinux:8"}'}
7171
- {os: ubuntu-22.04, json-image: '{"image": "rockylinux:9"}'}
7272
- {os: windows-2019, json-image: '{"image": null}'}
7373
- {os: windows-2022, json-image: '{"image": null}'}
74-
- {os: macos-12, json-image: '{"image": null}'}
7574
- {os: macos-13, json-image: '{"image": null}'}
7675
- {os: macos-14, json-image: '{"image": null}'}
76+
- {os: macos-15, json-image: '{"image": null}'}
7777
runs-on: ${{ matrix.env.os }}
7878
container: ${{ fromJSON(matrix.env.json-image) }}
7979
steps:

.github/workflows/dev-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
DEFAULT_KHIOPS_REVISION: 10.2.3
55
DEFAULT_IMAGE_INCREMENT: 0
66
DEFAULT_SERVER_REVISION: main
7-
DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12
7+
DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12 3.13
88
on:
99
pull_request:
1010
paths: [packaging/docker/khiopspydev/Dockerfile.*, .github/workflows/dev-docker.yml]
@@ -28,7 +28,7 @@ on:
2828
description: Set as 'latest'
2929
python-versions:
3030
type: string
31-
default: 3.8 3.9 3.10 3.11 3.12
31+
default: 3.8 3.9 3.10 3.11 3.12 3.13
3232
description: Python versions to support
3333
server-revision:
3434
type: string

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
33+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
3434
container:
3535
# 'latest' default image tag cannot be set as an environment variable,
3636
# because the `env` context is only accessible at the step level;

packaging/docker/khiopspydev/Dockerfile.ubuntu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ RUN true \
4141
ARG PYTHON_VERSIONS
4242
RUN /bin/bash -c 'for version in ${PYTHON_VERSIONS}; \
4343
do \
44-
/root/miniforge3/bin/conda create -y -n py${version} python=${version}; \
45-
/root/miniforge3/bin/conda create -y -n py${version}_conda python=${version}; \
44+
# setuptools is a strong requirement for khiops-python. Force its installation because it is omitted since python 3.13
45+
/root/miniforge3/bin/conda create -y -n py${version} python=${version} setuptools; \
46+
/root/miniforge3/bin/conda create -y -n py${version}_conda python=${version} setuptools; \
4647
/root/miniforge3/bin/conda install -y -n py${version}_conda -c khiops-dev khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
4748
done'
4849

0 commit comments

Comments
 (0)