style: Correct style of all submodules

* Enforce style in all submodules via ci

Fixes: #173

Signed-off-by: John Andersen <john.s.andersen@intel.com>

Author: John Andersen

.ci/run.sh

@@ -77,7 +77,7 @@ function run_whitespace() {
 }
 
 function run_style() {
-  black --check dffml tests examples
+  black --check .
 }
 
 if [ "x$PLUGIN" != "x" ]; then

CHANGELOG.md

@@ -49,6 +49,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - DNNClassifierModel no longer splits data for the user.
 - Update `pip` in Dockerfile.
 - Restructured documentation
+- Ran `black` on whole codebase, including all submodules
+- CI style check now checks whole codebase
 ### Fixed
 - Docs get version from dffml.version.VERSION.
 - FileSource zipfiles are wrapped with TextIOWrapper because CSVSource expects

feature/auth/dffml_feature_auth/feature/definitions.py

@@ -3,14 +3,8 @@
 from dffml.df.base import Definition
 
 definitions = [
-    Definition(
-        name="UnhashedPassword",
-        primitive="string",
-    ),
-    Definition(
-        name="ScryptPassword",
-        primitive="string",
-    )
+    Definition(name="UnhashedPassword", primitive="string"),
+    Definition(name="ScryptPassword", primitive="string"),
 ]
 
 for definition in definitions:

feature/auth/dffml_feature_auth/feature/log.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2019 Intel Corporation
-'''Logging'''
+"""Logging"""
 import logging
+
 LOGGER = logging.getLogger(__package__)

feature/auth/dffml_feature_auth/feature/operations.py

@@ -5,25 +5,23 @@
 from typing import Dict, Any
 
 from dffml.df.types import Operation
-from dffml.df.base import OperationImplementationContext, \
-                          OperationImplementation
+from dffml.df.base import (
+    OperationImplementationContext,
+    OperationImplementation,
+)
 
 # pylint: disable=no-name-in-module
-from .definitions import UnhashedPassword, \
-                         ScryptPassword
+from .definitions import UnhashedPassword, ScryptPassword
 
 scrypt = Operation(
-    name='scrypt',
-    inputs={
-        'password': UnhashedPassword,
-    },
-    outputs={
-        'password': ScryptPassword
-    },
-    conditions=[])
+    name="scrypt",
+    inputs={"password": UnhashedPassword},
+    outputs={"password": ScryptPassword},
+    conditions=[],
+)
 
-class ScryptContext(OperationImplementationContext):
 
+class ScryptContext(OperationImplementationContext):
     @staticmethod
     def hash_password(password):
         # ---- BEGIN Python hashlib docs ----
@@ -69,7 +67,7 @@ def hash_password(password):
 
         # ---- END RFC 7914 ----
 
-        password = password.encode('utf-8')
+        password = password.encode("utf-8")
 
         salt = os.urandom(16 * 4)
         n = 2 ** 10
@@ -89,13 +87,10 @@ async def run(self, inputs: Dict[str, Any]) -> Dict[str, Any]:
         # we submit to the thread pool. Weird behavior can happen if we raise in
         # there.
         hashed_password, salt = await self.parent.loop.run_in_executor(
-                self.parent.pool, self.hash_password, inputs['password'])
-        return {
-            'password': {
-                'hashed': hashed_password,
-                'salt': salt,
-                }
-            }
+            self.parent.pool, self.hash_password, inputs["password"]
+        )
+        return {"password": {"hashed": hashed_password, "salt": salt}}
+
 
 class Scrypt(OperationImplementation):
 
@@ -108,7 +103,7 @@ def __init__(self, *args, **kwargs):
         self.pool = None
         self.__pool = None
 
-    async def __aenter__(self) -> 'OperationImplementationContext':
+    async def __aenter__(self) -> "OperationImplementationContext":
         self.loop = asyncio.get_event_loop()
         # ProcessPoolExecutor is slightly faster but deprecated and will be
         # removed in 3.9

feature/auth/dffml_feature_auth/version.py

@@ -1 +1 @@
-VERSION = '0.0.1'
+VERSION = "0.0.1"

feature/auth/setup.py

@@ -6,56 +6,50 @@
 
 self_path = os.path.dirname(os.path.realpath(__file__))
 
-with open(os.path.join(self_path, 'dffml_feature_auth', 'version.py'),
-          'r') as f:
+with open(
+    os.path.join(self_path, "dffml_feature_auth", "version.py"), "r"
+) as f:
     for line in f:
-        if line.startswith('VERSION'):
-            version = ast.literal_eval(line.strip().split('=')[-1].strip())
+        if line.startswith("VERSION"):
+            version = ast.literal_eval(line.strip().split("=")[-1].strip())
             break
 
-with open(os.path.join(self_path, 'README.md'), 'r', encoding='utf-8') as f:
+with open(os.path.join(self_path, "README.md"), "r", encoding="utf-8") as f:
     readme = f.read()
 
-INSTALL_REQUIRES = [
-    ]
+INSTALL_REQUIRES = []
 
 setup(
-    name='dffml_feature_auth',
+    name="dffml_feature_auth",
     version=version,
-    description='',
+    description="",
     long_description=readme,
-    long_description_content_type='text/markdown',
-    author='John Andersen',
-    author_email='john.s.andersen@intel.com',
-    url='https://github.com/intel/dffml/blob/master/feature/auth/README.md',
-    license='MIT',
-
-    keywords=[
-        '',
-    ],
-
+    long_description_content_type="text/markdown",
+    author="John Andersen",
+    author_email="john.s.andersen@intel.com",
+    url="https://github.com/intel/dffml/blob/master/feature/auth/README.md",
+    license="MIT",
+    keywords=[""],
     classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'License :: OSI Approved :: Apache Software License',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "License :: OSI Approved :: Apache Software License",
+        "Natural Language :: English",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
-
     install_requires=INSTALL_REQUIRES,
     tests_require=[],
-
     packages=find_packages(),
     entry_points={
-        'dffml.operation': [
-            'scrypt = dffml_feature_auth.feature.operations:scrypt',
+        "dffml.operation": [
+            "scrypt = dffml_feature_auth.feature.operations:scrypt"
         ],
-        'dffml.operation.implementation': [
-            'scrypt = dffml_feature_auth.feature.operations:Scrypt',
+        "dffml.operation.implementation": [
+            "scrypt = dffml_feature_auth.feature.operations:Scrypt"
         ],
     },
 )

feature/auth/tests/test_df.py

@@ -1,11 +1,12 @@
 import random
 
 from dffml.df.types import Operation, Input
-from dffml.df.base import BaseConfig, \
-                          StringInputSetContext
-from dffml.df.memory import MemoryOrchestrator, \
-                            MemoryInputSet, \
-                            MemoryInputSetConfig
+from dffml.df.base import BaseConfig, StringInputSetContext
+from dffml.df.memory import (
+    MemoryOrchestrator,
+    MemoryInputSet,
+    MemoryInputSetConfig,
+)
 
 from dffml.operation.output import GetSingle
 from dffml.util.asynctestcase import AsyncTestCase
@@ -15,25 +16,30 @@
 OPIMPS = [Scrypt, GetSingle.imp]
 OPERATIONS = [Scrypt.op, GetSingle.imp.op]
 
-class TestRunner(AsyncTestCase):
 
+class TestRunner(AsyncTestCase):
     async def test_run(self):
-        passwords = [
-            str(random.random()) for _ in range(0, 20)
-            ]
+        passwords = [str(random.random()) for _ in range(0, 20)]
 
         # Orchestrate the running of these operations
         async with MemoryOrchestrator.basic_config(*OPIMPS) as orchestrator:
 
             definitions = Operation.definitions(*OPERATIONS)
 
-            passwords = [Input(value=password,
-                               definition=definitions['UnhashedPassword'],
-                               parents=None) for password in passwords]
+            passwords = [
+                Input(
+                    value=password,
+                    definition=definitions["UnhashedPassword"],
+                    parents=None,
+                )
+                for password in passwords
+            ]
 
-            output_spec = Input(value=['ScryptPassword'],
-                                definition=definitions['get_single_spec'],
-                                parents=None)
+            output_spec = Input(
+                value=["ScryptPassword"],
+                definition=definitions["get_single_spec"],
+                parents=None,
+            )
 
             async with orchestrator() as octx:
                 # Add our inputs to the input network with the context being the URL
@@ -42,15 +48,18 @@ async def test_run(self):
                         MemoryInputSet(
                             MemoryInputSetConfig(
                                 ctx=StringInputSetContext(password.value),
-                                inputs=[password, output_spec]
+                                inputs=[password, output_spec],
                             )
                         )
                     )
                 try:
-                    async for _ctx, results in octx.run_operations(strict=True):
+                    async for _ctx, results in octx.run_operations(
+                        strict=True
+                    ):
                         self.assertTrue(results)
                 except AttributeError as error:
-                    if "module 'hashlib' has no attribute 'scrypt'" \
-                            in str(error):
+                    if "module 'hashlib' has no attribute 'scrypt'" in str(
+                        error
+                    ):
                         return
                     raise

feature/git/dffml_feature_git/feature/definitions.py

@@ -3,84 +3,31 @@
 from dffml.df.base import Definition
 
 definitions = [
-    Definition(
-        name="quarter_start_date",
-        primitive="int"
-    ),
-    Definition(
-        name="quarter",
-        primitive="int",
-    ),
-    Definition(
-        name="URL",
-        primitive="string",
-    ),
-    Definition(
-        name="valid_git_repository_URL",
-        primitive="boolean",
-    ),
-    Definition(
-        name="git_branch",
-        primitive="str",
-    ),
-    Definition(
-        name="git_repository",
-        primitive="Dict[str, str]",
-        lock=True
-    ),
+    Definition(name="quarter_start_date", primitive="int"),
+    Definition(name="quarter", primitive="int"),
+    Definition(name="URL", primitive="string"),
+    Definition(name="valid_git_repository_URL", primitive="boolean"),
+    Definition(name="git_branch", primitive="str"),
+    Definition(name="git_repository", primitive="Dict[str, str]", lock=True),
     Definition(
         name="git_repository_checked_out",
         primitive="Dict[str, str]",
-        lock=True
-    ),
-    Definition(
-        name="git_commit",
-        primitive="string"
-    ),
-    Definition(
-        name="date",
-        primitive="string"
-    ),
-    Definition(
-        name="no_git_branch_given",
-        primitive="boolean"
-    ),
-    Definition(
-        name="date_pair",
-        primitive="List[date]"
-    ),
-    Definition(
-        name="author_line_count",
-        primitive="Dict[str, int]"
-    ),
-    Definition(
-        name="work_spread",
-        primitive="int"
-    ),
-    Definition(
-        name="release_within_period",
-        primitive="bool"
-    ),
-    Definition(
-        name="lines_by_language_count",
-        primitive="Dict[str, Dict[str, int]]"
-    ),
-    Definition(
-        name="language_to_comment_ratio",
-        primitive="int"
-    ),
-    Definition(
-        name="commit_count",
-        primitive="int"
-    ),
-    Definition(
-        name="author_count",
-        primitive="int"
-    ),
-    Definition(
-        name="date_generator_spec",
-        primitive="Dict[str, Any]"
-    )
+        lock=True,
+    ),
+    Definition(name="git_commit", primitive="string"),
+    Definition(name="date", primitive="string"),
+    Definition(name="no_git_branch_given", primitive="boolean"),
+    Definition(name="date_pair", primitive="List[date]"),
+    Definition(name="author_line_count", primitive="Dict[str, int]"),
+    Definition(name="work_spread", primitive="int"),
+    Definition(name="release_within_period", primitive="bool"),
+    Definition(
+        name="lines_by_language_count", primitive="Dict[str, Dict[str, int]]"
+    ),
+    Definition(name="language_to_comment_ratio", primitive="int"),
+    Definition(name="commit_count", primitive="int"),
+    Definition(name="author_count", primitive="int"),
+    Definition(name="date_generator_spec", primitive="Dict[str, Any]"),
 ]
 
 for definition in definitions:

feature/git/dffml_feature_git/feature/log.py

@@ -1,3 +1,4 @@
-'''Logging'''
+"""Logging"""
 import logging
+
 LOGGER = logging.getLogger(__package__)