feat: black & isort common workflow

.github/workflows/annotation.yml

@@ -19,17 +19,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Run isort
-        uses: isort/isort-action@v1.1.0
-        with:
-          configuration:
-            --profile=black
-            --filter-files
-            --line-length=79
-      - name: Black
-        uses: psf/black@stable
-        with:
-          options: "--line-length=79"
       - run: pip install flake8
       - run: flake8 --extend-ignore=E203 annotation
   annotation-build:

.github/workflows/assets.yml

@@ -21,17 +21,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Run isort
-        uses: isort/isort-action@v1.1.0
-        with:
-          configuration:
-            --profile=black
-            --filter-files
-            --line-length=79
-      - name: Black
-        uses: psf/black@stable
-        with:
-          options: "--line-length=79"
       - run: pip install flake8
       - run: flake8 --extend-ignore=E203 assets
   assets-build:

.github/workflows/convert.yml

@@ -26,10 +26,11 @@ jobs:
            poetry install --all-extras
            poetry add --editable ../lib/filter_lib
            poetry add --editable ../lib/tenants
-      - name: Run linters and checkers [isort -> black -> mypy -> pylint]
+      - name: Run linters and checkers [mypy -> pylint]
         working-directory: ./convert
         run: |
-          git ls-files -- . | xargs pre-commit run --files
+          git ls-files -- . | xargs pre-commit run mypy --files
+          git ls-files -- . | xargs pre-commit run pylint --files
       - name: Run tests
         working-directory: ./convert
         run: |

.github/workflows/filter-lib.yml

@@ -21,20 +21,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Run isort
-        uses: isort/isort-action@v1.1.0
-        with:
-          sort-paths: lib/filter_lib/*
-          configuration:
-            --check-only
-            --profile=black
-            --line-length=79
-            --skip=tests
-      - name: Black
-        uses: psf/black@stable
-        with:
-          src: "lib/filter_lib"
-          options: '--check --line-length=79 --exclude="tests" --verbose'
       - run: pip install flake8
       - run: flake8 --exclude=tests --extend-ignore=E203 lib/filter_lib
   filter-lib-build:

.github/workflows/jobs.yml

@@ -28,12 +28,10 @@ jobs:
            poetry install --no-root
            poetry add ../lib/filter_lib
            poetry add ../lib/tenants
-       - name: Run linters and checkers [flake8 -> isort -> black]
+       - name: Run linters and checkers [flake8]
          working-directory: ./jobs
          run: |
            poetry run flake8 --extend-ignore=E203 jobs/
-           poetry run isort --profile=black --line-length=79 --check-only jobs/
-           poetry run black --check --line-length=79 jobs/
        - name: Run tests
          working-directory: ./jobs
          run: |

.github/workflows/lint.yml

@@ -0,0 +1,33 @@
+name: Lint
+on:
+  pull_request:
+    paths:
+      - "**.py"
+      - ".github/workflows/lint.yml"
+
+env:
+  PYTHON_VERSION: 3.8
+  LINT_CONFIG: pyproject.toml
+
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Install python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install poetry
+          poetry install --only dev
+      - name: Run Isort
+        run: |
+          poetry run isort --diff --check-only .
+      - name: Run Black
+        run: |
+          poetry run black --config $LINT_CONFIG --diff --check .

.github/workflows/processing.yml

@@ -21,17 +21,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Run isort
-        uses: isort/isort-action@v1.1.0
-        with:
-          configuration:
-            --profile=black
-            --filter-files
-            --line-length=79
-      - name: Black
-        uses: psf/black@stable
-        with:
-          options: "--line-length=79"
       - run: pip install flake8
       - run: flake8 --extend-ignore=E203 processing
 

.github/workflows/taxonomy.yml

@@ -28,12 +28,10 @@ jobs:
            poetry install --no-root
            poetry add ../lib/filter_lib
            poetry add ../lib/tenants
-       - name: Run linters and checkers [flake8 -> isort -> black]
+       - name: Run linters and checkers [flake8]
          working-directory: ./taxonomy
          run: |
            poetry run flake8 --extend-ignore=E203 taxonomy/
-           poetry run isort --profile=black --line-length=79 --check-only taxonomy/
-           poetry run black --check --line-length=79 taxonomy/
        - name: Run tests
          working-directory: ./taxonomy
          run: |

.github/workflows/tenants.yml

@@ -21,20 +21,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
-      - name: Run isort
-        uses: isort/isort-action@v1.1.0
-        with:
-          sort-paths: lib/tenants/*
-          configuration:
-            --check-only
-            --profile=black
-            --line-length=79
-            --skip=tests
-      - name: Black
-        uses: psf/black@stable
-        with:
-          src: "lib/tenants"
-          options: '--check --line-length=79 --exclude="tests" --verbose'
       - run: pip install flake8
       - run: flake8 --exclude=tests --extend-ignore=E203 lib/tenants
   tenants-build:

.github/workflows/users.yml

@@ -28,12 +28,10 @@ jobs:
            pip install poetry>=1.1.13
            poetry install --no-root
            poetry add ../lib/tenants
-       - name: Run linters and checkers [flake8 -> isort -> black]
+       - name: Run linters and checkers [flake8]
          working-directory: ./users
          run: |
            poetry run flake8 --extend-ignore=E203 users/
-           poetry run isort --profile=black --line-length=79 --check-only users/
-           poetry run black --check --line-length=79 users/
        - name: Run tests
          working-directory: ./users
          run: |

airflow/dags/print_operator.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 from pprint import pprint
 
-from airflow.decorators import task, dag
+from airflow.decorators import dag, task
 
 
 @dag(schedule="@daily", start_date=datetime(2021, 12, 1), catchup=False, dag_id="print")

annotation/alembic/env.py

@@ -1,9 +1,9 @@
 import os
 from logging.config import fileConfig
 
+from alembic import context  # type: ignore
 from sqlalchemy import engine_from_config, pool
 
-from alembic import context  # type: ignore
 from annotation.database import SQLALCHEMY_DATABASE_URL
 from annotation.utils import get_test_db_url
 

annotation/alembic/versions/1edef72a5043_add_categories_editor_url_data_.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "1edef72a5043"

annotation/alembic/versions/2b3ed53127ea_alter_categories_id_integer_to_varchar.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.engine.reflection import Inspector
-
 from alembic import op
+from sqlalchemy.engine.reflection import Inspector
 
 # revision identifiers, used by Alembic.
 revision = "2b3ed53127ea"

annotation/alembic/versions/3136551008d8_agreement_metrics_relation.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "3136551008d8"

annotation/alembic/versions/36bff2d016f7_expand_validationschema.py

@@ -9,9 +9,8 @@
 from enum import Enum
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "36bff2d016f7"

annotation/alembic/versions/3a083a1fbba0_first_revision.py

@@ -7,11 +7,10 @@
 """
 
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.engine.reflection import Inspector
 
-from alembic import op
-
 # revision identifiers, used by Alembic.
 revision = "3a083a1fbba0"
 down_revision = None

annotation/alembic/versions/416952520dc1_add_name_and_job_type_to_job_model.py

@@ -9,9 +9,8 @@
 from enum import Enum
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "416952520dc1"

annotation/alembic/versions/4272d0a43ff1_agreement_score.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "4272d0a43ff1"

annotation/alembic/versions/4cd10ac49cc2_expand_annotated_doc.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "4cd10ac49cc2"

annotation/alembic/versions/615379303da2_added_links_json.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "615379303da2"

annotation/alembic/versions/62470ebd1429_change_links_json_server_default.py

@@ -7,9 +7,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "62470ebd1429"

annotation/alembic/versions/66cd6054c2d0_add_categories_tree.py

@@ -8,7 +8,6 @@
 
 import sqlalchemy as sa
 import sqlalchemy_utils
-
 from alembic import op
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/6fb3e0d231ff_create_document_links_table.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/71095b8e6343_add_extensive_coverage_parameter.py

@@ -7,8 +7,8 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
+
 from annotation.models import ValidationSchema
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/7cc1ed83c309_compare_agreement_scores.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/8ea2ff0fea64_create_association_doc_category_table.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/8fbac489cef2_category_change_editor_data_attributes.py

@@ -8,9 +8,8 @@
 """
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "8fbac489cef2"

annotation/alembic/versions/9083dea3783e_make_document_categories_an_array_of_.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 
 # revision identifiers, used by Alembic.

annotation/alembic/versions/9c07a25ca06f_expand_file_model.py

@@ -9,9 +9,8 @@
 from enum import Enum
 
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "9c07a25ca06f"

annotation/alembic/versions/bda0eac5ce64_adds_overall_load_field_not_negative_.py

@@ -7,7 +7,6 @@
 """
 
 import sqlalchemy as sa
-
 from alembic import op
 
 # revision identifiers, used by Alembic.