use Black (#634)

* use Black * - autopep8 * precommit Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Lightning-Universe · Aug 5, 2021 · 4ebb087 · 4ebb087
1 parent 8e42d39
commit 4ebb087
Show file tree

Hide file tree

Showing 214 changed files with 2,478 additions and 2,739 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -17,7 +17,3 @@ enabled = true
   [analyzers.meta]
   runtime_version = "3.x.x"
   max_line_length = 120
-
-[[transformers]]
-name = "autopep8"
-enabled = true
diff --git a/.github/workflows/code-format.yml b/.github/workflows/code-format.yml
@@ -23,36 +23,6 @@ jobs:
       - name: PEP8
         run: flake8 .
 
-  #format-check-yapf:
-  #  runs-on: ubuntu-20.04
-  #  steps:
-  #    - uses: actions/checkout@master
-  #    - uses: actions/setup-python@v2
-  #      with:
-  #        python-version: 3.8
-  #    - name: Install dependencies
-  #      run: |
-  #        pip install --upgrade pip
-  #        pip install yapf
-  #        pip list
-  #      shell: bash
-  #    - name: yapf
-  #      run: yapf --diff --parallel --recursive .
-
-  #imports-check-isort:
-  #  runs-on: ubuntu-20.04
-  #  steps:
-  #    - uses: actions/checkout@master
-  #    - uses: actions/setup-python@v2
-  #      with:
-  #        python-version: 3.8
-  #    - name: Install isort
-  #      run: |
-  #        pip install isort
-  #        pip list
-  #    - name: isort
-  #      run: isort --check-only .
-
   #typing-check-mypy:
   #  runs-on: ubuntu-20.04
   #  steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -35,26 +35,12 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.9.1
+    rev: 5.9.3
     hooks:
       - id: isort
         name: imports
         require_serial: false
 
-  - repo: https://github.com/pre-commit/mirrors-yapf
-    rev: v0.31.0
-    hooks:
-      - id: yapf
-        name: formatting
-        language: python
-        require_serial: false
-
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
-    hooks:
-      - id: flake8
-        name: PEP8
-
   - repo: https://github.com/kynan/nbstripout
     rev: 0.5.0
     hooks:
@@ -65,3 +51,15 @@ repos:
     hooks:
       - id: docformatter
         args: [--in-place, --wrap-summaries=115, --wrap-descriptions=120]
+
+  - repo: https://github.com/psf/black
+    rev: 21.7b0
+    hooks:
+      - id: black
+        name: Format code
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+        name: PEP8
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -17,7 +17,7 @@
 import pt_lightning_sphinx_theme
 
 _PATH_HERE = os.path.abspath(os.path.dirname(__file__))
-_PATH_ROOT = os.path.join(_PATH_HERE, '..', '..')
+_PATH_ROOT = os.path.join(_PATH_HERE, "..", "..")
 sys.path.insert(0, os.path.abspath(_PATH_ROOT))
 
 try:
@@ -33,9 +33,9 @@ def _load_py_module(fname, pkg="flash"):
 
     about = _load_py_module("__about__.py")
 
-SPHINX_MOCK_REQUIREMENTS = int(os.environ.get('SPHINX_MOCK_REQUIREMENTS', True))
+SPHINX_MOCK_REQUIREMENTS = int(os.environ.get("SPHINX_MOCK_REQUIREMENTS", True))
 
-html_favicon = '_static/images/icon.svg'
+html_favicon = "_static/images/icon.svg"
 
 # -- Project information -----------------------------------------------------
 
@@ -49,22 +49,22 @@ def _load_py_module(fname, pkg="flash"):
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
     # 'sphinx.ext.coverage',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.autosummary',
-    'sphinx.ext.napoleon',
-    'sphinx.ext.imgmath',
-    'recommonmark',
+    "sphinx.ext.viewcode",
+    "sphinx.ext.autosummary",
+    "sphinx.ext.napoleon",
+    "sphinx.ext.imgmath",
+    "recommonmark",
     # 'sphinx.ext.autosectionlabel',
     # 'nbsphinx',  # it seems some sphinx issue
-    'sphinx_autodoc_typehints',
-    'sphinx_copybutton',
-    'sphinx_paramlinks',
-    'sphinx_togglebutton',
+    "sphinx_autodoc_typehints",
+    "sphinx_copybutton",
+    "sphinx_paramlinks",
+    "sphinx_togglebutton",
 ]
 
 # autodoc: Default to members and undoc-members
@@ -114,8 +114,8 @@ def _load_py_module(fname, pkg="flash"):
 # documentation.
 
 html_theme_options = {
-    'pytorch_project': 'https://pytorchlightning.ai',
-    'canonical_url': about.__docs_url__,
+    "pytorch_project": "https://pytorchlightning.ai",
+    "canonical_url": about.__docs_url__,
     "collapse_navigation": False,
     "display_version": True,
     "logo_only": False,
@@ -132,47 +132,47 @@ def _load_py_module(fname, pkg="flash"):
 def setup(app):
     # this is for hiding doctest decoration,
     # see: http://z4r.github.io/python/2011/12/02/hides-the-prompts-and-output/
-    app.add_js_file('copybutton.js')
-    app.add_css_file('main.css')
+    app.add_js_file("copybutton.js")
+    app.add_css_file("main.css")
 
 
 # Ignoring Third-party packages
 # https://stackoverflow.com/questions/15889621/sphinx-how-to-exclude-imports-in-automodule
 def _package_list_from_file(pfile):
     assert os.path.isfile(pfile)
-    with open(pfile, 'r') as fp:
+    with open(pfile, "r") as fp:
         lines = fp.readlines()
     list_pkgs = []
     for ln in lines:
-        found = [ln.index(ch) for ch in list(',=<>#@') if ch in ln]
-        pkg = ln[:min(found)] if found else ln
+        found = [ln.index(ch) for ch in list(",=<>#@") if ch in ln]
+        pkg = ln[: min(found)] if found else ln
         if pkg.strip():
             list_pkgs.append(pkg.strip())
     return list_pkgs
 
 
 # define mapping from PyPI names to python imports
 PACKAGE_MAPPING = {
-    'pytorch-lightning': 'pytorch_lightning',
-    'scikit-learn': 'sklearn',
-    'Pillow': 'PIL',
-    'PyYAML': 'yaml',
-    'rouge-score': 'rouge_score',
-    'lightning-bolts': 'pl_bolts',
-    'pytorch-tabnet': 'pytorch_tabnet',
-    'pyDeprecate': 'deprecate',
+    "pytorch-lightning": "pytorch_lightning",
+    "scikit-learn": "sklearn",
+    "Pillow": "PIL",
+    "PyYAML": "yaml",
+    "rouge-score": "rouge_score",
+    "lightning-bolts": "pl_bolts",
+    "pytorch-tabnet": "pytorch_tabnet",
+    "pyDeprecate": "deprecate",
 }
 MOCK_PACKAGES = []
 if SPHINX_MOCK_REQUIREMENTS:
     # mock also base packages when we are on RTD since we don't install them there
-    MOCK_PACKAGES += _package_list_from_file(os.path.join(_PATH_ROOT, 'requirements.txt'))
+    MOCK_PACKAGES += _package_list_from_file(os.path.join(_PATH_ROOT, "requirements.txt"))
 # replace PyPI packages by importing ones
 MOCK_PACKAGES = [PACKAGE_MAPPING.get(pkg, pkg) for pkg in MOCK_PACKAGES]
 
 autodoc_mock_imports = MOCK_PACKAGES
 
 # only run doctests marked with a ".. doctest::" directive
-doctest_test_doctest_blocks = ''
+doctest_test_doctest_blocks = ""
 doctest_global_setup = """
 import torch
 import pytorch_lightning as pl

diff --git a/flash/__about__.py b/flash/__about__.py
@@ -1,7 +1,7 @@
 __version__ = "0.4.1dev"
 __author__ = "PyTorchLightning et al."
 __author_email__ = "[email protected]"
-__license__ = 'Apache-2.0'
+__license__ = "Apache-2.0"
 __copyright__ = f"Copyright (c) 2020-2021, f{__author__}."
 __homepage__ = "https://github.com/PyTorchLightning/lightning-flash"
 __docs_url__ = "https://lightning-flash.readthedocs.io/en/stable/"

diff --git a/flash/__init__.py b/flash/__init__.py
@@ -33,6 +33,7 @@
 
     if _IS_TESTING:
         from pytorch_lightning import seed_everything
+
         seed_everything(42)
 
     __all__ = [

diff --git a/flash/__main__.py b/flash/__main__.py
@@ -24,15 +24,16 @@ def main():
 
 
 def register_command(command):
-
-    @main.command(context_settings=dict(
-        help_option_names=[],
-        ignore_unknown_options=True,
-    ))
-    @click.argument('cli_args', nargs=-1, type=click.UNPROCESSED)
+    @main.command(
+        context_settings=dict(
+            help_option_names=[],
+            ignore_unknown_options=True,
+        )
+    )
+    @click.argument("cli_args", nargs=-1, type=click.UNPROCESSED)
     @functools.wraps(command)
     def wrapper(cli_args):
-        with patch('sys.argv', [command.__name__] + list(cli_args)):
+        with patch("sys.argv", [command.__name__] + list(cli_args)):
             command()
 
 
@@ -63,5 +64,5 @@ def wrapper(cli_args):
     except ImportError:
         pass
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/flash/audio/classification/cli.py b/flash/audio/classification/cli.py
@@ -44,12 +44,12 @@ def audio_classification():
         AudioClassificationData,
         default_datamodule_builder=from_urban8k,
         default_arguments={
-            'trainer.max_epochs': 3,
-        }
+            "trainer.max_epochs": 3,
+        },
     )
 
     cli.trainer.save_checkpoint("audio_classification_model.pt")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     audio_classification()
diff --git a/flash/audio/classification/data.py b/flash/audio/classification/data.py
@@ -24,7 +24,6 @@
 
 
 class AudioClassificationPreprocess(Preprocess):
-
     @requires_extras(["audio", "image"])
     def __init__(
         self,
@@ -35,7 +34,7 @@ def __init__(
         spectrogram_size: Tuple[int, int] = (196, 196),
         time_mask_param: int = 80,
         freq_mask_param: int = 80,
-        deserializer: Optional['Deserializer'] = None,
+        deserializer: Optional["Deserializer"] = None,
     ):
         self.spectrogram_size = spectrogram_size
         self.time_mask_param = time_mask_param
@@ -48,7 +47,7 @@ def __init__(
             predict_transform=predict_transform,
             data_sources={
                 DefaultDataSources.FILES: ImagePathsDataSource(),
-                DefaultDataSources.FOLDERS: ImagePathsDataSource()
+                DefaultDataSources.FOLDERS: ImagePathsDataSource(),
             },
             deserializer=deserializer or ImageDeserializer(),
             default_data_source=DefaultDataSources.FILES,

diff --git a/flash/audio/classification/transforms.py b/flash/audio/classification/transforms.py
@@ -41,13 +41,14 @@ def default_transforms(spectrogram_size: Tuple[int, int]) -> Dict[str, Callable]
     }
 
 
-def train_default_transforms(spectrogram_size: Tuple[int, int], time_mask_param: int,
-                             freq_mask_param: int) -> Dict[str, Callable]:
+def train_default_transforms(
+    spectrogram_size: Tuple[int, int], time_mask_param: int, freq_mask_param: int
+) -> Dict[str, Callable]:
     """During training we apply the default transforms with additional ``TimeMasking`` and ``Frequency Masking``"""
     transforms = {
         "post_tensor_transform": nn.Sequential(
             ApplyToKeys(DefaultDataKeys.INPUT, TAudio.TimeMasking(time_mask_param=time_mask_param)),
-            ApplyToKeys(DefaultDataKeys.INPUT, TAudio.FrequencyMasking(freq_mask_param=freq_mask_param))
+            ApplyToKeys(DefaultDataKeys.INPUT, TAudio.FrequencyMasking(freq_mask_param=freq_mask_param)),
         )
     }
 

diff --git a/flash/audio/speech_recognition/cli.py b/flash/audio/speech_recognition/cli.py
@@ -47,13 +47,13 @@ def speech_recognition():
         SpeechRecognitionData,
         default_datamodule_builder=from_timit,
         default_arguments={
-            'trainer.max_epochs': 3,
+            "trainer.max_epochs": 3,
         },
         finetune=False,
     )
 
     cli.trainer.save_checkpoint("speech_recognition_model.pt")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     speech_recognition()