Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔧 MAINTAIN: Add isort pre-commit hook #5151

Merged
merged 11 commits into from
Sep 23, 2021
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/system_tests/pytest/test_memory_leaks.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
# For further information please visit http://www.aiida.net #
###########################################################################
"""Utilities for testing memory leakage."""
from tests.utils import processes as test_processes # pylint: disable=no-name-in-module,import-error
from tests.utils.memory import get_instances # pylint: disable=no-name-in-module,import-error
from aiida import orm
from aiida.engine import processes, run_get_node
from aiida.plugins import CalculationFactory
from aiida import orm
from tests.utils import processes as test_processes # pylint: disable=no-name-in-module,import-error
from tests.utils.memory import get_instances # pylint: disable=no-name-in-module,import-error

ArithmeticAddCalculation = CalculationFactory('core.arithmetic.add')

Expand Down
21 changes: 14 additions & 7 deletions .github/system_tests/test_daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,27 @@
import time

from workchains import (
ArithmeticAddBaseWorkChain, CalcFunctionRunnerWorkChain, DynamicDbInput, DynamicMixedInput, DynamicNonDbInput,
ListEcho, NestedInputNamespace, NestedWorkChain, SerializeWorkChain, WorkFunctionRunnerWorkChain
ArithmeticAddBaseWorkChain,
CalcFunctionRunnerWorkChain,
DynamicDbInput,
DynamicMixedInput,
DynamicNonDbInput,
ListEcho,
NestedInputNamespace,
NestedWorkChain,
SerializeWorkChain,
WorkFunctionRunnerWorkChain,
)

from aiida.common import exceptions, StashMode
from aiida.common import StashMode, exceptions
from aiida.engine import run, submit
from aiida.engine.daemon.client import get_daemon_client
from aiida.engine.persistence import ObjectLoader
from aiida.manage.caching import enable_caching
from aiida.engine.processes import Process
from aiida.orm import CalcJobNode, load_node, Int, Str, List, Dict, load_code
from aiida.manage.caching import enable_caching
from aiida.orm import CalcJobNode, Dict, Int, List, Str, load_code, load_node
from aiida.plugins import CalculationFactory, WorkflowFactory
from aiida.workflows.arithmetic.add_multiply import add_multiply, add

from aiida.workflows.arithmetic.add_multiply import add, add_multiply
from tests.utils.memory import get_instances # pylint: disable=import-error

CODENAME_ADD = 'add@localhost'
Expand Down
1 change: 1 addition & 0 deletions .github/system_tests/test_ipython_magics.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
###########################################################################
"""Test the AiiDA iPython magics."""
from IPython.testing.globalipapp import get_ipython

from aiida.tools.ipython.ipython_magics import register_ipython_extension


Expand Down
4 changes: 2 additions & 2 deletions .github/system_tests/test_plugin_testcase.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
Since the dbenv gets loaded on the temporary profile.
"""

import shutil
import sys
import unittest
import tempfile
import shutil
import unittest

from aiida.manage.tests.unittest_classes import PluginTestCase, TestRunner

Expand Down
4 changes: 2 additions & 2 deletions .github/system_tests/test_profile_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
###########################################################################
"""Unittests for TestManager"""
import os
import sys
import unittest
import warnings
import sys

from pgtest import pgtest
import pytest

from aiida.manage.tests import TemporaryProfileManager, TestManagerError, get_test_backend_name
from aiida.common.utils import Capturing
from aiida.manage.tests import TemporaryProfileManager, TestManagerError, get_test_backend_name


class TemporaryProfileManagerTestCase(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion .github/system_tests/test_test_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
# For further information please visit http://www.aiida.net #
###########################################################################
"""Unittests for TestManager"""
import sys
import unittest
import warnings
import sys

import pytest

Expand Down
14 changes: 12 additions & 2 deletions .github/system_tests/workchains.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@
# pylint: disable=invalid-name
"""Work chain implementations for testing purposes."""
from aiida.common import AttributeDict
from aiida.engine import calcfunction, workfunction, WorkChain, ToContext, append_, while_, ExitCode
from aiida.engine import BaseRestartWorkChain, process_handler, ProcessHandlerReport
from aiida.engine import (
BaseRestartWorkChain,
ExitCode,
ProcessHandlerReport,
ToContext,
WorkChain,
append_,
calcfunction,
process_handler,
while_,
workfunction,
)
from aiida.engine.persistence import ObjectLoader
from aiida.orm import Int, List, Str
from aiida.plugins import CalculationFactory
Expand Down
2 changes: 1 addition & 1 deletion .molecule/default/files/polish/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def launch(expression, code, use_calculations, use_calcfunctions, sleep, timeout
If no expression is specified, a random one will be generated that adheres to these rules
"""
# pylint: disable=too-many-arguments,too-many-locals,too-many-statements,too-many-branches
from aiida.orm import Code, Int, Str
from aiida.engine import run_get_node
from aiida.orm import Code, Int, Str

lib_expression = importlib.import_module('lib.expression')
lib_workchain = importlib.import_module('lib.workchain')
Expand Down
2 changes: 1 addition & 1 deletion .molecule/default/files/polish/lib/workchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import hashlib
import os
from pathlib import Path

from string import Template

from .expression import OPERATORS # pylint: disable=relative-beyond-top-level

INDENTATION_WIDTH = 4
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ repos:
- id: check-yaml


- repo: https://github.com/pycqa/isort
rev: 5.9.3
hooks:
- id: isort

- repo: https://github.com/ikamensh/flynt/
rev: '0.66'
hooks:
Expand Down
2 changes: 1 addition & 1 deletion aiida/backends/djsite/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
###########################################################################
# pylint: disable=global-statement
"""Module with implementation of the database backend using Django."""
from aiida.backends.utils import create_sqlalchemy_engine, create_scoped_session_factory
from aiida.backends.utils import create_scoped_session_factory, create_sqlalchemy_engine

ENGINE = None
SESSION_FACTORY = None
Expand Down
2 changes: 1 addition & 1 deletion aiida/backends/djsite/db/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version

Expand Down
5 changes: 3 additions & 2 deletions aiida/backends/djsite/db/migrations/0003_add_link_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
import aiida.common.timezone
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version
import aiida.common.timezone

REVISION = '1.0.3'
DOWN_REVISION = '1.0.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models
from django.db import migrations
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
import aiida.common.timezone
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version
import aiida.common.timezone

REVISION = '1.0.5'
DOWN_REVISION = '1.0.4'
Expand Down
1 change: 1 addition & 0 deletions aiida/backends/djsite/db/migrations/0006_delete_dbpath.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.9'
Expand Down
3 changes: 2 additions & 1 deletion aiida/backends/djsite/db/migrations/0010_process_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.11'
Expand Down
1 change: 1 addition & 0 deletions aiida/backends/djsite/db/migrations/0012_drop_dblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.12'
Expand Down
3 changes: 2 additions & 1 deletion aiida/backends/djsite/db/migrations/0013_django_1_8.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
###########################################################################
# pylint: disable=invalid-name
"""Database migration."""
from django.db import models, migrations
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.13'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""Add a uniqueness constraint to the uuid column of DbNode table."""

from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version
from aiida.common.utils import get_new_uuid

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
# pylint: disable=no-name-in-module,import-error
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.15'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.16'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# pylint: disable=invalid-name
"""Database migration."""
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.17'
Expand Down
3 changes: 2 additions & 1 deletion aiida/backends/djsite/db/migrations/0018_django_1_11.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
# Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
# pylint: disable=no-name-in-module,import-error
from django.db import migrations, models
import aiida.common.utils

from aiida.backends.djsite.db.migrations import upgrade_schema_version
import aiida.common.utils

REVISION = '1.0.18'
DOWN_REVISION = '1.0.17'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
# pylint: disable=no-name-in-module,import-error
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.20'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

# pylint: disable=no-name-in-module,import-error
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.21'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

# pylint: disable=no-name-in-module,import-error
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.22'
Expand Down
5 changes: 3 additions & 2 deletions aiida/backends/djsite/db/migrations/0024_dblog_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@
# pylint: disable=invalid-name
"""Migration for the update of the DbLog table. Addition of uuids"""
import sys
import click

import click
# Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
# pylint: disable=no-name-in-module,import-error
from django.db import migrations, models

from aiida.backends.djsite.db.migrations import upgrade_schema_version
from aiida.backends.general.migrations.utils import dumps_json
from aiida.common.utils import get_new_uuid
from aiida.cmdline.utils import echo
from aiida.common.utils import get_new_uuid
from aiida.manage import configuration

REVISION = '1.0.24'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed
# pylint: disable=no-name-in-module,import-error
from django.db import migrations

from aiida.backends.djsite.db.migrations import upgrade_schema_version

REVISION = '1.0.25'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

from aiida.backends.djsite.db.migrations import upgrade_schema_version
from aiida.backends.general.migrations.utils import load_numpy_array_from_repository

from . import ModelModifierV0025

REVISION = '1.0.26'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

from aiida.backends.djsite.db.migrations import upgrade_schema_version
from aiida.backends.general.migrations import utils

from . import ModelModifierV0025

REVISION = '1.0.27'
Expand Down
Loading