Skip to content

Commit e70f3f8

Browse files
authored
Merge branch 'main' into meanings_table
2 parents ce82b59 + 95c20f7 commit e70f3f8

4 files changed

Lines changed: 12 additions & 14 deletions

File tree

.github/workflows/hdmf_compatibility_schema.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,20 @@ env:
88
jobs:
99
check_compatibility:
1010
runs-on: ubuntu-latest
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
1114
steps:
12-
- name: Cancel non-latest runs
13-
uses: styfle/cancel-workflow-action@0.11.0
15+
- uses: actions/checkout@v6
16+
- name: Set up Python 3.14
17+
uses: actions/setup-python@v6
1418
with:
15-
all_but_latest: true
16-
access_token: ${{ github.token }}
17-
- uses: actions/checkout@v4
18-
- name: Set up Python 3.11
19-
uses: actions/setup-python@v4
20-
with:
21-
python-version: "3.11"
19+
python-version: "3.14"
2220
- name: Clone HDMF and Run HDMF tests
2321
run: |
2422
git clone https://github.com/hdmf-dev/hdmf.git --recurse-submodules
2523
cd hdmf
26-
python -m pip install -r requirements-dev.txt -r requirements.txt
27-
python -m pip install -e .
24+
python -m pip install -e ".[all]"
2825
cd src/hdmf/common/hdmf-common-schema
2926
git checkout $HEAD_REF # checkout branch
3027
cd ../../../..

common/experimental.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ datasets:
1010
dtype:
1111
target_type: VectorData
1212
reftype: object
13-
doc: Reference to the VectorData object that contains the enumerable elements
13+
doc: Reference to the VectorData object that contains the enumerable elements.
1414

common/table.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ datasets:
4343
data_type_inc: VectorData
4444
dtype: uint8
4545
doc: Used with VectorData to encode a ragged array. An array of indices
46-
into the first dimension of the target VectorData, and forming a map
46+
into the first dimension of the target VectorData, forming a map
4747
between the rows of a DynamicTable and the indices of the VectorData.
4848
The name of the VectorIndex is expected to be the name of the target
4949
VectorData object followed by "_index".
@@ -96,7 +96,7 @@ groups:
9696
- data_type_def: DynamicTable
9797
data_type_inc: Container
9898
doc: A group containing multiple datasets that are aligned on the first dimension
99-
(Currently, this requirement if left up to APIs to check and enforce). These datasets
99+
(Currently, this requirement is left up to APIs to check and enforce). These datasets
100100
represent different columns in the table. Apart from a column that contains unique
101101
identifiers for each row, there are no other required datasets. Users are free to add
102102
any number of custom VectorData objects (columns) here. DynamicTable also supports

docs/source/hdmf_common_release_notes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ hdmf-common Release Notes
1212
This is useful for annotating categorical data stored in a `DynamicTable`. Added a group named "meanings_tables"
1313
to `DynamicTable` to hold `MeaningsTable` objects that provide meanings for `VectorData` columns in the
1414
`DynamicTable`.
15+
- Minor changes to data type docstrings to improve clarity.
1516

1617
1.8.0 (August 4, 2023)
1718
----------------------

0 commit comments

Comments
 (0)