Skip to content

Commit f46e4cd

Browse files
committed
Merge remote-tracking branch 'origin/main' into python-3.12
2 parents dfcc388 + 9b6a6ec commit f46e4cd

File tree

2 files changed

+26
-64
lines changed

2 files changed

+26
-64
lines changed

.github/workflows/pypi_publish.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- name: Set up Python
12-
uses: actions/setup-python@v4
13-
with:
14-
python-version: 3.11
1511
- name: Install Poetry
1612
run: |
1713
pip install pipx
1814
pipx install poetry
15+
- name: Set up Python
16+
uses: actions/setup-python@v4
17+
with:
18+
python-version: 3.11
19+
cache: "poetry"
1920
- name: Install Dependencies
2021
run: |
2122
poetry install

.github/workflows/testing.yaml

Lines changed: 21 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,19 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
13-
- name: install Just
14-
uses: taiki-e/install-action@just
15-
- name: Set up Python
16-
uses: actions/setup-python@v4
17-
with:
18-
python-version: "3.8"
19-
- name: Get full Python version
20-
id: full-python-version
21-
run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
2213
- name: Install Poetry
23-
run: |
24-
pip install pipx
25-
pipx install poetry
14+
run: pipx install poetry
2615
- name: Configure poetry
2716
run: |
2817
poetry config virtualenvs.create true
2918
poetry config virtualenvs.in-project true
30-
- name: Cache poetry venv
31-
uses: actions/cache@v3
32-
id: poetry-cache
19+
- name: install Just
20+
uses: taiki-e/install-action@just
21+
- name: Set up Python
22+
uses: actions/setup-python@v4
3323
with:
34-
path: .venv
35-
key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
36-
- name: Ensure cache is healthy
37-
if: steps.poetry-cache.outputs.cache-hit == 'true'
38-
shell: bash
39-
run: timeout 10s poetry run pip --version || rm -rf .venv
24+
python-version: 3.8
25+
cache: "poetry"
4026
- name: Install Dependencies
4127
run: just install
4228
- name: mypy check
@@ -50,33 +36,19 @@ jobs:
5036
runs-on: ubuntu-latest
5137
steps:
5238
- uses: actions/checkout@v4
53-
- name: install Just
54-
uses: taiki-e/install-action@just
55-
- name: Set up Python ${{ matrix.python-version }}
56-
uses: actions/setup-python@v4
57-
with:
58-
python-version: ${{ matrix.python-version }}
59-
- name: Get full Python version
60-
id: full-python-version
61-
run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
6239
- name: Install Poetry
63-
run: |
64-
pip install pipx
65-
pipx install poetry
40+
run: pipx install poetry
6641
- name: Configure poetry
6742
run: |
6843
poetry config virtualenvs.create true
6944
poetry config virtualenvs.in-project true
70-
- name: Cache poetry venv
71-
uses: actions/cache@v3
72-
id: poetry-cache
45+
- name: install Just
46+
uses: taiki-e/install-action@just
47+
- name: Set up Python ${{ matrix.python-version }}
48+
uses: actions/setup-python@v4
7349
with:
74-
path: .venv
75-
key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
76-
- name: Ensure cache is healthy
77-
if: steps.poetry-cache.outputs.cache-hit == 'true'
78-
shell: bash
79-
run: timeout 10s poetry run pip --version || rm -rf .venv
50+
python-version: ${{ matrix.python-version }}
51+
cache: "poetry"
8052
- name: Install Dependencies
8153
run: just install
8254
- name: Test with pytest
@@ -91,31 +63,20 @@ jobs:
9163
runs-on: ubuntu-latest
9264
steps:
9365
- uses: actions/checkout@v4
94-
- name: install Just
95-
uses: taiki-e/install-action@just
96-
- name: Set up Python
97-
uses: actions/setup-python@v4
98-
with:
99-
python-version: "3.11"
100-
- name: Get full Python version
101-
id: full-python-version
102-
run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
10366
- name: Install Poetry
104-
run: |
105-
pip install pipx
106-
pipx install poetry
67+
run: pipx install poetry
10768
- name: Configure poetry
10869
run: |
10970
poetry config virtualenvs.create true
11071
poetry config virtualenvs.in-project true
111-
- name: Cache poetry venv
112-
uses: actions/cache@v3
113-
id: poetry-cache
72+
- name: install Just
73+
uses: taiki-e/install-action@just
74+
- name: Set up Python
75+
uses: actions/setup-python@v4
11476
with:
115-
path: .venv
116-
key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
77+
python-version: "3.11"
78+
cache: "poetry"
11779
- name: Install Dependencies
118-
if: steps.poetry-cache.outputs.cache-hit != 'true'
11980
run: just install
12081
- name: Test Docs Build
12182
run: just build-docs

0 commit comments

Comments
 (0)