Merge pull request #24 from CBroz1/main

blackify

Author: kabilar

CHANGELOG.md

@@ -2,10 +2,11 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
-## [unreleased]
+## [0.1.1] - 2022-05-10
 ### Added
 + NWB export
 + Shorten subject primary key to varchar(8)
++ Adopted black formatting into code base
 
 ## [0.1.0b0] - 2021-05-07
 ### Added

element_animal/export/__init__.py

@@ -1 +1 @@
-from .nwb import subject_to_nwb
+from .nwb import subject_to_nwb

element_animal/genotyping.py

@@ -7,8 +7,13 @@
 schema = dj.schema()
 
 
-def activate(genotyping_schema_name, subject_schema_name=None,
-             create_schema=True, create_tables=True, linking_module=None):
+def activate(
+    genotyping_schema_name,
+    subject_schema_name=None,
+    create_schema=True,
+    create_tables=True,
+    linking_module=None,
+):
     """
     activate(genotyping_schema_name, subject_schema_name=None,
              create_schema=True, create_tables=True, linking_module=None)
@@ -33,15 +38,22 @@ def activate(genotyping_schema_name, subject_schema_name=None,
     """
     if isinstance(linking_module, str):
         linking_module = importlib.import_module(linking_module)
-    assert inspect.ismodule(linking_module), "The argument 'dependency' must "\
-                                             + "be a module's name or a module"
-
-    subject.activate(subject_schema_name, create_schema=create_schema,
-                     create_tables=create_tables,
-                     linking_module=linking_module)
-    schema.activate(genotyping_schema_name, create_schema=create_schema,
-                    create_tables=create_tables,
-                    add_objects=linking_module.__dict__)
+    assert inspect.ismodule(linking_module), (
+        "The argument 'dependency' must " + "be a module's name or a module"
+    )
+
+    subject.activate(
+        subject_schema_name,
+        create_schema=create_schema,
+        create_tables=create_tables,
+        linking_module=linking_module,
+    )
+    schema.activate(
+        genotyping_schema_name,
+        create_schema=create_schema,
+        create_tables=create_tables,
+        add_objects=linking_module.__dict__,
+    )
 
 
 @schema

element_animal/subject.py

@@ -6,8 +6,9 @@
 schema = dj.schema()
 
 
-def activate(schema_name, *, create_schema=True, create_tables=True,
-             linking_module=None):
+def activate(
+    schema_name, *, create_schema=True, create_tables=True, linking_module=None
+):
     """
     activate(schema_name, *, create_schema=True, create_tables=True,
              linking_module=None)
@@ -30,12 +31,16 @@ def activate(schema_name, *, create_schema=True, create_tables=True,
     """
     if isinstance(linking_module, str):
         linking_module = importlib.import_module(linking_module)
-    assert inspect.ismodule(linking_module), "The argument 'dependency' must "\
-                                             + "be a module's name or a module"
-
-    schema.activate(schema_name, create_schema=create_schema,
-                    create_tables=create_tables,
-                    add_objects=linking_module.__dict__)
+    assert inspect.ismodule(linking_module), (
+        "The argument 'dependency' must " + "be a module's name or a module"
+    )
+
+    schema.activate(
+        schema_name,
+        create_schema=create_schema,
+        create_tables=create_tables,
+        add_objects=linking_module.__dict__,
+    )
 
 
 @schema

element_animal/version.py

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

setup.py

@@ -2,29 +2,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 Element for Animal 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 animal-management datajoint',
-    packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
+    keywords="neuroscience animal-management datajoint",
+    packages=find_packages(exclude=["contrib", "docs", "tests*"]),
     install_requires=requirements,
 )