Skip to content

Commit 6662d62

Browse files
YuriiMotovYuriiMotov
authored
Merge branch 'master' into feature/union
2 parents 697855e + 549596c commit 6662d62

Some content is hidden

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

56 files changed

+645
-195
lines changed

‎.github/workflows/build-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
outputs:
2222
docs: ${{ steps.filter.outputs.docs }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
# For pull requests it's not necessary to checkout the code but for the main branch it is
2626
- uses: dorny/paths-filter@v3
2727
id: filter
@@ -52,9 +52,9 @@ jobs:
5252
env:
5353
GITHUB_CONTEXT: ${{ toJson(github) }}
5454
run: echo "$GITHUB_CONTEXT"
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- name: Set up Python
57-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5858
with:
5959
python-version: "3.11"
6060
- name: Setup uv

‎.github/workflows/conflict.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Conflict detector"
2+
on:
3+
push:
4+
pull_request_target:
5+
types: [synchronize]
6+
7+
jobs:
8+
main:
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check if PRs have merge conflicts
15+
uses: eps1lon/actions-label-merge-conflict@v3
16+
with:
17+
dirtyLabel: "conflicts"
18+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
19+
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."

‎.github/workflows/deploy-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
env:
2424
GITHUB_CONTEXT: ${{ toJson(github) }}
2525
run: echo "$GITHUB_CONTEXT"
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
- name: Set up Python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.11"
3131
- name: Setup uv
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
rm -rf ./site
5151
mkdir ./site
52-
- uses: actions/download-artifact@v4
52+
- uses: actions/download-artifact@v5
5353
with:
5454
path: ./site/
5555
pattern: docs-site

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/labeler@v5
19+
- uses: actions/labeler@v6
2020
if: ${{ github.event.action != 'labeled' && github.event.action != 'unlabeled' }}
2121
- run: echo "Done adding labels"
2222
# Run this after labeler applied labels

‎.github/workflows/latest-changes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
GITHUB_CONTEXT: ${{ toJson(github) }}
2626
run: echo "$GITHUB_CONTEXT"
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
with:
2929
# To allow latest-changes to commit to the main branch
3030
token: ${{ secrets.TYPER_LATEST_CHANGES }}
@@ -34,7 +34,7 @@ jobs:
3434
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
3535
with:
3636
limit-access-to-actor: true
37-
- uses: tiangolo/latest-changes@0.3.2
37+
- uses: tiangolo/latest-changes@0.4.0
3838
with:
3939
token: ${{ secrets.GITHUB_TOKEN }}
4040
latest_changes_file: docs/release-notes.md

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
env:
2222
GITHUB_CONTEXT: ${{ toJson(github) }}
2323
run: echo "$GITHUB_CONTEXT"
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Set up Python
26-
uses: actions/setup-python@v5
26+
uses: actions/setup-python@v6
2727
with:
2828
python-version: "3.10"
2929
# Issue ref: https://github.com/actions/setup-python/issues/436
@@ -36,4 +36,4 @@ jobs:
3636
TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
3737
run: python -m build
3838
- name: Publish
39-
uses: pypa/gh-action-pypi-publish@v1.12.4
39+
uses: pypa/gh-action-pypi-publish@v1.13.0

‎.github/workflows/smokeshow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
env:
2323
GITHUB_CONTEXT: ${{ toJson(github) }}
2424
run: echo "$GITHUB_CONTEXT"
25-
- uses: actions/checkout@v4
26-
- uses: actions/setup-python@v5
25+
- uses: actions/checkout@v5
26+
- uses: actions/setup-python@v6
2727
with:
2828
python-version: '3.9'
2929
- name: Setup uv
@@ -35,7 +35,7 @@ jobs:
3535
requirements**.txt
3636
pyproject.toml
3737
- run: uv pip install -r requirements-github-actions.txt
38-
- uses: actions/download-artifact@v4
38+
- uses: actions/download-artifact@v5
3939
with:
4040
name: coverage-html
4141
path: htmlcov

‎.github/workflows/test-redistribute.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
env:
2424
GITHUB_CONTEXT: ${{ toJson(github) }}
2525
run: echo "$GITHUB_CONTEXT"
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
- name: Set up Python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.10"
3131
# Issue ref: https://github.com/actions/setup-python/issues/436

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
os: [ ubuntu-latest, windows-latest, macos-latest ]
2323
python-version: [ "3.13" ]
2424
include:
25-
- os: ubuntu-22.04
26-
python-version: "3.7"
2725
- os: macos-latest
2826
python-version: "3.8"
2927
- os: windows-latest
@@ -41,9 +39,9 @@ jobs:
4139
env:
4240
GITHUB_CONTEXT: ${{ toJson(github) }}
4341
run: echo "$GITHUB_CONTEXT"
44-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4543
- name: Set up Python
46-
uses: actions/setup-python@v5
44+
uses: actions/setup-python@v6
4745
with:
4846
python-version: ${{ matrix.python-version }}
4947
- name: Setup uv
@@ -81,8 +79,8 @@ jobs:
8179
env:
8280
GITHUB_CONTEXT: ${{ toJson(github) }}
8381
run: echo "$GITHUB_CONTEXT"
84-
- uses: actions/checkout@v4
85-
- uses: actions/setup-python@v5
82+
- uses: actions/checkout@v5
83+
- uses: actions/setup-python@v6
8684
with:
8785
python-version: '3.8'
8886
- name: Setup uv
@@ -94,7 +92,7 @@ jobs:
9492
requirements**.txt
9593
pyproject.toml
9694
- name: Get coverage files
97-
uses: actions/download-artifact@v4
95+
uses: actions/download-artifact@v5
9896
with:
9997
pattern: coverage-*
10098
path: coverage

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default_language_version:
44
python: python3.10
55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v5.0.0
7+
rev: v6.0.0
88
hooks:
99
- id: check-added-large-files
1010
- id: check-toml
@@ -14,7 +14,7 @@ repos:
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.11.6
17+
rev: v0.13.0
1818
hooks:
1919
- id: ruff
2020
args:

0 commit comments

Comments
 (0)