@@ -50,13 +50,17 @@ jobs:
                   equal: [ master, << pipeline.git.branch >> ]
           steps:
             - run:
-                name: install Flake8 python linter
+                name: install Black Flake8 python linter
                 command: |
-                  pip install --user flake8
+                  pip install --user -r requirements.dev.txt
             - run:
                 name: Lint all python files changed since develop branch
                 command: |
                   flake8 --statistics --config scripts/flake8-config setup.py $(git diff --diff-filter ACM origin/master --name-only | grep 'py$' | grep -v 'experimental/' | grep -v 'experimental_models/')
+            - run:
+                name: Run Black on changed files against master branch
+                command: |
+                  black --check setup.py $(git diff --diff-filter ACM origin/master --name-only | grep 'py$' | grep -v 'experimental/' | grep -v 'experimental_models/')
       - run:
           name: add requirements.txt and requirements.pro.txt to source code
           command: |
@@ -67,7 +71,7 @@ jobs:
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            python3 -m pip install pip==22.0.4 
+            python3 -m pip install pip==22.0.4
             cat requirements.txt | cut -f1 -d"#" | xargs -n 1 -L 1 pip install --progress-bar off
       - run:
           name: edit package version
@@ -122,7 +126,7 @@ jobs:
       - deci-common/git_config_automation_user
       - run:
           name: "commit version file"
-          command: | 
+          command: |
             git commit version.txt -m "Deci Services - Changed version to $NEW_VERSION"
       - deci-common/git_commit_and_tag:
           version: $NEW_VERSION
@@ -227,4 +231,3 @@ workflows:
           requires:
             - "build3.7"
           <<: *release_candidate_filter
-

repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v2.3.0
    hooks:
      - id: check-yaml
      - id: check-toml
      - id: end-of-file-fixer

  - repo: https://github.com/psf/black
    rev: 22.10.0
    hooks:
      - id: black
        args: [ --config=pyproject.toml ]

  - repo: https://github.com/pycqa/flake8
    rev: 5.0.4
    hooks:
      - id: flake8
        args: [ --config=scripts/flake8-config ]

## Super-Gradients configuration for black/mypy/isort etc tools.

[tool.isort]
profile = "black"
multi_line_output = 3
include_trailing_comma = true
force_grid_wrap = 0
use_parentheses = true
ensure_newline_before_comments = true
line_length = 160

## Configuration for Black.
[tool.black]
line-length = 160
target-version = ['py36', 'py37', 'py38', 'py39' ]
include = '\.pyi?$'
exclude = '''
/(
    \.eggs
  | \.git
  | \.circleci
  | \.venv
  | _build
  | buck-out
  | build
  | dist
)/
'''

@@ -1 +1,3 @@
-flake8
+flake8==5.0.4
+black==22.10.0
+pre-commit==2.20.0

@@ -1,5 +1,10 @@
 [flake8]
-ignore = E731, C901, W504 # lambda functions, function too complex, line break after binary operator
+ignore = E731, C901, W503, W504 # lambda functions, function too complex, line break after binary operator
+
+# In order to make flake8 compatible with black formatting
+# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html
+extend-ignore = E203
+
 max-line-length = 160
 max-complexity = 10
 exclude =

@@ -7,9 +7,9 @@
 from setuptools import setup
 from setuptools import find_packages
 
-README_LOCATION = 'README.md'
-REQ_LOCATION = 'requirements.txt'
-REQ_PRO_LOCATION = 'requirements.pro.txt'
+README_LOCATION = "README.md"
+REQ_LOCATION = "requirements.txt"
+REQ_PRO_LOCATION = "requirements.pro.txt"
 VERSION_FILE = "version.txt"
 
 
@@ -35,7 +35,7 @@ def get_version():
 
 
 setup(
-    name='super-gradients',
+    name="super-gradients",
     version=get_version(),
     description="SuperGradients",
     author="Deci AI",
@@ -43,15 +43,15 @@ setup(
     url="https://deci-ai.github.io/super-gradients/welcome.html",
     keywords=["Deci", "AI", "Training", "Deep Learning", "Computer Vision", "PyTorch", "SOTA", "Recipes", "Pre Trained", "Models"],
     install_requires=get_requirements(),
-    packages=find_packages(where='./src'),
-    package_dir={'': 'src'},
+    packages=find_packages(where="./src"),
+    package_dir={"": "src"},
     package_data={
-        'super_gradients.recipes': ['*.yaml', '**/*.yaml'],
-        'super_gradients.common': ['auto_logging/auto_logging_conf.json'],
-        'super_gradients.examples': ['*.ipynb', '**/*.ipynb'],
-        'super_gradients': ['requirements.txt', 'requirements.pro.txt'],
+        "super_gradients.recipes": ["*.yaml", "**/*.yaml"],
+        "super_gradients.common": ["auto_logging/auto_logging_conf.json"],
+        "super_gradients.examples": ["*.ipynb", "**/*.ipynb"],
+        "super_gradients": ["requirements.txt", "requirements.pro.txt"],
     },
     long_description=readme(),
     long_description_content_type="text/markdown",
-    extras_require={"pro": get_pro_requirements()}
+    extras_require={"pro": get_pro_requirements()},
 )