Skip to content

Commit 0af4ef6

Browse files
dvp2015dvp2015
authored
Merge branch 'devel' into dependabot/github_actions/devel/release-drafter/release-drafter-5.25.0
2 parents 8b7f696 + 2b49f37 commit 0af4ef6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+6833
-2670
lines changed

‎.flake8

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ ignore=
2121
B905
2222
# C812 Missing trailing comma: black compatibility
2323
C812
24+
# Missing docstring in public method
25+
# D102
26+
# Missing docstring in public function
27+
# D103
2428
# D105 Missing docstring in magic method (__hash__, __eq__)
2529
D105
2630
# Missing docstring in __init__

‎.github/constraints.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pip==23.1.2
2-
poetry==1.5.1
1+
pip==23.3.1
2+
poetry==1.7.1
33

‎.github/workflows/clean-workflow-logs.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Clean Workflow Logs
33
on:
44
workflow_dispatch:
55
inputs:
6-
# days_old:
7-
# description: "The amount of days old to delete"
8-
# default: "7"
9-
# required: false
6+
# days_old:
7+
# description: "The amount of days old to delete"
8+
# default: "7"
9+
# required: false
1010
dry:
1111
description: "Dry run"
1212
default: "false"
@@ -15,12 +15,12 @@ jobs:
1515
clean-logs:
1616
runs-on: ubuntu-latest
1717
steps:
18-
# - uses: igorjs/gh-actions-clean-workflow@v1
19-
# with:
20-
# token: ${{ secrets.GITHUB_TOKEN }}
21-
# owner: ${{ github.repository_owner }}
22-
# repo: ${{ github.event.repository.name }}
23-
# days_old: ${{ github.event.inputs.days_old }}
18+
# - uses: igorjs/gh-actions-clean-workflow@v1
19+
# with:
20+
# token: ${{ secrets.GITHUB_TOKEN }}
21+
# owner: ${{ github.repository_owner }}
22+
# repo: ${{ github.event.repository.name }}
23+
# days_old: ${{ github.event.inputs.days_old }}
2424
- name: Clean workflow runs
2525
uses: dmvict/[email protected]
2626
with:

‎.github/workflows/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Check out the repository
29-
uses: actions/checkout@v4.1.0
29+
uses: actions/checkout@v4
3030

3131
- name: Sync GitHub Issue Labels
3232
uses: crazy-max/ghaction-github-labeler@v5

‎.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
draft_release:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: release-drafter/release-drafter@v5.25.0
10+
- uses: release-drafter/release-drafter@v5
1111
env:
1212
GITHUB_TOKEN: ${{ secrets.MCKIT_GITHUB_TOKEN }}

‎.github/workflows/release.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
steps:
2929
- name: Check out the repository
30-
uses: actions/checkout@v4.1.0
30+
uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 2 # need previous revision to define tag
3333

3434
- name: Set up Python
35-
uses: actions/setup-python@v4.7.1
35+
uses: actions/setup-python@v5
3636
with:
3737
python-version: ${{ env.PYTHON_VERSION }}
3838

@@ -71,21 +71,21 @@ jobs:
7171
7272
- name: Publish package on PyPI
7373
if: steps.check-version.outputs.tag
74-
uses: pypa/gh-action-pypi-publish@v1.8.10
74+
uses: pypa/gh-action-pypi-publish@release/v1
7575
with:
7676
user: __token__
7777
password: ${{ secrets.PYPI_TOKEN }}
7878

7979
- name: Publish package on TestPyPI
8080
if: "! steps.check-version.outputs.tag"
81-
uses: pypa/gh-action-pypi-publish@v1.8.10
81+
uses: pypa/gh-action-pypi-publish@release/v1
8282
with:
8383
user: __token__
8484
password: ${{ secrets.TEST_PYPI_TOKEN }}
8585
repository_url: https://test.pypi.org/legacy/
8686

8787
- name: Publish the release notes
88-
uses: release-drafter/release-drafter@v5.25.0
88+
uses: release-drafter/release-drafter@v5
8989
with:
9090
publish: ${{ steps.check-version.outputs.tag != '' }}
9191
tag: ${{ steps.check-version.outputs.tag }}

‎.github/workflows/stale.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ name: Mark stale issues and pull requests
22

33
on:
44
schedule:
5-
- cron: "10 10 * * 0" # at 10:10 every Sunday
6-
# See expression format: https://www.techielass.com/schedule-github-actions-using-cron-expressions
5+
- cron: "10 10 * * 0" # at 10:10 every Sunday
6+
# See expression format: https://www.techielass.com/schedule-github-actions-using-cron-expressions
77
jobs:
88
stale:
99

1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/stale@v8
14-
with:
15-
repo-token: ${{ secrets.MCKIT_GITHUB_TOKEN }}
16-
stale-issue-message: 'Stale issue message'
17-
stale-pr-message: 'Stale pull request message'
18-
stale-issue-label: 'no-issue-activity'
19-
stale-pr-label: 'no-pr-activity'
13+
- uses: actions/stale@v9
14+
with:
15+
repo-token: ${{ secrets.MCKIT_GITHUB_TOKEN }}
16+
stale-issue-message: 'Stale issue message'
17+
stale-pr-message: 'Stale pull request message'
18+
stale-issue-label: 'no-issue-activity'
19+
stale-pr-label: 'no-pr-activity'

‎.github/workflows/tests.yml

+33-27
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ concurrency:
2828
group: ci-tests-${{ github.ref }}-1
2929
cancel-in-progress: true
3030

31+
env:
32+
DEFAULT_PYTHON: "3.11"
33+
3134
jobs:
3235

3336
lint:
@@ -36,12 +39,12 @@ jobs:
3639
!contains(github.event.head_commit.message, '[skip_ci]')
3740
steps:
3841
- name: Check out the repository
39-
uses: actions/checkout@v4.1.0
42+
uses: actions/checkout@v4
4043

41-
- name: Set up Python 3.10 # on 3.11 pip install in unstable: "canonicalize" fails occasionally
42-
uses: actions/setup-python@v4.7.1
44+
- name: Set up Python
45+
uses: actions/setup-python@v5
4346
with:
44-
python-version: '3.10'
47+
python-version: ${{ env.DEFAULT_PYTHON }}
4548

4649
- name: Use frozen pip version
4750
run: |
@@ -55,7 +58,7 @@ jobs:
5558
5659
- name: Load poetry cache
5760
id: cached-poetry-dependencies
58-
uses: actions/cache@v3.3.1
61+
uses: actions/cache@v3
5962
with:
6063
path: |
6164
.cache/pypoetry
@@ -81,14 +84,14 @@ jobs:
8184
needs: lint
8285
steps:
8386
- name: Check out the repository
84-
uses: actions/checkout@v4.1.0
87+
uses: actions/checkout@v4
8588
with:
8689
fetch-depth: 1
8790

88-
- name: Set up Python 3.11
89-
uses: actions/setup-python@v4.7.1
91+
- name: Set up Python
92+
uses: actions/setup-python@v5
9093
with:
91-
python-version: '3.11'
94+
python-version: ${{ env.DEFAULT_PYTHON }}
9295

9396
- name: Use frozen pip version
9497
run: |
@@ -102,11 +105,11 @@ jobs:
102105
103106
- name: Load poetry cache
104107
id: cached-poetry-dependencies
105-
uses: actions/cache@v3.3.1
108+
uses: actions/cache@v3
106109
with:
107110
path: |
108111
.cache/pypoetry
109-
key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
112+
key: poetry-${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-${{ hashFiles('**/poetry.lock') }}
110113

111114
- name: Install Poetry
112115
run: |
@@ -127,17 +130,19 @@ jobs:
127130
strategy:
128131
fail-fast: false
129132
matrix:
130-
os: [ubuntu-latest, macos-latest, windows-latest]
131-
python-version: ['3.9', '3.10', '3.11'] # h5py-3.9.0 doesn't have wheels for python 3.12, check on updates
133+
os: [ ubuntu-latest, macos-latest, windows-latest ]
134+
python-version: [ '3.10', '3.11' ]
135+
# msgspec 0.18.5 fails on 3.9
136+
# duckdb 0.9.2 doesn't work with 3.12 yet
132137

133138
steps:
134139

135140
- name: Checkout repository
136-
uses: actions/checkout@v4.1.0
141+
uses: actions/checkout@v4
137142
with:
138143
fetch-depth: 1
139144

140-
- uses: actions/setup-python@v4.7.1
145+
- uses: actions/setup-python@v5
141146
with:
142147
python-version: ${{ matrix.python-version }}
143148
architecture: x64
@@ -154,11 +159,11 @@ jobs:
154159
155160
- name: Load poetry cache
156161
id: cached-poetry-dependencies
157-
uses: actions/cache@v3.3.1
162+
uses: actions/cache@v3
158163
with:
159164
path: |
160165
.cache/pypoetry
161-
key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
166+
key: poetry-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
162167

163168
- name: Install Poetry
164169
run: |
@@ -172,9 +177,9 @@ jobs:
172177
run: nox --force-color --session tests --python ${{ matrix.python-version }}
173178

174179
- name: Upload coverage data
175-
uses: actions/upload-artifact@v3.1.3
180+
uses: actions/upload-artifact@v4
176181
with:
177-
name: coverage-data
182+
name: coverage-data-${{ runner.os }}-${{ matrix.python-version }}
178183
path: ".coverage.*"
179184

180185
coverage:
@@ -183,12 +188,12 @@ jobs:
183188
steps:
184189

185190
- name: Check out the repository
186-
uses: actions/checkout@v4.1.0
191+
uses: actions/checkout@v4
187192

188-
- name: Set up Python 3.11
189-
uses: actions/setup-python@v4.7.1
193+
- name: Set up Python
194+
uses: actions/setup-python@v5
190195
with:
191-
python-version: '3.11'
196+
python-version: ${{ env.DEFAULT_PYTHON }}
192197

193198
- name: Use frozen pip version
194199
run: |
@@ -197,11 +202,11 @@ jobs:
197202
198203
- name: Load poetry cache
199204
id: cached-poetry-dependencies
200-
uses: actions/cache@v3.3.1
205+
uses: actions/cache@v3
201206
with:
202207
path: |
203208
.cache/pypoetry
204-
key: poetry-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
209+
key: poetry-${{ runner.os }}-${{ env.DEFAULT_PYTHON }}-${{ hashFiles('**/poetry.lock') }}
205210

206211
- name: Install Poetry
207212
run: |
@@ -217,9 +222,10 @@ jobs:
217222
nox --version
218223
219224
- name: Download coverage data
220-
uses: actions/download-artifact@v3.0.2
225+
uses: actions/download-artifact@v4
221226
with:
222-
name: coverage-data
227+
pattern: coverage-data-*
228+
merge-multiple: true
223229

224230
- name: Combine coverage data and display human readable report
225231
run: |

0 commit comments

Comments
 (0)