Use different version for pylint-django for python 2 and 3

Starting from `pylint-django>=2.0` only `pylint>=2.0` is supported which
has dropped support for python 2. As a result we need to depend on
different version of `pylint-django` based on the version of python.

With the new version of `pylint` a lot of new checks are added that had
to be either corrected or disabled. Given that some of these checks only
are valid for `pylint>=2.0`, they will trigger a warning in the
pre-commit for python 2. For this reason we have to temporarily disable
the `bad-option-value` globally in the `.pylintrc`. When support for
python 2 is dropped, this should be removed.

.pylintrc

@@ -50,7 +50,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=bad-continuation,locally-disabled,useless-suppression,django-not-available
+disable=bad-continuation,locally-disabled,useless-suppression,django-not-available,bad-option-value
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

aiida/backends/djsite/db/migrations/0020_provenance_redesign.py

@@ -75,7 +75,6 @@ def detect_unexpected_links(apps, schema_editor):
 
 def reverse_code(apps, schema_editor):
     """Reversing the inference of the process type is not possible and not necessary."""
-    pass
 
 
 class Migration(migrations.Migration):

aiida/backends/djsite/utils.py

@@ -75,6 +75,7 @@ def check_schema_version(profile_name=None):
     :raise ConfigurationError: if the two schema versions do not match.
       Otherwise, just return.
     """
+    # pylint: disable=duplicate-string-formatting-argument
     from django.db import connection
 
     import aiida.backends.djsite.db.models

aiida/backends/tests/common/test_hashing.py

@@ -193,7 +193,7 @@ def test_numpy_arrays(self):
 
     def test_unhashable_type(self):
 
-        class MadeupClass(object):
+        class MadeupClass(object):  # pylint: disable=useless-object-inheritance
             pass
 
         with self.assertRaises(ValueError):

aiida/backends/tests/orm/node/test_node.py

@@ -213,7 +213,7 @@ def test_node_indegree_unique_pair(self):
         called.add_incoming(data, link_type=LinkType.INPUT_CALC, link_label='call')
         called.store()
 
-        uuids_incoming = set([node.uuid for node in called.get_incoming().all_nodes()])
+        uuids_incoming = set(node.uuid for node in called.get_incoming().all_nodes())
         uuids_expected = set([caller.uuid, data.uuid])
         self.assertEqual(uuids_incoming, uuids_expected)
 
@@ -232,7 +232,7 @@ def test_node_indegree_unique_triple(self):
         data.add_incoming(return_two, link_type=LinkType.RETURN, link_label='return')
         data.store()
 
-        uuids_incoming = set([node.uuid for node in data.get_incoming().all_nodes()])
+        uuids_incoming = set(node.uuid for node in data.get_incoming().all_nodes())
         uuids_expected = set([return_one.uuid, return_two.uuid])
         self.assertEqual(uuids_incoming, uuids_expected)
 
@@ -253,6 +253,6 @@ def test_node_outdegree_unique_triple(self):
         data_one.store()
         data_two.store()
 
-        uuids_outgoing = set([node.uuid for node in creator.get_outgoing().all_nodes()])
+        uuids_outgoing = set(node.uuid for node in creator.get_outgoing().all_nodes())
         uuids_expected = set([data_one.uuid, data_two.uuid])
         self.assertEqual(uuids_outgoing, uuids_expected)

aiida/backends/tests/restapi.py

@@ -612,7 +612,6 @@ def test_computers_orderby_mixed3(self):
                                   -hostname",
                                   expected_list_ids=[1,0,4,3,2])
         """
-        pass
 
     ############### list filter combinations #######################
     def test_computers_filter_mixed1(self):
@@ -675,7 +674,6 @@ def test_computers_unknown_param(self):
         from aiida.common.exceptions import InputValidationError
         RESTApiTestCase.node_exception(self, "/computers?aa=bb&id=2", InputValidationError)
         """
-        pass
 
     ############### single calculation ########################
     def test_calculations_details(self):

aiida/calculations/plugins/arithmetic/add.py

@@ -66,7 +66,7 @@ def _use_methods(cls):
 
     def _get_input_valid_types(self, key):
         """Return the valid input types for the given key."""
-        return self._use_methods[key]['valid_types']
+        return self._use_methods[key]['valid_types']  # pylint: disable=unsubscriptable-object
 
     def _get_input_valid_type(self, key):
         """Return the valid input type for the given key."""

aiida/calculations/plugins/templatereplacer.py

@@ -94,7 +94,7 @@ def _prepare_for_submission(self, tempfolder, inputdict):
         :param inputdict: a dictionary with the input nodes e.g. {label1: node1, ...} (with the Code!)
         """
         # pylint: disable=too-many-locals,too-many-statements,too-many-branches
-        from six.moves import StringIO as StringIO
+        from six.moves import StringIO
 
         from aiida.orm.data.singlefile import SinglefileData
         from aiida.orm.data.remote import RemoteData

aiida/cmdline/commands/cmd_calcjob.py

@@ -25,7 +25,6 @@
 @verdi.group('calcjob')
 def verdi_calcjob():
     """Inspect and manage calcjobs."""
-    pass
 
 
 @verdi_calcjob.command('gotocomputer')

aiida/cmdline/commands/cmd_calculation.py

@@ -31,7 +31,6 @@
 @verdi.group('calculation')
 def verdi_calculation():
     """Inspect and manage calculations."""
-    pass
 
 
 @verdi_calculation.command('gotocomputer')

aiida/cmdline/commands/cmd_code.py

@@ -27,7 +27,6 @@
 @verdi.group('code')
 def verdi_code():
     """Setup and manage codes."""
-    pass
 
 
 def get_default(key, ctx):
@@ -215,7 +214,6 @@ def reveal(codes):
 # pylint: disable=unused-argument
 def update(code):
     """Update an existing code."""
-    pass
 
 
 @verdi_code.command()

aiida/cmdline/commands/cmd_comment.py

@@ -23,7 +23,6 @@
 @verdi.group('comment')
 def verdi_comment():
     """Inspect, create and manage node comments."""
-    pass
 
 
 @verdi_comment.command()
@@ -76,7 +75,7 @@ def show(user, nodes):
             comments = [comment for comment in all_comments if comment.user.email == user.email]
 
             if not comments:
-                valid_users = ', '.join(set([comment.user.email for comment in all_comments]))
+                valid_users = ', '.join(set(comment.user.email for comment in all_comments))
                 echo.echo_warning('no comments found for user {}'.format(user))
                 echo.echo_info('valid users found for Node<{}>: {}'.format(node.pk, valid_users))
 

aiida/cmdline/commands/cmd_computer.py

@@ -33,7 +33,6 @@
 @verdi.group('computer')
 def verdi_computer():
     """Setup and manage computers."""
-    pass
 
 
 def get_computer_names():
@@ -161,8 +160,8 @@ def _computer_create_temp_file(transport, scheduler, authinfo):  # pylint: disab
     if not transport.path_exists(remote_file_path):
         echo.echo_error("* ERROR! The file was not found!")
         return False
-    else:
-        echo.echo("      [OK]")
+
+    echo.echo("      [OK]")
     echo.echo("  `-> Retrieving the file and checking its content...")
 
     handle, destfile = tempfile.mkstemp()
@@ -179,8 +178,8 @@ def _computer_create_temp_file(transport, scheduler, authinfo):  # pylint: disab
             echo.echo("** Found:")
             echo.echo(read_string)
             return False
-        else:
-            echo.echo("      [Content OK]")
+
+        echo.echo("      [Content OK]")
     finally:
         os.remove(destfile)
 
@@ -621,7 +620,6 @@ def computer_delete(computer):
 @verdi_computer.group('configure')
 def computer_configure():
     """Configure a computer with one of the available transport types."""
-    pass
 
 
 @computer_configure.command('show')

aiida/cmdline/commands/cmd_daemon.py

@@ -29,7 +29,6 @@
 @verdi.group('daemon')
 def verdi_daemon():
     """Inspect and manage the daemon."""
-    pass
 
 
 @verdi_daemon.command()

aiida/cmdline/commands/cmd_data/__init__.py

@@ -15,14 +15,13 @@
 
 from aiida.cmdline.commands.cmd_verdi import verdi
 from aiida.cmdline.commands.cmd_plugin import verdi_plugin
-from aiida.cmdline.utils import decorators, echo
+from aiida.cmdline.utils import decorators
 from aiida.cmdline.utils.pluginable import Pluginable
 
 
 @verdi.group('data', entry_point_group='aiida.cmdline.data', cls=Pluginable)
 def verdi_data():
     """Inspect, create and manage data nodes."""
-    pass
 
 
 @verdi_data.command('plugins')

aiida/cmdline/commands/cmd_data/cmd_array.py

@@ -19,7 +19,6 @@
 @verdi_data.group('array')
 def array():
     """Manipulate ArrayData objects."""
-    pass
 
 
 @array.command('show')

aiida/cmdline/commands/cmd_data/cmd_bands.py

@@ -34,7 +34,6 @@
 @verdi_data.group('bands')
 def bands():
     """Manipulate BandsData objects."""
-    pass
 
 
 # pylint: disable=too-many-arguments

aiida/cmdline/commands/cmd_data/cmd_cif.py

@@ -31,7 +31,6 @@
 @verdi_data.group('cif')
 def cif():
     """Manipulation of CIF data objects."""
-    pass
 
 
 @cif.command('list')

aiida/cmdline/commands/cmd_data/cmd_parameter.py

@@ -19,7 +19,6 @@
 @verdi_data.group('parameter')
 def parameter():
     """View and manipulate ParameterData objects."""
-    pass
 
 
 @parameter.command('show')

aiida/cmdline/commands/cmd_data/cmd_remote.py

@@ -24,7 +24,6 @@
 @verdi_data.group('remote')
 def remote():
     """Managing RemoteData objects."""
-    pass
 
 
 @remote.command('ls')

aiida/cmdline/commands/cmd_data/cmd_show.py

@@ -132,7 +132,7 @@ def _show_ase(exec_name, structure_list):
         from ase.visualize import view
         for structure in structure_list:
             view(structure.get_ase())
-    except ImportError:
+    except ImportError:  # pylint: disable=try-except-raise
         raise
 
 

aiida/cmdline/commands/cmd_data/cmd_structure.py

@@ -32,7 +32,6 @@
 @verdi_data.group('structure')
 def structure():
     """Manipulation of StructureData objects."""
-    pass
 
 
 # pylint: disable=too-many-locals,too-many-branches

aiida/cmdline/commands/cmd_data/cmd_trajectory.py

@@ -32,7 +32,6 @@
 @verdi_data.group('trajectory')
 def trajectory():
     """View and manipulate TrajectoryData instances."""
-    pass
 
 
 @trajectory.command('list')

aiida/cmdline/commands/cmd_data/cmd_upf.py

@@ -23,7 +23,6 @@
 @verdi_data.group('upf')
 def upf():
     """Manipulation of the upf families."""
-    pass
 
 
 @upf.command('uploadfamily')

aiida/cmdline/commands/cmd_database.py

@@ -22,7 +22,6 @@
 @verdi.group('database')
 def verdi_database():
     """Inspect and manage the database."""
-    pass
 
 
 @verdi_database.command('migrate')
@@ -48,7 +47,6 @@ def database_migrate(force):
 @verdi_database.group('integrity')
 def verdi_database_integrity():
     """Various commands that will check the integrity of the database and fix potential issues when asked."""
-    pass
 
 
 @verdi_database_integrity.command('detect-duplicate-node-uuid')

aiida/cmdline/commands/cmd_devel.py

@@ -23,7 +23,6 @@
 @verdi.group('devel')
 def verdi_devel():
     """Commands for developers."""
-    pass
 
 
 def get_valid_test_paths():
@@ -156,7 +155,7 @@ def devel_tests(paths, verbose):  # pylint: disable=too-many-locals,too-many-sta
     echo.echo('* Tests skipped: {}'.format(len(test_skipped)))
     if test_skipped:
         echo.echo('  Reasons for skipping:')
-        for reason in sorted(set([_[1] for _ in test_skipped])):
+        for reason in sorted(set(_[1] for _ in test_skipped)):
             echo.echo('  - {}'.format(reason))
 
     echo.echo('* Tests run:     {}'.format(tot_num_tests))

aiida/cmdline/commands/cmd_export.py

@@ -29,7 +29,6 @@
 @verdi.group('export')
 def verdi_export():
     """Create and manage export archives."""
-    pass
 
 
 @verdi_export.command('inspect')
@@ -202,7 +201,7 @@ def migrate(input_file, output_file, force, silent, archive_format):
         with io.open(folder.get_abs_path('metadata.json'), 'wb') as fhandle:
             json.dump(metadata, fhandle)
 
-        if archive_format == 'zip' or archive_format == 'zip-uncompressed':
+        if archive_format in ['zip', 'zip-uncompressed']:
             compression = zipfile.ZIP_DEFLATED if archive_format == 'zip' else zipfile.ZIP_STORED
             with zipfile.ZipFile(output_file, mode='w', compression=compression, allowZip64=True) as archive:
                 src = folder.abspath
@@ -280,7 +279,7 @@ def migrate_v1_to_v2(metadata, data):
     try:
         verify_metadata_version(metadata, old_version)
         update_metadata(metadata, new_version)
-    except ValueError:
+    except ValueError:  # pylint: disable=try-except-raise
         raise
 
     def get_new_string(old_string):
@@ -364,7 +363,7 @@ class NodeType(enum.Enum):  # pylint: disable=too-few-public-methods
     try:
         verify_metadata_version(metadata, old_version)
         update_metadata(metadata, new_version)
-    except ValueError:
+    except ValueError:  # pylint: disable=try-except-raise
         raise
 
     # Create a mapping from node uuid to node type
@@ -407,15 +406,13 @@ class NodeType(enum.Enum):  # pylint: disable=too-few-public-methods
         # (CALC)       -> (DATA)       : CREATE
         # (WORK)       -> (DATA)       : RETURN
         # (WORK)       -> (CALC, WORK) : CALL
-        if (input_type == NodeType.CODE or input_type == NodeType.DATA) \
-            and (output_type == NodeType.CALC or output_type == NodeType.WORK):
+        if input_type in [NodeType.CODE, NodeType.DATA] and output_type in [NodeType.CALC, NodeType.WORK]:
             link['type'] = LinkType.INPUT.value
         elif input_type == NodeType.CALC and output_type == NodeType.DATA:
             link['type'] = LinkType.CREATE.value
         elif input_type == NodeType.WORK and output_type == NodeType.DATA:
             link['type'] = LinkType.RETURN.value
-        elif input_type == NodeType.WORK \
-            and (output_type == NodeType.CALC or output_type == NodeType.WORK):
+        elif input_type == NodeType.WORK and output_type in [NodeType.CALC, NodeType.WORK]:
             link['type'] = LinkType.CALL.value
         else:
             link['type'] = LinkType.UNSPECIFIED.value

aiida/cmdline/commands/cmd_graph.py

@@ -24,7 +24,6 @@ def verdi_graph():
     Create visual representations of part of the provenance graph.
     Requires that `graphviz<https://graphviz.org/download>` be installed.
     """
-    pass
 
 
 @verdi_graph.command('generate')

aiida/cmdline/commands/cmd_group.py

@@ -25,7 +25,6 @@
 @verdi.group('group')
 def verdi_group():
     """Inspect, create and manage groups."""
-    pass
 
 
 @verdi_group.command("removenodes")
@@ -332,9 +331,5 @@ def group_copy(source_group, destination_group):
 
     dest_group = orm.Group.objects.get_or_create(
         label=destination_group, type_string=GroupTypeString(source_group.type_string))[0]
-    try:
-        dest_group.add_nodes(source_group.nodes)
-        echo.echo_success("Nodes were succesfully copied from the group <{}> to the group "
-                          "<{}>".format(source_group, destination_group))
-    except:
-        raise
+    dest_group.add_nodes(source_group.nodes)
+    echo.echo_success("Nodes copied from group<{}> to group<{}>".format(source_group, destination_group))