Skip to content

Commit

Permalink
Merge branch 'main' into refactoring/314-Switch-to-poetry
Browse files Browse the repository at this point in the history
* main:
  #318 - Address linter issues

% Conflicts:
%	cassis/json.py
  • Loading branch information
reckart committed May 7, 2024
2 parents 804540d + a76b4e1 commit 29d539d
Showing 1 changed file with 29 additions and 6 deletions.
35 changes: 29 additions & 6 deletions cassis/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,35 @@
from toposort import toposort_flatten

from cassis.cas import NAME_DEFAULT_SOFA, Cas, IdGenerator, Sofa, View
from cassis.typesystem import TYPE_NAME_ANNOTATION, TypeSystem, is_predefined, merge_typesystems, TYPE_NAME_SOFA, \
FEATURE_BASE_NAME_SOFAARRAY, array_type_name_for_type, FEATURE_BASE_NAME_SOFASTRING, FEATURE_BASE_NAME_SOFAID, \
FEATURE_BASE_NAME_SOFAMIME, FEATURE_BASE_NAME_SOFANUM, FEATURE_BASE_NAME_SOFAURI, TYPE_NAME_FS_ARRAY, \
TYPE_NAME_BYTE_ARRAY, TYPE_NAME_FLOAT_ARRAY, TYPE_NAME_DOUBLE_ARRAY, TypeSystemMode, TYPE_NAME_DOCUMENT_ANNOTATION, \
Type, Feature, TYPE_NAME_TOP, is_primitive_array, TYPE_NAME_FLOAT, TYPE_NAME_DOUBLE, \
element_type_name_for_array_type, is_primitive, is_array
from cassis.typesystem import (
TYPE_NAME_ANNOTATION,
TypeSystem,
is_predefined,
merge_typesystems,
TYPE_NAME_SOFA,
FEATURE_BASE_NAME_SOFAARRAY,
array_type_name_for_type,
FEATURE_BASE_NAME_SOFASTRING,
FEATURE_BASE_NAME_SOFAID,
FEATURE_BASE_NAME_SOFAMIME,
FEATURE_BASE_NAME_SOFANUM,
FEATURE_BASE_NAME_SOFAURI,
TYPE_NAME_FS_ARRAY,
TYPE_NAME_BYTE_ARRAY,
TYPE_NAME_FLOAT_ARRAY,
TYPE_NAME_DOUBLE_ARRAY,
TypeSystemMode,
TYPE_NAME_DOCUMENT_ANNOTATION,
Type,
Feature,
TYPE_NAME_TOP,
is_primitive_array,
TYPE_NAME_FLOAT,
TYPE_NAME_DOUBLE,
element_type_name_for_array_type,
is_primitive,
is_array,
)

RESERVED_FIELD_PREFIX = "%"
REF_FEATURE_PREFIX = "@"
Expand Down

0 comments on commit 29d539d

Please sign in to comment.