Skip to content

Commit 1d7ac48

Browse files
committed
build: unify poetry version source
Change the GitHub actions workflows to use the Poetry version specified in `devtools/requirements-poetry.in` so that it becomes simpler to upgrade the Poetry version. Also upgrade the version of poetry from 1.4.0 to 1.4.2
1 parent 89982f8 commit 1d7ac48

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

.github/workflows/docker-images.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ jobs:
4444
uses: arduino/setup-task@v1
4545
with:
4646
repo-token: ${{ secrets.GITHUB_TOKEN }}
47-
- name: Python Poetry Action
48-
uses: abatilo/actions-poetry@v2.3.0
49-
with:
50-
poetry-version: 1.4.0
47+
- name: Install poetry
48+
run: |
49+
pip install -r devtools/requirements-poetry.in
5150
- name: Build images
5251
shell: bash
5352
run: |
@@ -70,10 +69,9 @@ jobs:
7069
uses: arduino/setup-task@v1
7170
with:
7271
repo-token: ${{ secrets.GITHUB_TOKEN }}
73-
- name: Python Poetry Action
74-
uses: abatilo/actions-poetry@v2.3.0
75-
with:
76-
poetry-version: 1.4.0
72+
- name: Install poetry
73+
run: |
74+
pip install -r devtools/requirements-poetry.in
7775
- name: Login to GitHub Container Registry
7876
uses: docker/login-action@v2
7977
with:

.github/workflows/validate.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,17 @@ jobs:
6565
uses: actions/cache@v3
6666
with:
6767
path: ${{ env.XDG_CACHE_HOME }}
68-
key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt') }}
68+
key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt', '**/*requirements*.in') }}
6969
restore-keys: |
7070
${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-
7171
${{ github.job }}-xdg-v1-${{ matrix.os }}-
7272
- name: Set up Python ${{ matrix.python-version }}
7373
uses: actions/setup-python@v4
7474
with:
7575
python-version: ${{ matrix.python-version }}
76-
- name: Python Poetry Action
77-
uses: abatilo/actions-poetry@v2.3.0
78-
with:
79-
poetry-version: 1.4.0
76+
- name: Install poetry
77+
run: |
78+
pip install -r devtools/requirements-poetry.in
8079
- uses: actions/setup-java@v3
8180
if: ${{ matrix.extensive-tests }}
8281
with:
@@ -133,18 +132,17 @@ jobs:
133132
uses: actions/cache@v3
134133
with:
135134
path: ${{ env.XDG_CACHE_HOME }}
136-
key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt') }}
135+
key: ${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml', '**/poetry.lock', '**/with-fuseki.sh', '**/*requirements*.txt', '**/*requirements*.in') }}
137136
restore-keys: |
138137
${{ github.job }}-xdg-v1-${{ matrix.os }}-${{ matrix.python-version }}-
139138
${{ github.job }}-xdg-v1-${{ matrix.os }}-
140139
- name: Set up Python ${{env.DEFAULT_PYTHON}}
141140
uses: actions/setup-python@v4
142141
with:
143142
python-version: ${{ matrix.python-version }}
144-
- name: Python Poetry Action
145-
uses: abatilo/actions-poetry@v2.3.0
146-
with:
147-
poetry-version: 1.4.0
143+
- name: Install poetry
144+
run: |
145+
pip install -r devtools/requirements-poetry.in
148146
- name: Install Task
149147
uses: arduino/setup-task@v1
150148
with:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
require_serial: true
2626
args: ["."]
2727
- repo: https://github.com/python-poetry/poetry
28-
rev: 1.4.0
28+
rev: 1.4.2
2929
hooks:
3030
- id: poetry-check
3131
- id: poetry-lock

devtools/requirements-poetry.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Fixing this here as readthedocs can't use the compiled requirements-poetry.txt
22
# due to conflicts.
3-
poetry==1.4.0
3+
poetry==1.4.2

0 commit comments

Comments
 (0)