Skip to content

Commit ca7a84f

Browse files
authored
Merge branch 'master' into zarr-upload-no-acl
2 parents 22b3951 + 2827711 commit ca7a84f

24 files changed

Lines changed: 296 additions & 31 deletions

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525

2626
- name: Set up Python ${{ matrix.python }}
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: ${{ matrix.python }}
3030

‎.github/workflows/labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check PR Labels
12-
uses: actions/github-script@v7
12+
uses: actions/github-script@v8
1313
with:
1414
script: |
1515
const allowedPattern = /^(major|minor|patch|performance|internal|documentation|tests|dependencies)$/;

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515
- name: Set up Python
16-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1717
with:
1818
python-version: '3.9'
1919
- name: Install dependencies

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
chmod a+x ~/auto
2525
2626
- name: Set up Python
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: 3.9
3030

‎.github/workflows/run-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
fetch-depth: 0
6969

7070
- name: Set up Python ${{ matrix.python }}
71-
uses: actions/setup-python@v5
71+
uses: actions/setup-python@v6
7272
with:
7373
python-version: ${{ matrix.python }}
7474

‎.github/workflows/typing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fetch-depth: 0
1515

1616
- name: Set up Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.9'
2020

‎CHANGELOG.md‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
# 0.71.4 (Wed Sep 17 2025)
2+
3+
#### 🐛 Bug Fix
4+
5+
- Add a "common paper wasp" species [#1705](https://github.com/dandi/dandi-cli/pull/1705) ([@yarikoptic](https://github.com/yarikoptic))
6+
7+
#### 🏠 Internal
8+
9+
- [gh-actions](deps): Bump actions/github-script from 7 to 8 [#1702](https://github.com/dandi/dandi-cli/pull/1702) ([@dependabot[bot]](https://github.com/dependabot[bot]))
10+
- [gh-actions](deps): Bump actions/setup-python from 5 to 6 [#1703](https://github.com/dandi/dandi-cli/pull/1703) ([@dependabot[bot]](https://github.com/dependabot[bot]))
11+
12+
#### Authors: 2
13+
14+
- [@dependabot[bot]](https://github.com/dependabot[bot])
15+
- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
16+
17+
---
18+
19+
# 0.71.3 (Thu Aug 28 2025)
20+
21+
#### 🧪 Tests
22+
23+
- Run dandi-archive celery worker with `uv` [#1698](https://github.com/dandi/dandi-cli/pull/1698) ([@mvandenburgh](https://github.com/mvandenburgh))
24+
25+
#### Authors: 1
26+
27+
- Mike VanDenburgh ([@mvandenburgh](https://github.com/mvandenburgh))
28+
29+
---
30+
31+
# 0.71.2 (Mon Aug 25 2025)
32+
33+
#### 🐛 Bug Fix
34+
35+
- Add tagging to zarr upload if embargoed [#1685](https://github.com/dandi/dandi-cli/pull/1685) ([@jjnesbitt](https://github.com/jjnesbitt))
36+
- BF: check for upload to not have our .dandidownload suffixes [#1645](https://github.com/dandi/dandi-cli/pull/1645) ([@yarikoptic](https://github.com/yarikoptic) [@CodyCBakerPhD](https://github.com/CodyCBakerPhD))
37+
38+
#### Authors: 3
39+
40+
- Cody Baker ([@CodyCBakerPhD](https://github.com/CodyCBakerPhD))
41+
- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
42+
- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
43+
44+
---
45+
46+
# 0.71.1 (Mon Aug 25 2025)
47+
48+
#### 🐛 Bug Fix
49+
50+
- Bring back dandi-staging to provide more graceful transition for 3rd party libraries [#1694](https://github.com/dandi/dandi-cli/pull/1694) ([@yarikoptic](https://github.com/yarikoptic) [@CodyCBakerPhD](https://github.com/CodyCBakerPhD))
51+
- Fix EMBER-DANDI Sandbox url [#1693](https://github.com/dandi/dandi-cli/pull/1693) ([@NEStock](https://github.com/NEStock))
52+
- Add ndx-events and ndx-hed into our "extensions" extra [#1691](https://github.com/dandi/dandi-cli/pull/1691) ([@yarikoptic](https://github.com/yarikoptic) [@CodyCBakerPhD](https://github.com/CodyCBakerPhD))
53+
54+
#### 🧪 Tests
55+
56+
- Register a Pytest plugin, instead of relying on a root "conftest.py" [#1687](https://github.com/dandi/dandi-cli/pull/1687) ([@brianhelba](https://github.com/brianhelba) [@yarikoptic](https://github.com/yarikoptic))
57+
- BF: announce two tests xfail on windows python 3.13 [#1690](https://github.com/dandi/dandi-cli/pull/1690) ([@yarikoptic](https://github.com/yarikoptic))
58+
59+
#### Authors: 4
60+
61+
- Brian Helba ([@brianhelba](https://github.com/brianhelba))
62+
- Cody Baker ([@CodyCBakerPhD](https://github.com/CodyCBakerPhD))
63+
- Nicole Stock Tregoning ([@NEStock](https://github.com/NEStock))
64+
- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
65+
66+
---
67+
168
# 0.71.0 (Fri Aug 22 2025)
269

370
#### 🚀 Enhancement

‎dandi/cli/tests/test_cmd_validate.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55

66
from ..cmd_validate import _process_issues, validate
7+
from ...tests.xfail import mark_xfail_windows_python313_posixsubprocess
78
from ...validate_types import (
89
Origin,
910
OriginType,
@@ -77,6 +78,7 @@ def test_validate_ignore(simple2_nwb: Path) -> None:
7778
assert "DANDI.NO_DANDISET_FOUND" not in r.output
7879

7980

81+
@mark_xfail_windows_python313_posixsubprocess
8082
def test_validate_nwb_path_grouping(organized_nwb_dir4: Path) -> None:
8183
"""
8284
Does grouping of issues by path work?

‎dandi/cli/tests/test_instances.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ def test_cmd_instances(monkeypatch):
1919
"dandi-sandbox:\n"
2020
" api: https://api.sandbox.dandiarchive.org/api\n"
2121
" gui: https://sandbox.dandiarchive.org\n"
22+
"dandi-staging:\n"
23+
" api: https://api.sandbox.dandiarchive.org/api\n"
24+
" gui: https://sandbox.dandiarchive.org\n"
2225
"ember:\n"
2326
" api: https://api-dandi.emberarchive.org/api\n"
2427
" gui: https://dandi.emberarchive.org\n"
2528
"ember-sandbox:\n"
2629
" api: https://api-dandi-sandbox.emberarchive.org/api\n"
27-
" gui: https://dandi-sandbox.emberarchive.org\n"
30+
" gui: https://apl-setup--ember-dandi-archive.netlify.app/\n"
2831
"linc:\n"
2932
" api: https://api.lincbrain.org/api\n"
3033
" gui: https://lincbrain.org\n"

‎dandi/consts.py‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ def urls(self) -> Iterator[str]:
122122
"https://dandiarchive.org",
123123
"https://api.dandiarchive.org/api",
124124
),
125+
# Deprecated. Remove early 2026.
126+
# Should come before dandi-sandbox so _rev map does map to sandbox
127+
"dandi-staging": DandiInstance(
128+
"dandi-staging",
129+
"https://sandbox.dandiarchive.org",
130+
"https://api.sandbox.dandiarchive.org/api",
131+
),
125132
"dandi-sandbox": DandiInstance(
126133
"dandi-sandbox",
127134
"https://sandbox.dandiarchive.org",
@@ -149,7 +156,7 @@ def urls(self) -> Iterator[str]:
149156
),
150157
"ember-sandbox": DandiInstance(
151158
"ember-sandbox",
152-
"https://dandi-sandbox.emberarchive.org",
159+
"https://apl-setup--ember-dandi-archive.netlify.app/",
153160
"https://api-dandi-sandbox.emberarchive.org/api",
154161
),
155162
}
@@ -223,3 +230,6 @@ def urls(self) -> Iterator[str]:
223230
REQUEST_RETRIES = 12
224231

225232
DOWNLOAD_TIMEOUT = 30
233+
234+
#: Suffix used for temporary download directories
235+
DOWNLOAD_SUFFIX = ".dandidownload"

0 commit comments

Comments
 (0)