Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

239 Add support for python 3.13 #270

Merged
merged 2 commits into from
Nov 19, 2024
Merged

239 Add support for python 3.13 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1df468
Add support for python 3.13 (for tests)
Oct 28, 2024
1f9d475
Update the test matrix for the Conda package
Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ 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}'}
- {os: ubuntu-22.04, json-image: '{"image": "rockylinux:8"}'}
- {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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions packaging/docker/khiopspydev/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Dockerfile.rocky should also be updated with this IMHO.

/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; \
Comment on lines +45 to +46
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have added separate conda install -y -n ... setuptools lines, so that the supplemental (new) installation of setuptools is launched in a separate line and instruction.

/root/miniforge3/bin/conda install -y -n py${version}_conda -c khiops-dev khiops-core=$(echo ${KHIOPS_REVISION} | tr -d "-") ; \
done'

Expand Down
Loading