diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 80200978..0b2ab85b 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] env: - {os: ubuntu-20.04, json-image: '{"image": null}'} - {os: ubuntu-22.04, json-image: '{"image": null}'} @@ -71,9 +71,9 @@ jobs: - {os: ubuntu-22.04, json-image: '{"image": "rockylinux:9"}'} - {os: windows-2019, json-image: '{"image": null}'} - {os: windows-2022, json-image: '{"image": null}'} - - {os: macos-12, json-image: '{"image": null}'} - {os: macos-13, json-image: '{"image": null}'} - {os: macos-14, json-image: '{"image": null}'} + - {os: macos-15, json-image: '{"image": null}'} runs-on: ${{ matrix.env.os }} container: ${{ fromJSON(matrix.env.json-image) }} steps: diff --git a/.github/workflows/dev-docker.yml b/.github/workflows/dev-docker.yml index e9bc8e2f..2bf7f0b4 100644 --- a/.github/workflows/dev-docker.yml +++ b/.github/workflows/dev-docker.yml @@ -4,7 +4,7 @@ env: 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 + DEFAULT_PYTHON_VERSIONS: 3.8 3.9 3.10 3.11 3.12 3.13 on: pull_request: paths: [packaging/docker/khiopspydev/Dockerfile.*, .github/workflows/dev-docker.yml] @@ -28,7 +28,7 @@ on: description: Set as 'latest' python-versions: type: string - default: 3.8 3.9 3.10 3.11 3.12 + default: 3.8 3.9 3.10 3.11 3.12 3.13 description: Python versions to support server-revision: type: string diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6db87707..f010297b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] container: # 'latest' default image tag cannot be set as an environment variable, # because the `env` context is only accessible at the step level; diff --git a/packaging/docker/khiopspydev/Dockerfile.ubuntu b/packaging/docker/khiopspydev/Dockerfile.ubuntu index 4720219f..5a9b8cf3 100644 --- a/packaging/docker/khiopspydev/Dockerfile.ubuntu +++ b/packaging/docker/khiopspydev/Dockerfile.ubuntu @@ -41,8 +41,9 @@ RUN true \ ARG PYTHON_VERSIONS RUN /bin/bash -c 'for version in ${PYTHON_VERSIONS}; \ do \ - /root/miniforge3/bin/conda create -y -n py${version} python=${version}; \ - /root/miniforge3/bin/conda create -y -n py${version}_conda python=${version}; \ + # setuptools is a strong requirement for khiops-python. Force its installation because it is omitted since python 3.13 + /root/miniforge3/bin/conda create -y -n py${version} python=${version} setuptools; \ + /root/miniforge3/bin/conda create -y -n py${version}_conda python=${version} setuptools; \ /root/miniforge3/bin/conda install -y -n py${version}_conda -c khiops-dev khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \ done'