Skip to content

Commit 3434aff

Browse files
committed
Merge branch 'dev' into fix-issue-8603
Signed-off-by: ytl0623 <[email protected]>
2 parents 89d349d + 57fdd59 commit 3434aff

File tree

88 files changed

+230
-273
lines changed

Some content is hidden

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

88 files changed

+230
-273
lines changed

.github/workflows/chatops.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: dispatch
13-
uses: peter-evans/[email protected].0
13+
uses: peter-evans/[email protected].2
1414
with:
1515
token: ${{ secrets.PR_MAINTAIN }}
1616
reaction-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cron-ngc-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id: pip-cache
2727
run: echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
2828
- name: cache for pip
29-
uses: actions/cache@v4
29+
uses: actions/cache@v5
3030
id: cache
3131
with:
3232
path: ~/.cache/pip

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
python setup.py build
3838
cat build/lib/monai/_version.py
3939
- name: Upload version
40-
uses: actions/upload-artifact@v5
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: _version.py
4343
path: build/lib/monai/_version.py

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id: pip-cache
2323
run: echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
2424
- name: cache for pip
25-
uses: actions/cache@v4
25+
uses: actions/cache@v5
2626
id: cache
2727
with:
2828
path: |
@@ -98,7 +98,7 @@ jobs:
9898
id: pip-cache
9999
run: echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
100100
- name: cache for pip
101-
uses: actions/cache@v4
101+
uses: actions/cache@v5
102102
id: cache
103103
with:
104104
path: |

.github/workflows/pythonapp-min.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
4747
shell: bash
4848
- name: cache for pip
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
id: cache
5151
with:
5252
path: ${{ steps.pip-cache.outputs.dir }}
@@ -96,7 +96,7 @@ jobs:
9696
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
9797
shell: bash
9898
- name: cache for pip
99-
uses: actions/cache@v4
99+
uses: actions/cache@v5
100100
id: cache
101101
with:
102102
path: ${{ steps.pip-cache.outputs.dir }}
@@ -145,7 +145,7 @@ jobs:
145145
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
146146
shell: bash
147147
- name: cache for pip
148-
uses: actions/cache@v4
148+
uses: actions/cache@v5
149149
id: cache
150150
with:
151151
path: ${{ steps.pip-cache.outputs.dir }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666

6767
- if: matrix.python-version == '3.9' && startsWith(github.ref, 'refs/tags/')
6868
name: Upload artifacts
69-
uses: actions/upload-artifact@v5
69+
uses: actions/upload-artifact@v6
7070
with:
7171
name: dist
7272
path: dist/
@@ -109,7 +109,7 @@ jobs:
109109
python setup.py build
110110
cat build/lib/monai/_version.py
111111
- name: Upload version
112-
uses: actions/upload-artifact@v5
112+
uses: actions/upload-artifact@v6
113113
with:
114114
name: _version.py
115115
path: build/lib/monai/_version.py

.github/workflows/setupapp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
3636
- name: cache for pip
3737
if: ${{ startsWith(github.ref, 'refs/heads/dev') }}
38-
uses: actions/cache@v4
38+
uses: actions/cache@v5
3939
id: cache
4040
with:
4141
path: |
@@ -95,7 +95,7 @@ jobs:
9595
run: |
9696
echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
9797
- name: cache for pip
98-
uses: actions/cache@v4
98+
uses: actions/cache@v5
9999
id: cache
100100
with:
101101
path: |
@@ -136,7 +136,7 @@ jobs:
136136
run: |
137137
echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
138138
- name: cache for pip
139-
uses: actions/cache@v4
139+
uses: actions/cache@v5
140140
id: cache
141141
with:
142142
path: |

.github/workflows/weekly-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: |
2222
echo "datew=$(date '+%Y-%V')" >> $GITHUB_OUTPUT
2323
- name: cache for pip
24-
uses: actions/cache@v4
24+
uses: actions/cache@v5
2525
id: cache
2626
with:
2727
path: ~/.cache/pip

.pre-commit-config.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,11 @@ repos:
3030
rev: v0.7.0
3131
hooks:
3232
- id: ruff
33-
args:
34-
- --fix
35-
36-
- repo: https://github.com/asottile/pyupgrade
37-
rev: v3.19.0
38-
hooks:
39-
- id: pyupgrade
40-
args: [--py39-plus, --keep-runtime-typing]
41-
name: Upgrade code with exceptions
33+
args: ["--fix"]
4234
exclude: |
4335
(?x)(
4436
^versioneer.py|
45-
^monai/_version.py|
46-
^monai/networks/| # avoid typing rewrites
47-
^monai/apps/detection/utils/anchor_utils.py| # avoid typing rewrites
48-
^tests/test_compute_panoptic_quality.py # avoid typing rewrites
37+
^monai/_version.py
4938
)
5039
5140
- repo: https://github.com/asottile/yesqa

monai/apps/auto3dseg/bundle_gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ def _download_algos_url(url: str, at_path: str) -> dict[str, dict[str, str]]:
396396
try:
397397
download_and_extract(url=url, filepath=algo_compressed_file, output_dir=os.path.dirname(at_path))
398398
except Exception as e:
399-
msg = f"Download and extract of {url} failed, attempt {i+1}/{download_attempts}."
399+
msg = f"Download and extract of {url} failed, attempt {i + 1}/{download_attempts}."
400400
if i < download_attempts - 1:
401401
warnings.warn(msg)
402402
time.sleep(i)

0 commit comments

Comments
 (0)