[med-svn] [Git][med-team/hdmf][master] 3 commits: New upstream version 2.5.7

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / hdmf


Commits:
389da78e by Nilesh Patra at 2021-06-11T00:30:03+05:30
New upstream version 2.5.7
- - - - -
ba182405 by Nilesh Patra at 2021-06-11T00:30:07+05:30
Update upstream source from tag 'upstream/2.5.7'

Update to upstream version '2.5.7'
with Debian dir 1dce89545bb1337d2574cc2dd0b869db06de6e2f
- - - - -
5832a59d by Nilesh Patra at 2021-06-11T00:30:57+05:30
Interim changelog entry

- - - - -


6 changed files:

- PKG-INFO
- debian/changelog
- 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


=====================================
debian/changelog
=====================================
@@ -1,11 +1,11 @@
-hdmf (2.5.6-1) UNRELEASED; urgency=medium
+hdmf (2.5.7-1) UNRELEASED; urgency=medium
 
   * Team Upload.
-  * New upstream version 2.5.6
+  * New upstream version 2.5.7
   * Fix copyright
   * d/rules: set LC_ALL to C.UTF-8 to make build reproducible
 
- -- Nilesh Patra <nilesh at debian.org>  Tue, 18 May 2021 23:30:29 +0530
+ -- Nilesh Patra <nilesh at debian.org>  Fri, 11 Jun 2021 00:30:31 +0530
 
 hdmf (2.3.0-1) unstable; urgency=medium
 


=====================================
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/-/compare/e7bdeafc265ad5df404c764d43e82a3c28cd1367...5832a59d1ec6f5a455d83ce29abde38446b30230

-- 
View it on GitLab: https://salsa.debian.org/med-team/hdmf/-/compare/e7bdeafc265ad5df404c764d43e82a3c28cd1367...5832a59d1ec6f5a455d83ce29abde38446b30230
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210610/3bae58be/attachment-0001.htm>