Merge pull request #25 from CBroz1/main

blackify

Author: kabilar

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.1.1] - 2022-05-10
+### Added
++ Adopted black formatting into code base
+
 ## [0.1.0b1] - 2022-01-28
 ### Added
 + Added functions to generate dictionaries for NWB export.

element_lab/export/nwb.py

@@ -9,8 +9,8 @@ def lab_to_nwb_dict(lab_key):
     """
     lab_info = (lab.Lab & lab_key).fetch1()
     return dict(
-        institution=lab_info.get('institution'),
-        lab=lab_info.get('lab_name'),
+        institution=lab_info.get("institution"),
+        lab=lab_info.get("lab_name"),
     )
 
 
@@ -23,11 +23,13 @@ def project_to_nwb_dict(project_key):
     """
     project_info = (lab.Project & project_key).fetch1()
     return dict(
-        experiment_description=project_info.get('project_description'),
-        keywords=(lab.ProjectKeywords() & project_key
-                  ).fetch('keyword').tolist() or None,
-        related_publications=(lab.ProjectPublication() & project_key
-                              ).fetch('publication').tolist() or None
+        experiment_description=project_info.get("project_description"),
+        keywords=(lab.ProjectKeywords() & project_key).fetch("keyword").tolist()
+        or None,
+        related_publications=(lab.ProjectPublication() & project_key)
+        .fetch("publication")
+        .tolist()
+        or None,
     )
 
 
@@ -39,8 +41,8 @@ def protocol_to_nwb_dict(protocol_key):
     """
     protocol_info = (lab.Protocol & protocol_key).fetch1()
     return dict(
-        protocol=protocol_info.get('protocol'),
-        notes=protocol_info.get('protocol_description')
+        protocol=protocol_info.get("protocol"),
+        notes=protocol_info.get("protocol_description"),
     )
 
 
@@ -63,15 +65,17 @@ def element_lab_to_nwb_dict(lab_key=None, project_key=None, protocol_key=None):
     :return: dictionary with NWB parameters
     """
     # Validate input
-    assert any([lab_key, project_key, protocol_key]), 'Must specify one key.'
-    assert lab_key is None or len(lab.Lab & lab_key) == 1, \
-        'Multiple labs error! The lab_key should specify only one lab.'
-    assert project_key is None or len(lab.Project & project_key) == 1, \
-        'Multiple projects error! The project_key should specify only one '\
-        'project.'
-    assert protocol_key is None or len(lab.Protocol & protocol_key) == 1, \
-        'Multiple protocols error! The protocol_key should specify only one '\
-        'protocol.'
+    assert any([lab_key, project_key, protocol_key]), "Must specify one key."
+    assert (
+        lab_key is None or len(lab.Lab & lab_key) == 1
+    ), "Multiple labs error! The lab_key should specify only one lab."
+    assert project_key is None or len(lab.Project & project_key) == 1, (
+        "Multiple projects error! The project_key should specify only one " "project."
+    )
+    assert protocol_key is None or len(lab.Protocol & protocol_key) == 1, (
+        "Multiple protocols error! The protocol_key should specify only one "
+        "protocol."
+    )
 
     element_info = dict()
     if lab_key:

element_lab/lab.py

@@ -13,8 +13,9 @@ def activate(schema_name, create_schema=True, create_tables=True):
         :param create_tables: when True (default), create tables in the
                               database if they do not yet exist.
     """
-    schema.activate(schema_name, create_schema=create_schema,
-                    create_tables=create_tables)
+    schema.activate(
+        schema_name, create_schema=create_schema, create_tables=create_tables
+    )
 
 
 @schema

element_lab/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = '0.1.0b1'
+__version__ = "0.1.1"

setup.py

@@ -1,29 +1,29 @@
 from setuptools import setup, find_packages
 from os import path
 
-pkg_name = next(p for p in find_packages() if '.' not in p)
+pkg_name = next(p for p in find_packages() if "." not in p)
 here = path.abspath(path.dirname(__file__))
 
-with open(path.join(here, 'README.md'), 'r') as f:
+with open(path.join(here, "README.md"), "r") as f:
     long_description = f.read()
 
-with open(path.join(here, 'requirements.txt')) as f:
+with open(path.join(here, "requirements.txt")) as f:
     requirements = f.read().splitlines()
 
-with open(path.join(here, pkg_name, 'version.py')) as f:
+with open(path.join(here, pkg_name, "version.py")) as f:
     exec(f.read())
 
 setup(
-    name=pkg_name.replace('_', '-'),
+    name=pkg_name.replace("_", "-"),
     version=__version__,
     description="DataJoint Elements for Lab Management",
     long_description=long_description,
-    long_description_content_type = 'text/markdown',
-    author='DataJoint',
-    author_email='[email protected]',
-    license='MIT',
+    long_description_content_type="text/markdown",
+    author="DataJoint",
+    author_email="[email protected]",
+    license="MIT",
     url=f'https://github.com/datajoint/{pkg_name.replace("_", "-")}',
-    keywords='neuroscience lab management datajoint',
-    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
+    keywords="neuroscience lab management datajoint",
+    packages=find_packages(exclude=["contrib", "docs", "tests*"]),
     install_requires=requirements,
 )