Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
cf6082b
Add with-standard schema header attribute(and related support, such a…
IanCa Feb 15, 2023
a93b4be
Merge pull request #614 from hed-standard/dev_with_standard
VisLab Feb 15, 2023
5950c0b
Add first draft conda stuff
IanCa Feb 22, 2023
783eab1
Slight updates to conda instructions
IanCa Feb 22, 2023
ba7d9a9
Merge pull request #615 from hed-standard/dev_add_conda_file
VisLab Feb 22, 2023
6948151
Add first draft spec tests
IanCa Mar 2, 2023
30dd21b
fix spec tests workflow/tests
IanCa Mar 3, 2023
bdb6c6c
Merge pull request #617 from hed-standard/dev_update_spectests2
VisLab Mar 3, 2023
042c169
Update spec tests further
IanCa Mar 3, 2023
c934d93
Add specification subfolder
IanCa Mar 3, 2023
22066bf
Add missing file
IanCa Mar 3, 2023
e1d6cdb
Merge pull request #618 from hed-standard/dev_update_spec_tests3
VisLab Mar 5, 2023
df94796
Minor doc corrections in remodeling
VisLab Mar 6, 2023
b8b7179
Merge pull request #619 from VisLab/develop
VisLab Mar 6, 2023
256c99e
Updated tabular input and sidecar to always take schema in tools
VisLab Mar 8, 2023
f068755
Merge pull request #621 from VisLab/develop
VisLab Mar 8, 2023
79b1f36
Started on an event manager
VisLab Mar 15, 2023
9fedd9f
Merge pull request #622 from VisLab/develop
VisLab Mar 15, 2023
fbb8fd8
First pass refactor of models
IanCa Mar 15, 2023
28ef39e
Add missing data file. Disable prints
IanCa Mar 16, 2023
9d9d792
Merge pull request #623 from IanCa/develop
VisLab Mar 16, 2023
21590f2
Updated unit tests
VisLab Mar 16, 2023
49c3c65
Merge pull request #624 from VisLab/dev_refactor
VisLab Mar 16, 2023
4c79d1b
Add some df tests. Update hed_assemble. Make the df utils also work…
IanCa Mar 16, 2023
671e144
Merge pull request #625 from IanCa/dev_refactor
VisLab Mar 17, 2023
2698d6c
Fixed some of the refactoring errors
VisLab Mar 17, 2023
67ab89b
Merge pull request #626 from VisLab/dev_refactor
VisLab Mar 17, 2023
84cf4e0
Add more unit tests. better nan and empty column handling
IanCa Mar 17, 2023
a4d3931
Merge pull request #627 from IanCa/dev_refactor
VisLab Mar 19, 2023
c8db8ba
Revert "Add more unit tests. better nan and empty column handling"
VisLab Mar 19, 2023
5bab6c6
Merge pull request #628 from hed-standard/revert-627-dev_refactor
VisLab Mar 19, 2023
ffced96
Add more unit tests. better nan and empty column handling
IanCa Mar 17, 2023
bd4b71a
Update na/empty handling
IanCa Mar 20, 2023
9ede71b
Merge pull request #629 from IanCa/dev_refactor
VisLab Mar 21, 2023
9b6705f
Making sure up to date before merging
VisLab Mar 21, 2023
1c6fdfc
Fixed merged testing
VisLab Mar 21, 2023
2c66b65
Updated the unit tests. find_def_tags problematic
VisLab Mar 21, 2023
62806e4
Updated the unit tests
VisLab Mar 21, 2023
7474286
Merge pull request #630 from VisLab/dev_refactor
VisLab Mar 21, 2023
3bfbd3b
Fix hed_string.expand_defs issue
IanCa Mar 21, 2023
ab10e9e
Merge pull request #631 from IanCa/dev_refactor
VisLab Mar 22, 2023
3af84e9
Corrected some of the refactored unit tests
VisLab Mar 23, 2023
a1e61df
Merge pull request #633 from VisLab/dev_refactor
VisLab Mar 23, 2023
bc5c949
Updated bids tests
VisLab Mar 23, 2023
f2455d8
Merge pull request #634 from VisLab/dev_refactor
VisLab Mar 23, 2023
697791c
Add squre bracket in column validation for spreadsheets. Update erro…
IanCa Mar 23, 2023
7cf7826
Block HED from appearing in sidecars (#635)
IanCa Mar 23, 2023
69f320d
Updated the search in analysis tools
VisLab Mar 27, 2023
02e9d86
Merge pull request #636 from VisLab/dev_refactor
VisLab Mar 27, 2023
6708094
Fix sorting for hed string context
IanCa Mar 30, 2023
16f9875
Merge pull request #637 from hed-standard/dev_fix_sort
VisLab Mar 30, 2023
fa4be3c
Merge pull request #638 from hed-standard/dev_refactor
VisLab Mar 30, 2023
99ddadd
Update spec tests commit
IanCa Mar 30, 2023
2b8551b
Rename HedTag.extension_or_value_portion -> .extension
IanCa Mar 30, 2023
43dc457
Fix tests
IanCa Mar 31, 2023
1f727e3
Merge pull request #639 from IanCa/develop
VisLab Mar 31, 2023
6bbf2d9
Updated the tests
VisLab Mar 31, 2023
bff12b8
Merge branch 'develop' of https://github.com/hed-standard/hed-python …
VisLab Mar 31, 2023
50adab7
Add flatten schema function
IanCa Mar 31, 2023
d9f91ed
Merge pull request #640 from IanCa/develop
VisLab Mar 31, 2023
b680e1e
Merge branch 'develop' of https://github.com/hed-standard/hed-python …
VisLab Mar 31, 2023
4d6d35e
First stab at Definitions summary
VisLab Mar 31, 2023
0dc575f
Merge pull request #641 from VisLab/develop
VisLab Mar 31, 2023
a66a13a
Update dependabot to also update submodules
IanCa Mar 31, 2023
a9a7255
Make fatal wiki errors share formating
IanCa Apr 1, 2023
c8cacea
Merge pull request #642 from IanCa/develop
VisLab Apr 1, 2023
5f05169
dont' sort by hed strings
IanCa Apr 1, 2023
21f6a63
Merge pull request #643 from IanCa/develop
VisLab Apr 1, 2023
0cd8c10
Remove dupes from flatten schema
IanCa Apr 3, 2023
f76c6be
Merge pull request #644 from IanCa/dev_remove_dupes2
VisLab Apr 3, 2023
4770d59
Add more tests, handle more error cases for def gathering
IanCa Apr 3, 2023
9a3e725
Refactor into class
IanCa Apr 4, 2023
b035421
Merge pull request #645 from IanCa/dev_update_expand
VisLab Apr 4, 2023
316a640
Always add an issues list to HedFileError, even when it doesn't have one
IanCa Apr 4, 2023
7e29789
Merge pull request #646 from IanCa/develop
VisLab Apr 4, 2023
c8b5eb1
Updated docs on summary ops
VisLab Apr 6, 2023
cd6d8cd
Merge pull request #647 from VisLab/develop
VisLab Apr 6, 2023
aa1a4e9
Removed from temporary tests
VisLab Apr 6, 2023
672b811
Merge pull request #649 from VisLab/develop
VisLab Apr 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
directory: "/"
target-branch: "develop"
schedule:
interval: "weekly"

- package-ecosystem: gitsubmodule
schedule:
interval: "daily"
target-branch: "develop"
directory: /
automerge: true
44 changes: 44 additions & 0 deletions .github/workflows/spec_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Spec_tests

on:
push:
branches: ["*"]
pull_request:
branches: ["*"]

jobs:
build:
strategy:
matrix:
platform: [ubuntu-latest]
python-version: [3.9]

runs-on: ${{ matrix.platform }}

steps:
- name: Checkout hed-python
uses: actions/checkout@v3
with:
submodules: true

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade --upgrade-strategy eager pip
pip install -r requirements.txt

- name: Test with unittest
run: |
python -m unittest spec_tests/* > test_results.txt
continue-on-error: true

- name: Upload spec test results
uses: actions/upload-artifact@v3
with:
name: spec-test-results
path: test_results.txt

4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "spec_tests/hed-specification"]
path = spec_tests/hed-specification
url = https://github.com/hed-standard/hed-specification/
branch = develop
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 HED Standard Working Group
Copyright (c) 2020+ HED Standard Working Group

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion docs/source/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<li class="toctree-li"><a href="https://www.hed-resources.org/en/latest/">Main resource page</a></li>
<li class="toctree-li"><a href="https://www.hedtags.org">Project home page</a></li>
<li class="toctree-li"><a href="https://www.hedtags.org/display_hed.html">Schema viewer</a></li>
<li class="toctree-li"><a href="https://www.hedtags.org/display_hed_library.html">Library schema viewer</a></li>
<li class="toctree-li"><a href="https://www.hedtags.org/display_hed_prerelease.html">Prerelease schema viewer</a></li>
<li class="toctree-li"><a href="https://hed-specification.readthedocs.io/en/latest/index.html">Specification</a></li>
<li class="toctree-li"><a href="https://hed-examples.readthedocs.io/en/latest/">Examples and tutorials</a></li>
<li class="toctree-li"><a href="https://hedtools.ucsd.edu/hed">Online tools</a></li>
Expand Down
3 changes: 2 additions & 1 deletion hed/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
from hed.models.spreadsheet_input import SpreadsheetInput
from hed.models.tabular_input import TabularInput
from hed.models.sidecar import Sidecar
from hed.models.definition_dict import DefinitionDict


from hed.schema.hed_schema import HedSchema
from hed.schema.hed_schema_group import HedSchemaGroup
from hed.schema.hed_schema_io import get_schema, get_schema_versions, load_schema, load_schema_version

from hed.validator.hed_validator import HedValidator

# from hed import errors, models, schema, tools, validator

Expand Down
2 changes: 1 addition & 1 deletion hed/errors/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .error_reporter import ErrorHandler, get_exception_issue_string, get_printable_issue_string
from .error_reporter import ErrorHandler, get_printable_issue_string, sort_issues
from .error_types import DefinitionErrors, OnsetErrors, SchemaErrors, SchemaWarnings, SidecarErrors, ValidationErrors
from .error_types import ErrorContext, ErrorSeverity
from .exceptions import HedExceptions, HedFileError
Loading