Skip to content

Commit 18fae25

Browse files
authored
Merge branch 'master' into test-against-vendored-dandiapi
2 parents 4d20337 + 58ccbca commit 18fae25

File tree

7 files changed

+12
-18
lines changed

7 files changed

+12
-18
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Set up environment
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414
with: # no need for the history
1515
fetch-depth: 1
1616
- name: Set up Python

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
auto-version: ${{ steps.auto-version.outputs.version }}
1919
steps:
2020
- name: Checkout source
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
# A full checkout is required so that auto will have access to tag
2424
# information.
@@ -49,7 +49,7 @@ jobs:
4949
git config --global user.name "DANDI Bot"
5050
5151
- name: Checkout source
52-
uses: actions/checkout@v5
52+
uses: actions/checkout@v6
5353
with:
5454
fetch-depth: 0
5555
path: dandischema
@@ -75,7 +75,7 @@ jobs:
7575
working-directory: dandischema
7676

7777
- name: Checkout dandi/schema
78-
uses: actions/checkout@v5
78+
uses: actions/checkout@v6
7979
with:
8080
repository: dandi/schema
8181
path: schema

.github/workflows/test-dandi-cli.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
- macos-latest
2525
python:
2626
# Use the only Python which is ATM also used by dandi-api
27-
# - 3.9
2827
# - '3.10'
2928
- '3.11'
3029
# - '3.12'
@@ -41,11 +40,11 @@ jobs:
4140
- default
4241
include:
4342
- os: ubuntu-latest
44-
python: 3.9
43+
python: "3.10"
4544
mode: dandi-devel
4645
version: master
4746
- os: ubuntu-latest
48-
python: 3.9
47+
python: "3.10"
4948
mode: dandi-devel
5049
version: release
5150
- os: ubuntu-latest
@@ -64,11 +63,6 @@ jobs:
6463
instance_name: EMBER-DANDI
6564
instance_identifier: 'RRID:SCR_026700'
6665
doi_prefix: '10.82754'
67-
exclude:
68-
# Temporarily disabled due to h5py/hdf5 dependency issue
69-
# See <https://github.com/dandi/dandi-cli/pull/315>
70-
- os: windows-latest
71-
python: 3.9
7266
steps:
7367
- name: Set up Python ${{ matrix.python }}
7468
uses: actions/setup-python@v6
@@ -101,7 +95,7 @@ jobs:
10195
run: echo DANDI_DEVEL=1 >> "$GITHUB_ENV"
10296

10397
- name: Check out dandischema
104-
uses: actions/checkout@v5
98+
uses: actions/checkout@v6
10599
with:
106100
# Fetch all commits so that versioningit will return something
107101
# compatible with semantic-version

.github/workflows/test-nonetwork.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- '3.12'
2626
steps:
2727
- name: Set up environment
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929
with:
3030
# Fetch all commits so that versioningit will return something
3131
# compatible with semantic-version

.github/workflows/test-schema.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: contains(github.event.pull_request.labels.*.name, 'release')
1212
steps:
1313
- name: Checkout this repository
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 0 # Need history for `git describe`
1717
path: dandischema
@@ -26,7 +26,7 @@ jobs:
2626
working-directory: dandischema
2727

2828
- name: Checkout dandi/schema
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
with:
3131
repository: dandi/schema
3232
path: schema

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
instance_name: EMBER-DANDI
3838
steps:
3939
- name: Set up environment
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@v6
4141
with:
4242
# Fetch all commits so that versioningit will return something
4343
# compatible with semantic-version

.github/workflows/typing.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 out repository
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
1515

0 commit comments

Comments
 (0)