reformat code via black (#2100)

.github/workflows/lint.yml

@@ -0,0 +1,27 @@
+name: "Lint"
+
+on: [push, pull_request]
+
+jobs:
+  black:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - uses: psf/black@stable
+
+  flake8:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - run: pip install flake8
+    - run: flake8
+
+  mypy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - run: pip install mypy
+    - run: mypy .

.github/workflows/nose-tests.yml

@@ -1,52 +1,9 @@
-name: "CI"
+name: "Test"
 
 on: [push, pull_request]
 
 jobs:
-
-  lint:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        python-version: [3.6]
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install packages
-      run: ./scripts/tests_setup
-      env:
-        SKIP_SERVER_INSTALL: true
-
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('dev-requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip
-          ${{ runner.os }}-
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip wheel setuptools
-        pip install -r dev-requirements.txt
-
-    - name: Flake8
-      run: flake8
-
-    - name: Mypy
-      run: mypy .
-
   nose:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -82,7 +39,6 @@ jobs:
       run: nosetests --logging-level=ERROR
 
   behave:
-
     runs-on: ubuntu-latest
 
     strategy:

.gitignore

@@ -36,3 +36,5 @@ include/
 /.settings/
 _build
 _build_html
+__pycache__
+.eggs

apps/archive/__init__.py

@@ -17,9 +17,13 @@
 from superdesk.celery_app import celery
 
 from .archive import (
-    ArchiveResource, ArchiveService,
-    ArchiveVersionsResource, ArchiveVersionsService,
-    AutoSaveResource, ArchiveSaveService)
+    ArchiveResource,
+    ArchiveService,
+    ArchiveVersionsResource,
+    ArchiveVersionsService,
+    AutoSaveResource,
+    ArchiveSaveService,
+)
 from .commands import RemoveExpiredContent
 from .ingest import IngestResource, AppIngestService
 from .user_content import UserContentResource, UserContentService
@@ -41,87 +45,88 @@
 
 def init_app(app):
 
-    endpoint_name = 'ingest'
+    endpoint_name = "ingest"
     service = AppIngestService(endpoint_name, backend=superdesk.get_backend())
     IngestResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_versions'
+    endpoint_name = "archive_versions"
     service = ArchiveVersionsService(endpoint_name, backend=superdesk.get_backend())
     ArchiveVersionsResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive'
+    endpoint_name = "archive"
     service = ArchiveService(endpoint_name, backend=superdesk.get_backend())
     ArchiveResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_lock'
+    endpoint_name = "archive_lock"
     service = ArchiveLockService(endpoint_name, backend=superdesk.get_backend())
     ArchiveLockResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_unlock'
+    endpoint_name = "archive_unlock"
     service = ArchiveUnlockService(endpoint_name, backend=superdesk.get_backend())
     ArchiveUnlockResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_spike'
+    endpoint_name = "archive_spike"
     service = ArchiveSpikeService(endpoint_name, backend=superdesk.get_backend())
     ArchiveSpikeResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_unspike'
+    endpoint_name = "archive_unspike"
     service = ArchiveUnspikeService(endpoint_name, backend=superdesk.get_backend())
     ArchiveUnspikeResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'user_content'
+    endpoint_name = "user_content"
     service = UserContentService(endpoint_name, backend=superdesk.get_backend())
     UserContentResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_rewrite'
+    endpoint_name = "archive_rewrite"
     service = ArchiveRewriteService(endpoint_name, backend=superdesk.get_backend())
     ArchiveRewriteResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_correction'
+    endpoint_name = "archive_correction"
     service = ArchiveCorrectionService(endpoint_name, backend=superdesk.get_backend())
     ArchiveCorrectionResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_autosave'
+    endpoint_name = "archive_autosave"
     service = ArchiveSaveService(endpoint_name, backend=superdesk.get_backend())
     AutoSaveResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'archive_related'
+    endpoint_name = "archive_related"
     service = ArchiveRelatedService(endpoint_name, backend=superdesk.get_backend())
     ArchiveRelatedResource(endpoint_name, app=app, service=service)
 
-    endpoint_name = 'news'
+    endpoint_name = "news"
     service = NewsService(endpoint_name, backend=superdesk.get_backend())
     NewsResource(endpoint_name, app=app, service=service)
 
     from apps.item_autosave.components.item_autosave import ItemAutosave
     from apps.item_autosave.models.item_autosave import ItemAutosaveModel
+
     register_component(ItemLock(app))
     register_model(ItemModel(EveProxy(superdesk.get_backend())))
     register_component(ItemAutosave(app))
     register_model(ItemAutosaveModel(EveProxy(superdesk.get_backend())))
 
     superdesk.privilege(
-        name='monitoring_view',
-        label=_('Monitoring view'),
-        description=_('Access to Monitoring view in left toolbar')
+        name="monitoring_view", label=_("Monitoring view"), description=_("Access to Monitoring view in left toolbar")
+    )
+    superdesk.privilege(name="archive", label=_("Create content"), description=_("Create and save content"))
+    superdesk.privilege(name="ingest", label=_("Ingest"), description=_("Access to ingest sources management"))
+    superdesk.privilege(name="spike", label=_("Spike"), description=_("Spike/delete items"))
+    superdesk.privilege(name="spike_read", label=_("Spike view"), description=_("View spiked content"))
+    superdesk.privilege(name="unspike", label=_("Unspike"), description=_("Unspike/undelete content"))
+    superdesk.privilege(name="metadata_uniquename", label=_("Edit Unique Name"), description=_("Edit unique name"))
+    superdesk.privilege(name="hold", label=_("Hold"), description=_("Hold content"))
+    superdesk.privilege(name="restore", label=_("Restore"), description=_("Restore content"))
+    superdesk.privilege(name="rewrite", label=_("Update"), description=_("Create an update"))
+    superdesk.privilege(
+        name="unlock", label=_("Unlock content"), description=_("Unlock locked content by another user")
     )
-    superdesk.privilege(name='archive', label=_('Create content'), description=_('Create and save content'))
-    superdesk.privilege(name='ingest', label=_('Ingest'), description=_('Access to ingest sources management'))
-    superdesk.privilege(name='spike', label=_('Spike'), description=_('Spike/delete items'))
-    superdesk.privilege(name='spike_read', label=_('Spike view'), description=_('View spiked content'))
-    superdesk.privilege(name='unspike', label=_('Unspike'), description=_('Unspike/undelete content'))
-    superdesk.privilege(name='metadata_uniquename', label=_('Edit Unique Name'), description=_('Edit unique name'))
-    superdesk.privilege(name='hold', label=_('Hold'), description=_('Hold content'))
-    superdesk.privilege(name='restore', label=_('Restore'), description=_('Restore content'))
-    superdesk.privilege(name='rewrite', label=_('Update'), description=_('Create an update'))
-    superdesk.privilege(name='unlock',
-                        label=_('Unlock content'),
-                        description=_('Unlock locked content by another user'))
-    superdesk.privilege(name='mark_for_user',
-                        label=_('Mark items for users'),
-                        description=_('User can mark or unmark items for other users'))
-
-    superdesk.intrinsic_privilege(ArchiveUnlockResource.endpoint_name, method=['POST'])
+    superdesk.privilege(
+        name="mark_for_user",
+        label=_("Mark items for users"),
+        description=_("User can mark or unmark items for other users"),
+    )
+
+    superdesk.intrinsic_privilege(ArchiveUnlockResource.endpoint_name, method=["POST"])
 
 
 @celery.task(soft_time_limit=3600)