Nilesh Patra pushed to branch upstream at Debian Med / hdmf
Commits: 389da78e by Nilesh Patra at 2021-06-11T00:30:03+05:30 New upstream version 2.5.7 - - - - - 5 changed files: - PKG-INFO - src/hdmf.egg-info/PKG-INFO - src/hdmf/_version.py - src/hdmf/build/__init__.py - src/hdmf/build/classgenerator.py Changes: ===================================== PKG-INFO ===================================== @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: hdmf -Version: 2.5.6 +Version: 2.5.7 Summary: A package for standardizing hierarchical object data Home-page: https://github.com/hdmf-dev/hdmf Author: Andrew Tritt ===================================== src/hdmf.egg-info/PKG-INFO ===================================== @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: hdmf -Version: 2.5.6 +Version: 2.5.7 Summary: A package for standardizing hierarchical object data Home-page: https://github.com/hdmf-dev/hdmf Author: Andrew Tritt ===================================== src/hdmf/_version.py ===================================== @@ -8,11 +8,11 @@ import json version_json = ''' { - "date": "2021-05-24T10:39:21-0700", + "date": "2021-06-04T18:02:01-0700", "dirty": false, "error": null, - "full-revisionid": "f983e800097450c912c72341695394b9aa61f816", - "version": "2.5.6" + "full-revisionid": "1b084d56ca66d73ed05fd83b5657c0824f4b72c5", + "version": "2.5.7" } ''' # END VERSION_JSON ===================================== src/hdmf/build/__init__.py ===================================== @@ -1,5 +1,5 @@ from .builders import Builder, DatasetBuilder, GroupBuilder, LinkBuilder, ReferenceBuilder, RegionBuilder -from .classgenerator import CustomClassGenerator +from .classgenerator import CustomClassGenerator, MCIClassGenerator from .errors import (BuildError, OrphanContainerBuildError, ReferenceTargetNotBuiltError, ContainerConfigurationError, ConstructError) from .manager import BuildManager, TypeMap ===================================== src/hdmf/build/classgenerator.py ===================================== @@ -268,9 +268,10 @@ class CustomClassGenerator: :param spec: The spec for the container class to generate. """ # convert classdict['__fields__'] from list to tuple if present - fields = classdict.get(bases[0]._fieldsname) - if fields is not None: - classdict[bases[0]._fieldsname] = tuple(fields) + for b in bases: + fields = classdict.get(b._fieldsname) + if fields is not None and not isinstance(fields, tuple): + classdict[b._fieldsname] = tuple(fields) # if spec provides a fixed name for this type, remove the 'name' arg from docval_args so that values cannot # be passed for a name positional or keyword arg View it on GitLab: https://salsa.debian.org/med-team/hdmf/-/commit/389da78e3fc75953d113f189c1c256b20ef9af6d -- View it on GitLab: https://salsa.debian.org/med-team/hdmf/-/commit/389da78e3fc75953d113f189c1c256b20ef9af6d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
