Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci_pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
tests_core:
strategy:
matrix:
os: [ubuntu-22.04, macos-latest]
os: [ubuntu-24.04, macos-latest]
python-version: ["3.11", "3.12"]

name: "Core, Python ${{ matrix.python-version }}, ${{ matrix.os }}"
Expand Down
46 changes: 20 additions & 26 deletions .github/workflows/ci_poetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

tests_core:
name: "Core, Python ${{ matrix.python-version }}"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10

strategy:
Expand All @@ -23,22 +23,19 @@ jobs:
fetch-depth: 1
persist-credentials: false

- name: Install poetry
run: pipx install poetry==1.8.2

- name: Configure poetry
run: poetry config virtualenvs.in-project true

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Cache poetry virtualenv
uses: actions/cache@v4
with:
path: ./.venv
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_core
- name: Install poetry
run: pipx install poetry==1.8.5

- name: Configure poetry
run: poetry config virtualenvs.in-project true

- name: Configure python version for poetry
run: poetry env use python${{ matrix.python-version }}

- name: Install dependencies (without extras)
run: poetry install --with dev --without docs --no-interaction
Expand All @@ -56,7 +53,7 @@ jobs:

tests_tasks:
name: "Tasks, Python ${{ matrix.python-version }}"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 30

strategy:
Expand All @@ -69,22 +66,19 @@ jobs:
fetch-depth: 1
persist-credentials: false

- name: Install poetry
run: pipx install poetry==1.8.2

- name: Configure poetry
run: poetry config virtualenvs.in-project true

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Cache poetry virtualenv
uses: actions/cache@v4
with:
path: ./.venv
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_tasks
- name: Install poetry
run: pipx install poetry==1.8.5

- name: Configure poetry
run: poetry config virtualenvs.in-project true

- name: Configure python version for poetry
run: poetry env use python${{ matrix.python-version }}

- name: Install dependencies (including fractal-tasks extra)
run: poetry install --with dev --without docs --no-interaction -E fractal-tasks
Expand Down Expand Up @@ -112,12 +106,12 @@ jobs:

coverage:
name: Coverage
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [tests_core, tests_tasks]
steps:
- uses: actions/checkout@v4

- run: pipx install poetry==1.8.2
- run: pipx install poetry==1.8.5
- run: poetry config virtualenvs.in-project true
- uses: actions/setup-python@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manifest_external_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
test-manifest-creation:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/poetry_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:

- uses: actions/checkout@v4
Expand All @@ -20,8 +20,8 @@ jobs:
with:
python-version: "3.11"

- name: "Install poetry 1.8.2"
run: curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
- name: "Install poetry 1.8.5"
run: curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5

- name: Build package
run: poetry build
4 changes: 2 additions & 2 deletions .github/workflows/poetry_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ on:

jobs:
poetry_update:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install poetry
run: pipx install poetry==1.8.2
run: pipx install poetry==1.8.5
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
build_and_publish:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: pypi
steps:

Expand All @@ -29,8 +29,8 @@ jobs:
with:
python-version: "3.11"

- name: "Install poetry 1.8.2"
run: curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
- name: "Install poetry 1.8.5"
run: curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5

- name: Build package
run: poetry build
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Unreleased

* Bump versions of `pre-commit` tools (\#975).
* Testing:
* Update poetry to 1.8.5 (\#972).
* Run GHAs on ubuntu-24.04 (\#972).

# 1.5.4
* Tasks:
Expand Down
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Setting up environment

We use [poetry](https://python-poetry.org/docs) to manage both development environments and package building. A simple way to install it is `pipx install poetry==1.8.2`, or you can look at the installation section [here](https://python-poetry.org/docs#installation).
We use [poetry](https://python-poetry.org/docs) to manage both development environments and package building. A simple way to install it is `pipx install poetry==1.8.5`, or you can look at the installation section [here](https://python-poetry.org/docs#installation).

From the repository root folder, running any of
```bash
Expand Down
Loading
Loading