Skip to content

Commit 0919caf

Browse files
authored
Merge pull request #972 from fractal-analytics-platform/poetry-update
Update dependencies in `poetry.lock` and improve GHAs
2 parents 5f60684 + 44922b1 commit 0919caf

File tree

9 files changed

+1408
-1351
lines changed

9 files changed

+1408
-1351
lines changed

.github/workflows/ci_pip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
tests_core:
1515
strategy:
1616
matrix:
17-
os: [ubuntu-22.04, macos-latest]
17+
os: [ubuntu-24.04, macos-latest]
1818
python-version: ["3.11", "3.12"]
1919

2020
name: "Core, Python ${{ matrix.python-version }}, ${{ matrix.os }}"

.github/workflows/ci_poetry.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
tests_core:
1212
name: "Core, Python ${{ matrix.python-version }}"
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
timeout-minutes: 10
1515

1616
strategy:
@@ -23,22 +23,19 @@ jobs:
2323
fetch-depth: 1
2424
persist-credentials: false
2525

26-
- name: Install poetry
27-
run: pipx install poetry==1.8.2
28-
29-
- name: Configure poetry
30-
run: poetry config virtualenvs.in-project true
31-
3226
- name: Set up Python ${{ matrix.python-version }}
3327
uses: actions/setup-python@v5
3428
with:
3529
python-version: ${{ matrix.python-version }}
3630

37-
- name: Cache poetry virtualenv
38-
uses: actions/cache@v4
39-
with:
40-
path: ./.venv
41-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_core
31+
- name: Install poetry
32+
run: pipx install poetry==1.8.5
33+
34+
- name: Configure poetry
35+
run: poetry config virtualenvs.in-project true
36+
37+
- name: Configure python version for poetry
38+
run: poetry env use python${{ matrix.python-version }}
4239

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

5754
tests_tasks:
5855
name: "Tasks, Python ${{ matrix.python-version }}"
59-
runs-on: ubuntu-22.04
56+
runs-on: ubuntu-24.04
6057
timeout-minutes: 30
6158

6259
strategy:
@@ -69,22 +66,19 @@ jobs:
6966
fetch-depth: 1
7067
persist-credentials: false
7168

72-
- name: Install poetry
73-
run: pipx install poetry==1.8.2
74-
75-
- name: Configure poetry
76-
run: poetry config virtualenvs.in-project true
77-
7869
- name: Set up Python ${{ matrix.python-version }}
7970
uses: actions/setup-python@v5
8071
with:
8172
python-version: ${{ matrix.python-version }}
8273

83-
- name: Cache poetry virtualenv
84-
uses: actions/cache@v4
85-
with:
86-
path: ./.venv
87-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-venv-${{ hashFiles('**/poetry.lock') }}-tests_tasks
74+
- name: Install poetry
75+
run: pipx install poetry==1.8.5
76+
77+
- name: Configure poetry
78+
run: poetry config virtualenvs.in-project true
79+
80+
- name: Configure python version for poetry
81+
run: poetry env use python${{ matrix.python-version }}
8882

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

113107
coverage:
114108
name: Coverage
115-
runs-on: ubuntu-22.04
109+
runs-on: ubuntu-24.04
116110
needs: [tests_core, tests_tasks]
117111
steps:
118112
- uses: actions/checkout@v4
119113

120-
- run: pipx install poetry==1.8.2
114+
- run: pipx install poetry==1.8.5
121115
- run: poetry config virtualenvs.in-project true
122116
- uses: actions/setup-python@v5
123117
with:

.github/workflows/manifest_external_packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
test-manifest-creation:
1515

16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717

1818
strategy:
1919

.github/workflows/poetry_build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313

1414
- uses: actions/checkout@v4
@@ -20,8 +20,8 @@ jobs:
2020
with:
2121
python-version: "3.11"
2222

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

2626
- name: Build package
2727
run: poetry build

.github/workflows/poetry_update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ on:
1414

1515
jobs:
1616
poetry_update:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
2121
persist-credentials: false
2222
- name: Install poetry
23-
run: pipx install poetry==1.8.2
23+
run: pipx install poetry==1.8.5
2424
- uses: actions/setup-python@v5
2525
with:
2626
python-version: "3.11"

.github/workflows/publish_pypi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
build_and_publish:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
environment: pypi
1616
steps:
1717

@@ -29,8 +29,8 @@ jobs:
2929
with:
3030
python-version: "3.11"
3131

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

3535
- name: Build package
3636
run: poetry build

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Unreleased
44

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

710
# 1.5.4
811
* Tasks:

docs/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Setting up environment
44

5-
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).
5+
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).
66

77
From the repository root folder, running any of
88
```bash

0 commit comments

Comments
 (0)