From be778650f8e293607c229e41efcb92f3abe29253 Mon Sep 17 00:00:00 2001 From: Sebastiaan Huber Date: Thu, 21 Nov 2019 11:47:06 +0100 Subject: [PATCH 1/8] Drop Python 2: start removal of python 2 compatibility Remove python 2 from supported version in `setup.json` and remove all dependencies that were only necessary for `python<3.5`. Additionally python 2 is removed from the build matrix on Travis. Add explicit `python_requires` keyword to `setup.json` which will ensure that `pip>=9` and other clients that support the metadata 1.2 spec only install a compatible version for the current Python runtime when installing the package. --- .travis.yml | 5 ----- docs/requirements_for_rtd.txt | 17 ++++------------- setup.json | 29 ++++++++--------------------- 3 files changed, 12 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index a21dd86cde..3cb175d09e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: required language: python python: - - "2.7" - "3.6" cache: pip @@ -49,11 +48,7 @@ before_install: - .ci/before_install.sh install: - # Upgrade pip setuptools and wheel to be able to run the next command - pip install --upgrade pip wheel setuptools coveralls - - pip install "numpy==1.16.4" # see https://github.com/materialsproject/pymatgen/issues/1520 - - pip install "monty==2.0.4" # see https://github.com/materialsvirtuallab/monty/issues/49 - # Install AiiDA with some optional dependencies - if [ "$TEST_TYPE" == "docs" ]; then pip install . && pip install -r docs/requirements_for_rtd.txt; else pip install .[all]; fi env: diff --git a/docs/requirements_for_rtd.txt b/docs/requirements_for_rtd.txt index 1e36e7b3d6..21a6caf159 100644 --- a/docs/requirements_for_rtd.txt +++ b/docs/requirements_for_rtd.txt @@ -1,5 +1,4 @@ -PyCifRW==4.2.1; python_version < '3' -PyCifRW==4.4.1; python_version >= '3' +PyCifRW==4.4.1 aiida-export-migration-tests==0.8.0 aldjemy==0.9.1 alembic==1.2.1 @@ -13,7 +12,6 @@ codecov==2.0.15 coverage==4.5.4 django==1.11.25 docutils==0.15.2 -enum34==1.1.6; python_version<'3.5' ete3==3.1.1 flask-cache==0.13.1 flask-cors==3.0.8 @@ -22,7 +20,6 @@ flask-marshmallow==0.10.1 flask-restful==0.3.7 flask-sqlalchemy==2.4.1 flask==1.1.1 -futures==3.3.0; python_version=='2.7' graphviz==0.13 ipython>=4.0,<6.0 itsdangerous==1.1.0 @@ -31,7 +28,6 @@ kiwipy[rmq]==0.5.1 markupsafe==1.1.1 marshmallow-sqlalchemy==0.19.0 mock==3.0.5 -mock==3.0.5; python_version<'3.3' monty==2.0.4 numpy==1.16.4 paramiko==2.6.0 @@ -56,24 +52,19 @@ pyyaml==3.13 reentry>=1.3.0 seekpath==1.9.3 simplejson==3.16.0 -singledispatch>=3.4.0.3; python_version<'3.5' six==1.12.0 spglib==1.14.1.post0 sphinx-rtd-theme==0.4.3 -sphinx==1.8.5; python_version<'3' -sphinx==2.2.0; python_version>='3.0' -sphinxcontrib-contentui==0.2.2; python_version<'3' -sphinxcontrib-contentui==0.2.4; python_version>='3.0' -sphinxcontrib-details-directive==0.1.0; python_version>='3.0' +sphinx==2.2.0 +sphinxcontrib-contentui==0.2.4 +sphinxcontrib-details-directive==0.1.0 sqlalchemy-diff==0.1.3 sqlalchemy-migrate==0.12.0 sqlalchemy-utils==0.34.2 sqlalchemy==1.3.10 tabulate==0.8.5 tornado<5.0 -typing==3.7.4.1; python_version<'3.5' tzlocal==2.0.0 -unittest2==1.1.0; python_version<'3.5' upf_to_json==0.9.2 uritools==2.2.0 wrapt==1.11.2 \ No newline at end of file diff --git a/setup.json b/setup.json index df5d22e820..9ac7fb99af 100644 --- a/setup.json +++ b/setup.json @@ -6,14 +6,13 @@ "author": "The AiiDA team", "author_email": "developers@aiida.net", "include_package_data": true, - "python_requires": ">=2.7,!=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*", + "python_requires": ">=3.5", "classifiers": [ "Framework :: AiiDA", "License :: OSI Approved :: MIT License", "Operating System :: POSIX :: Linux", "Operating System :: MacOS :: MacOS X", "Programming Language :: Python", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", @@ -28,7 +27,6 @@ "click-spinner==0.1.8", "click==7.0", "django==1.11.25", - "enum34==1.1.6; python_version<'3.5'", "ete3==3.1.1", "graphviz==0.13", "ipython>=4.0,<6.0", @@ -47,13 +45,11 @@ "pyyaml==3.13", "reentry>=1.3.0", "simplejson==3.16.0", - "singledispatch>=3.4.0.3; python_version<'3.5'", "six==1.12.0", "sqlalchemy-utils==0.34.2", "sqlalchemy==1.3.10", "tabulate==0.8.5", "tornado<5.0", - "typing==3.7.4.1; python_version<'3.5'", "tzlocal==2.0.0", "upf_to_json==0.9.2", "uritools==2.2.0", @@ -85,15 +81,12 @@ "markupsafe==1.1.1", "pygments==2.4.2", "sphinx-rtd-theme==0.4.3", - "sphinx==1.8.5; python_version<'3'", - "sphinx==2.2.0; python_version>='3.0'", - "sphinxcontrib-contentui==0.2.2; python_version<'3'", - "sphinxcontrib-contentui==0.2.4; python_version>='3.0'", - "sphinxcontrib-details-directive==0.1.0; python_version>='3.0'" + "sphinx==2.2.0", + "sphinxcontrib-contentui==0.2.4", + "sphinxcontrib-details-directive==0.1.0" ], "atomic_tools": [ - "PyCifRW==4.2.1; python_version < '3'", - "PyCifRW==4.4.1; python_version >= '3'", + "PyCifRW==4.4.1", "ase==3.17.0", "monty==2.0.4", "pymatgen<=2018.12.12", @@ -109,24 +102,18 @@ "aiida-export-migration-tests==0.8.0", "codecov==2.0.15", "coverage==4.5.4", - "futures==3.3.0; python_version=='2.7'", "pg8000<1.13.0", "pgtest==1.3.1", "pytest==4.6.6", "pytest-cov==2.8.1", - "mock==3.0.5; python_version<'3.3'", - "sqlalchemy-diff==0.1.3", - "unittest2==1.1.0; python_version<'3.5'" + "sqlalchemy-diff==0.1.3" ], "dev_precommit": [ - "astroid==1.6.6; python_version<'3.0'", - "astroid==2.2.5; python_version>='3.0'", + "astroid==2.2.5", "pep8-naming==0.8.2", "pre-commit==1.18.3", "prospector==1.1.7", - "pylint-django==0.11.1; python_version<'3.0'", - "pylint==1.9.4; python_version<'3.0'", - "pylint==2.3.1; python_version>='3.0'", + "pylint==2.3.1", "toml==0.10.0", "yapf==0.28.0" ], From 1340ce924df601856fbd07ca17aaf26da5a920cd Mon Sep 17 00:00:00 2001 From: Sebastiaan Huber Date: Thu, 21 Nov 2019 12:00:27 +0100 Subject: [PATCH 2/8] Drop Python 2: remove all `from __future__` statements The removal of all future statements was performed with the following: find . -type f -not -path './.git*' -exec sed -i '/from __future__.*$/d' {} + The `modernizer` hook is also removed from the pre-commit config. --- .ci/polish/cli.py | 3 - .ci/polish/lib/expression.py | 3 - .ci/polish/lib/workchain.py | 3 - .ci/pytest/conftest.py | 3 - .ci/pytest/test_pytest_fixtures.py | 3 - .ci/pytest/test_unittest_example.py | 3 - .ci/test_daemon.py | 3 - .ci/test_plugin_testcase.py | 3 - .ci/test_profile_manager.py | 3 - .ci/test_test_manager.py | 3 - .ci/workchains.py | 3 - .pre-commit-config.yaml | 72 ------------------- aiida/__init__.py | 3 - aiida/backends/__init__.py | 3 - .../djsite/db/migrations/0001_initial.py | 4 -- .../db/migrations/0002_db_state_change.py | 4 -- .../db/migrations/0003_add_link_type.py | 4 -- .../0004_add_daemon_and_uuid_indices.py | 4 -- .../db/migrations/0005_add_cmtime_indices.py | 4 -- .../db/migrations/0006_delete_dbpath.py | 4 -- .../db/migrations/0007_update_linktypes.py | 4 -- .../migrations/0008_code_hidden_to_extra.py | 4 -- .../0009_base_data_plugin_type_string.py | 4 -- .../djsite/db/migrations/0010_process_type.py | 4 -- .../db/migrations/0011_delete_kombu_tables.py | 4 -- .../djsite/db/migrations/0012_drop_dblock.py | 4 -- .../djsite/db/migrations/0013_django_1_8.py | 4 -- .../0014_add_node_uuid_unique_constraint.py | 4 -- .../migrations/0015_invalidating_node_hash.py | 4 -- .../migrations/0016_code_sub_class_of_data.py | 4 -- .../db/migrations/0017_drop_dbcalcstate.py | 4 -- .../djsite/db/migrations/0018_django_1_11.py | 5 -- .../0019_migrate_builtin_calculations.py | 4 -- .../db/migrations/0020_provenance_redesign.py | 5 -- ...group_name_to_label_type_to_type_string.py | 5 -- ...0022_dbgroup_type_string_change_content.py | 5 -- .../0023_calc_job_option_attribute_keys.py | 4 -- .../djsite/db/migrations/0024_dblog_update.py | 5 -- .../0025_move_data_within_node_module.py | 4 -- .../0026_trajectory_symbols_to_attribute.py | 4 -- .../0027_delete_trajectory_symbols_array.py | 4 -- .../db/migrations/0028_remove_node_prefix.py | 4 -- .../0029_rename_parameter_data_to_dict.py | 4 -- .../0030_dbnode_type_to_dbnode_node_type.py | 4 -- .../0031_remove_dbcomputer_enabled.py | 4 -- .../0032_remove_legacy_workflows.py | 4 -- ...0033_replace_text_field_with_json_field.py | 4 -- ...34_drop_node_columns_nodeversion_public.py | 4 -- .../db/migrations/0035_simplify_user_model.py | 4 -- .../0036_drop_computer_transport_params.py | 4 -- .../0037_attributes_extras_settings_json.py | 3 - ..._data_migration_legacy_job_calculations.py | 4 -- .../djsite/db/migrations/0039_reset_hash.py | 4 -- ...ata_migration_legacy_process_attributes.py | 4 -- .../0041_seal_unsealed_processes.py | 4 -- .../migrations/0042_prepare_schema_reset.py | 4 -- .../db/migrations/0043_default_link_label.py | 4 -- .../backends/djsite/db/migrations/__init__.py | 3 - aiida/backends/djsite/db/models.py | 3 - ...ns_0037_attributes_extras_settings_json.py | 3 - ..._data_migration_legacy_job_calculations.py | 3 - ...ata_migration_legacy_process_attributes.py | 3 - ...migrations_0041_seal_unsealed_processes.py | 3 - ...test_migrations_0043_default_link_label.py | 3 - .../migrations/test_migrations_common.py | 3 - .../migrations/test_migrations_many.py | 3 - .../djsite/db/subtests/test_generic.py | 3 - aiida/backends/djsite/db/testbase.py | 3 - aiida/backends/djsite/manage.py | 9 +-- aiida/backends/djsite/manager.py | 1 - aiida/backends/djsite/queries.py | 3 - aiida/backends/djsite/settings.py | 3 - aiida/backends/djsite/utils.py | 3 - aiida/backends/general/abstractqueries.py | 3 - .../backends/general/migrations/calc_state.py | 3 - .../general/migrations/provenance_redesign.py | 3 - aiida/backends/general/migrations/utils.py | 3 - aiida/backends/manager.py | 1 - aiida/backends/profile.py | 3 - aiida/backends/sqlalchemy/__init__.py | 4 -- aiida/backends/sqlalchemy/manage.py | 3 - aiida/backends/sqlalchemy/manager.py | 1 - aiida/backends/sqlalchemy/migrations/env.py | 4 -- .../versions/041a79fc615f_dblog_cleaning.py | 3 - ...c78e6209_drop_computer_transport_params.py | 3 - ...ebbeab274d_base_data_plugin_type_string.py | 3 - .../118349c10896_default_link_label.py | 3 - ...798d4d3_trajectory_symbols_to_attribute.py | 4 -- ...0c971ae0a3_migrate_builtin_calculations.py | 3 - .../versions/162b99bca4a2_drop_dbcalcstate.py | 3 - ...31_drop_node_columns_nodeversion_public.py | 3 - .../1b8ed3425af9_remove_legacy_workflows.py | 3 - .../239cea6d2452_provenance_redesign.py | 3 - ..._data_migration_legacy_job_calculations.py | 3 - .../35d4ee9a1b0e_code_hidden_attr_to_extra.py | 3 - ...b70663_dblog_uuid_uniqueness_constraint.py | 3 - ...f3d4882837_make_all_uuid_columns_unique.py | 3 - .../3d6190594e19_remove_dbcomputer_enabled.py | 3 - ..._adding_indexes_and_constraints_to_the_.py | 3 - .../versions/5a49629f0d45_dblink_indices.py | 3 - .../5d4d844852b6_invalidating_node_hash.py | 3 - ...4e52864_dbnode_type_to_dbnode_node_type.py | 3 - .../61fc0913fae9_remove_node_prefix.py | 3 - ...d36de90_add_node_uuid_unique_constraint.py | 3 - ...5c2ea1439d_move_data_within_node_module.py | 3 - .../versions/6c629c886f84_process_type.py | 3 - .../versions/70c7d732f1b2_delete_dbpath.py | 3 - ..._unique_constraints_for_the_db_dbgroup_.py | 3 - .../7b38a9e783e7_seal_unsealed_processes.py | 3 - ...8c391c49_calc_job_option_attribute_keys.py | 3 - ...b25_add_indexes_to_dbworkflowdata_table.py | 3 - .../91b573400be5_prepare_schema_reset.py | 3 - .../versions/a514d673c163_drop_dblock.py | 3 - .../a603da2cc809_code_sub_class_of_data.py | 3 - .../versions/a6048f0ffca8_update_linktypes.py | 3 - ...group_name_to_label_type_to_type_string.py | 3 - ...84bcc35_delete_trajectory_symbols_array.py | 4 -- ...4fdfed416_rename_parameter_data_to_dict.py | 3 - .../de2eaf6978b4_simplify_user_model.py | 3 - .../versions/e15ef2630a1b_initial_schema.py | 3 - ...dbgroup_class_change_type_string_values.py | 3 - ...ata_migration_legacy_process_attributes.py | 3 - .../versions/e797afa09270_reset_hash.py | 3 - .../ea2f50e7f615_dblog_create_uuid_column.py | 3 - .../f9a69de76a9a_delete_kombu_tables.py | 3 - aiida/backends/sqlalchemy/models/__init__.py | 3 - aiida/backends/sqlalchemy/models/authinfo.py | 3 - aiida/backends/sqlalchemy/models/base.py | 3 - aiida/backends/sqlalchemy/models/comment.py | 3 - aiida/backends/sqlalchemy/models/computer.py | 3 - aiida/backends/sqlalchemy/models/group.py | 3 - aiida/backends/sqlalchemy/models/log.py | 3 - aiida/backends/sqlalchemy/models/node.py | 3 - aiida/backends/sqlalchemy/models/settings.py | 3 - aiida/backends/sqlalchemy/models/user.py | 3 - aiida/backends/sqlalchemy/queries.py | 3 - .../backends/sqlalchemy/tests/test_generic.py | 3 - .../sqlalchemy/tests/test_migrations.py | 3 - aiida/backends/sqlalchemy/tests/test_nodes.py | 3 - aiida/backends/sqlalchemy/tests/test_query.py | 3 - .../backends/sqlalchemy/tests/test_schema.py | 3 - .../backends/sqlalchemy/tests/test_session.py | 3 - aiida/backends/sqlalchemy/tests/test_utils.py | 3 - aiida/backends/sqlalchemy/tests/testbase.py | 3 - aiida/backends/sqlalchemy/utils.py | 3 - aiida/backends/testbase.py | 3 - aiida/backends/testimplbase.py | 3 - aiida/backends/tests/__init__.py | 3 - .../tests/cmdline/commands/test_calcjob.py | 3 - .../tests/cmdline/commands/test_code.py | 3 - .../tests/cmdline/commands/test_comment.py | 3 - .../tests/cmdline/commands/test_computer.py | 3 - .../tests/cmdline/commands/test_config.py | 3 - .../tests/cmdline/commands/test_daemon.py | 3 - .../tests/cmdline/commands/test_data.py | 3 - .../tests/cmdline/commands/test_database.py | 3 - .../tests/cmdline/commands/test_export.py | 3 - .../tests/cmdline/commands/test_graph.py | 3 - .../tests/cmdline/commands/test_group.py | 3 - .../tests/cmdline/commands/test_help.py | 3 - .../tests/cmdline/commands/test_import.py | 3 - .../tests/cmdline/commands/test_node.py | 3 - .../tests/cmdline/commands/test_process.py | 3 - .../tests/cmdline/commands/test_profile.py | 3 - .../tests/cmdline/commands/test_rehash.py | 3 - .../tests/cmdline/commands/test_restapi.py | 3 - .../tests/cmdline/commands/test_run.py | 3 - .../tests/cmdline/commands/test_setup.py | 3 - .../tests/cmdline/commands/test_status.py | 3 - .../tests/cmdline/commands/test_user.py | 3 - .../tests/cmdline/commands/test_verdi.py | 3 - .../cmdline/params/types/test_calculation.py | 3 - .../tests/cmdline/params/types/test_code.py | 3 - .../cmdline/params/types/test_computer.py | 3 - .../tests/cmdline/params/types/test_data.py | 3 - .../tests/cmdline/params/types/test_group.py | 3 - .../cmdline/params/types/test_identifier.py | 3 - .../tests/cmdline/params/types/test_node.py | 3 - .../tests/cmdline/params/types/test_path.py | 3 - .../tests/cmdline/params/types/test_plugin.py | 3 - .../tests/cmdline/utils/test_common.py | 3 - .../tests/common/test_extendeddicts.py | 3 - aiida/backends/tests/common/test_folders.py | 3 - aiida/backends/tests/common/test_hashing.py | 3 - aiida/backends/tests/common/test_lang.py | 3 - aiida/backends/tests/common/test_links.py | 3 - aiida/backends/tests/common/test_logging.py | 3 - aiida/backends/tests/common/test_serialize.py | 3 - aiida/backends/tests/common/test_timezone.py | 3 - aiida/backends/tests/common/test_utils.py | 3 - .../tests/engine/daemon/test_client.py | 3 - aiida/backends/tests/engine/test_calc_job.py | 3 - .../tests/engine/test_calcfunctions.py | 3 - .../tests/engine/test_class_loader.py | 3 - aiida/backends/tests/engine/test_daemon.py | 3 - aiida/backends/tests/engine/test_futures.py | 3 - aiida/backends/tests/engine/test_launch.py | 3 - aiida/backends/tests/engine/test_manager.py | 3 - .../backends/tests/engine/test_persistence.py | 3 - aiida/backends/tests/engine/test_ports.py | 3 - aiida/backends/tests/engine/test_process.py | 3 - .../tests/engine/test_process_builder.py | 3 - .../tests/engine/test_process_function.py | 3 - .../tests/engine/test_process_spec.py | 3 - aiida/backends/tests/engine/test_rmq.py | 3 - aiida/backends/tests/engine/test_run.py | 3 - aiida/backends/tests/engine/test_runners.py | 3 - aiida/backends/tests/engine/test_transport.py | 3 - aiida/backends/tests/engine/test_utils.py | 3 - .../backends/tests/engine/test_work_chain.py | 3 - .../tests/engine/test_workfunctions.py | 3 - .../tests/manage/backup/test_backup_script.py | 3 - .../manage/backup/test_backup_setup_script.py | 3 - .../migrations/test_migrations.py | 3 - .../tests/manage/configuration/test_config.py | 3 - .../manage/configuration/test_options.py | 3 - .../manage/configuration/test_profile.py | 3 - .../tests/manage/external/test_postgres.py | 3 - aiida/backends/tests/manage/test_caching.py | 3 - aiida/backends/tests/orm/data/test_data.py | 3 - aiida/backends/tests/orm/data/test_dict.py | 3 - aiida/backends/tests/orm/data/test_folder.py | 3 - aiida/backends/tests/orm/data/test_kpoints.py | 3 - aiida/backends/tests/orm/data/test_orbital.py | 3 - aiida/backends/tests/orm/data/test_remote.py | 3 - .../tests/orm/data/test_singlefile.py | 3 - .../tests/orm/data/test_to_aiida_type.py | 3 - aiida/backends/tests/orm/data/test_upf.py | 3 - .../tests/orm/implementation/test_backend.py | 3 - .../tests/orm/implementation/test_comments.py | 3 - .../tests/orm/implementation/test_logs.py | 3 - .../tests/orm/implementation/test_nodes.py | 3 - aiida/backends/tests/orm/node/test_calcjob.py | 3 - aiida/backends/tests/orm/node/test_node.py | 3 - aiida/backends/tests/orm/test_authinfos.py | 3 - aiida/backends/tests/orm/test_comments.py | 3 - aiida/backends/tests/orm/test_computers.py | 3 - aiida/backends/tests/orm/test_entities.py | 3 - aiida/backends/tests/orm/test_groups.py | 3 - aiida/backends/tests/orm/test_logs.py | 3 - aiida/backends/tests/orm/test_mixins.py | 3 - aiida/backends/tests/orm/test_querybuilder.py | 3 - .../backends/tests/orm/utils/test_calcjob.py | 3 - .../backends/tests/orm/utils/test_loaders.py | 3 - aiida/backends/tests/orm/utils/test_node.py | 3 - .../tests/orm/utils/test_repository.py | 3 - aiida/backends/tests/parsers/test_parser.py | 3 - .../tests/plugins/test_entry_point.py | 3 - .../backends/tests/plugins/test_factories.py | 3 - aiida/backends/tests/plugins/test_utils.py | 3 - .../tests/restapi/test_identifiers.py | 3 - aiida/backends/tests/test_base_dataclasses.py | 3 - aiida/backends/tests/test_calculation_node.py | 3 - aiida/backends/tests/test_dataclasses.py | 3 - aiida/backends/tests/test_dbimporters.py | 3 - aiida/backends/tests/test_generic.py | 3 - aiida/backends/tests/test_nodes.py | 3 - aiida/backends/tests/test_restapi.py | 3 - .../tests/tools/data/orbital/test_orbitals.py | 3 - .../tools/importexport/common/test_archive.py | 3 - .../importexport/migration/test_migration.py | 3 - .../importexport/migration/test_v01_to_v02.py | 3 - .../importexport/migration/test_v02_to_v03.py | 3 - .../importexport/migration/test_v03_to_v04.py | 3 - .../importexport/migration/test_v04_to_v05.py | 4 -- .../importexport/migration/test_v05_to_v06.py | 3 - .../importexport/migration/test_v06_to_v07.py | 3 - .../importexport/migration/test_v07_to_v08.py | 3 - .../tools/importexport/orm/test_attributes.py | 4 -- .../importexport/orm/test_calculations.py | 4 -- .../tools/importexport/orm/test_codes.py | 4 -- .../tools/importexport/orm/test_comments.py | 4 -- .../tools/importexport/orm/test_computers.py | 4 -- .../tools/importexport/orm/test_extras.py | 4 -- .../tools/importexport/orm/test_groups.py | 4 -- .../tools/importexport/orm/test_links.py | 4 -- .../tests/tools/importexport/orm/test_logs.py | 4 -- .../tools/importexport/orm/test_users.py | 4 -- .../tests/tools/importexport/test_complex.py | 4 -- .../tools/importexport/test_prov_redesign.py | 4 -- .../tests/tools/importexport/test_simple.py | 4 -- .../importexport/test_specific_import.py | 4 -- .../tests/tools/importexport/utils.py | 4 -- .../tests/tools/visualization/test_graph.py | 3 - aiida/backends/tests/utils/archives.py | 3 - aiida/backends/tests/utils/configuration.py | 3 - aiida/backends/tests/utils/processes.py | 3 - aiida/backends/utils.py | 3 - aiida/calculations/plugins/arithmetic/add.py | 3 - .../calculations/plugins/templatereplacer.py | 3 - aiida/cmdline/__init__.py | 3 - aiida/cmdline/commands/__init__.py | 3 - aiida/cmdline/commands/cmd_calcjob.py | 3 - aiida/cmdline/commands/cmd_code.py | 3 - aiida/cmdline/commands/cmd_comment.py | 3 - .../cmdline/commands/cmd_completioncommand.py | 3 - aiida/cmdline/commands/cmd_computer.py | 3 - aiida/cmdline/commands/cmd_config.py | 3 - aiida/cmdline/commands/cmd_daemon.py | 3 - aiida/cmdline/commands/cmd_data/__init__.py | 3 - aiida/cmdline/commands/cmd_data/cmd_array.py | 3 - aiida/cmdline/commands/cmd_data/cmd_bands.py | 3 - aiida/cmdline/commands/cmd_data/cmd_cif.py | 3 - aiida/cmdline/commands/cmd_data/cmd_dict.py | 3 - aiida/cmdline/commands/cmd_data/cmd_export.py | 3 - aiida/cmdline/commands/cmd_data/cmd_list.py | 3 - aiida/cmdline/commands/cmd_data/cmd_remote.py | 3 - aiida/cmdline/commands/cmd_data/cmd_show.py | 3 - .../commands/cmd_data/cmd_singlefile.py | 3 - .../commands/cmd_data/cmd_structure.py | 3 - .../commands/cmd_data/cmd_trajectory.py | 3 - aiida/cmdline/commands/cmd_data/cmd_upf.py | 3 - aiida/cmdline/commands/cmd_database.py | 3 - aiida/cmdline/commands/cmd_devel.py | 3 - aiida/cmdline/commands/cmd_export.py | 3 - aiida/cmdline/commands/cmd_graph.py | 3 - aiida/cmdline/commands/cmd_group.py | 3 - aiida/cmdline/commands/cmd_help.py | 3 - aiida/cmdline/commands/cmd_import.py | 3 - aiida/cmdline/commands/cmd_node.py | 3 - aiida/cmdline/commands/cmd_plugin.py | 3 - aiida/cmdline/commands/cmd_process.py | 3 - aiida/cmdline/commands/cmd_profile.py | 3 - aiida/cmdline/commands/cmd_rehash.py | 3 - aiida/cmdline/commands/cmd_restapi.py | 3 - aiida/cmdline/commands/cmd_run.py | 3 - aiida/cmdline/commands/cmd_setup.py | 3 - aiida/cmdline/commands/cmd_shell.py | 3 - aiida/cmdline/commands/cmd_status.py | 3 - aiida/cmdline/commands/cmd_user.py | 3 - aiida/cmdline/commands/cmd_verdi.py | 3 - aiida/cmdline/params/arguments/__init__.py | 3 - aiida/cmdline/params/arguments/overridable.py | 3 - aiida/cmdline/params/options/__init__.py | 3 - aiida/cmdline/params/options/commands/code.py | 3 - .../params/options/commands/computer.py | 3 - .../cmdline/params/options/commands/setup.py | 3 - aiida/cmdline/params/options/conditional.py | 3 - aiida/cmdline/params/options/config.py | 3 - aiida/cmdline/params/options/interactive.py | 3 - aiida/cmdline/params/options/multivalue.py | 3 - aiida/cmdline/params/options/overridable.py | 3 - .../params/options/test_conditional.py | 3 - .../params/options/test_interactive.py | 3 - aiida/cmdline/params/types/__init__.py | 3 - aiida/cmdline/params/types/calculation.py | 3 - aiida/cmdline/params/types/choice.py | 3 - aiida/cmdline/params/types/code.py | 3 - aiida/cmdline/params/types/computer.py | 3 - aiida/cmdline/params/types/config.py | 3 - aiida/cmdline/params/types/data.py | 3 - aiida/cmdline/params/types/group.py | 3 - aiida/cmdline/params/types/identifier.py | 3 - aiida/cmdline/params/types/multiple.py | 3 - aiida/cmdline/params/types/node.py | 3 - aiida/cmdline/params/types/nonemptystring.py | 3 - aiida/cmdline/params/types/path.py | 3 - aiida/cmdline/params/types/plugin.py | 3 - aiida/cmdline/params/types/process.py | 3 - aiida/cmdline/params/types/profile.py | 3 - aiida/cmdline/params/types/test_module.py | 3 - aiida/cmdline/params/types/user.py | 3 - aiida/cmdline/params/types/workflow.py | 3 - aiida/cmdline/utils/ascii_vis.py | 3 - aiida/cmdline/utils/common.py | 3 - aiida/cmdline/utils/daemon.py | 3 - aiida/cmdline/utils/decorators.py | 3 - aiida/cmdline/utils/defaults.py | 3 - aiida/cmdline/utils/echo.py | 3 - aiida/cmdline/utils/multi_line_input.py | 3 - aiida/cmdline/utils/pluginable.py | 3 - aiida/cmdline/utils/query/calculation.py | 3 - aiida/cmdline/utils/query/formatting.py | 4 -- aiida/cmdline/utils/query/mapping.py | 3 - aiida/cmdline/utils/repository.py | 3 - aiida/cmdline/utils/shell.py | 4 -- aiida/cmdline/utils/templates.py | 3 - aiida/cmdline/utils/test_multiline.py | 3 - aiida/common/__init__.py | 3 - aiida/common/constants.py | 3 - aiida/common/datastructures.py | 3 - aiida/common/escaping.py | 3 - aiida/common/exceptions.py | 3 - aiida/common/extendeddicts.py | 3 - aiida/common/files.py | 3 - aiida/common/folders.py | 3 - aiida/common/hashing.py | 3 - aiida/common/json.py | 3 - aiida/common/lang.py | 3 - aiida/common/links.py | 3 - aiida/common/log.py | 3 - aiida/common/timezone.py | 3 - aiida/common/utils.py | 3 - aiida/common/warnings.py | 3 - aiida/engine/__init__.py | 3 - aiida/engine/daemon/client.py | 3 - aiida/engine/daemon/execmanager.py | 3 - aiida/engine/daemon/runner.py | 3 - aiida/engine/exceptions.py | 3 - aiida/engine/launch.py | 3 - aiida/engine/persistence.py | 3 - aiida/engine/processes/__init__.py | 3 - aiida/engine/processes/builder.py | 3 - aiida/engine/processes/calcjobs/__init__.py | 3 - aiida/engine/processes/calcjobs/calcjob.py | 3 - aiida/engine/processes/calcjobs/manager.py | 3 - aiida/engine/processes/calcjobs/tasks.py | 3 - aiida/engine/processes/exit_code.py | 3 - aiida/engine/processes/functions.py | 3 - aiida/engine/processes/futures.py | 3 - aiida/engine/processes/ports.py | 3 - aiida/engine/processes/process.py | 3 - aiida/engine/processes/process_spec.py | 3 - aiida/engine/processes/workchains/__init__.py | 3 - .../engine/processes/workchains/awaitable.py | 3 - aiida/engine/processes/workchains/context.py | 3 - .../engine/processes/workchains/workchain.py | 3 - aiida/engine/runners.py | 3 - aiida/engine/transports.py | 3 - aiida/engine/utils.py | 3 - aiida/manage/backup/backup_base.py | 3 - aiida/manage/backup/backup_general.py | 3 - aiida/manage/backup/backup_setup.py | 3 - aiida/manage/backup/backup_utils.py | 3 - aiida/manage/caching.py | 3 - aiida/manage/configuration/__init__.py | 3 - aiida/manage/configuration/config.py | 3 - .../configuration/migrations/__init__.py | 3 - .../configuration/migrations/migrations.py | 3 - .../manage/configuration/migrations/utils.py | 3 - aiida/manage/configuration/options.py | 3 - aiida/manage/configuration/profile.py | 3 - aiida/manage/configuration/settings.py | 3 - aiida/manage/configuration/setup.py | 3 - aiida/manage/database/delete/nodes.py | 3 - aiida/manage/database/integrity/__init__.py | 4 -- .../database/integrity/duplicate_uuid.py | 3 - aiida/manage/database/integrity/plugins.py | 3 - aiida/manage/database/integrity/sql/links.py | 3 - aiida/manage/database/integrity/sql/nodes.py | 3 - aiida/manage/external/pgsu.py | 3 - aiida/manage/external/postgres.py | 3 - aiida/manage/external/rmq.py | 3 - aiida/manage/fixtures.py | 3 - aiida/manage/manager.py | 3 - aiida/manage/tests/__init__.py | 3 - aiida/manage/tests/pytest_fixtures.py | 3 - aiida/manage/tests/unittest_classes.py | 4 -- aiida/orm/__init__.py | 3 - aiida/orm/authinfos.py | 3 - aiida/orm/autogroup.py | 3 - aiida/orm/comments.py | 3 - aiida/orm/computers.py | 3 - aiida/orm/convert.py | 3 - aiida/orm/entities.py | 3 - aiida/orm/groups.py | 3 - aiida/orm/implementation/__init__.py | 3 - aiida/orm/implementation/authinfos.py | 3 - aiida/orm/implementation/backends.py | 3 - aiida/orm/implementation/comments.py | 3 - aiida/orm/implementation/computers.py | 3 - aiida/orm/implementation/django/authinfos.py | 3 - aiida/orm/implementation/django/backend.py | 3 - aiida/orm/implementation/django/comments.py | 3 - aiida/orm/implementation/django/computers.py | 3 - aiida/orm/implementation/django/convert.py | 3 - aiida/orm/implementation/django/entities.py | 4 -- aiida/orm/implementation/django/groups.py | 3 - aiida/orm/implementation/django/logs.py | 3 - aiida/orm/implementation/django/nodes.py | 3 - .../orm/implementation/django/querybuilder.py | 3 - aiida/orm/implementation/django/users.py | 3 - aiida/orm/implementation/django/utils.py | 3 - aiida/orm/implementation/groups.py | 3 - aiida/orm/implementation/logs.py | 3 - aiida/orm/implementation/nodes.py | 3 - aiida/orm/implementation/querybuilder.py | 3 - aiida/orm/implementation/sql/__init__.py | 3 - aiida/orm/implementation/sql/backends.py | 3 - .../implementation/sqlalchemy/authinfos.py | 3 - .../orm/implementation/sqlalchemy/backend.py | 3 - .../orm/implementation/sqlalchemy/comments.py | 3 - .../implementation/sqlalchemy/computers.py | 3 - .../orm/implementation/sqlalchemy/convert.py | 4 -- .../orm/implementation/sqlalchemy/entities.py | 4 -- aiida/orm/implementation/sqlalchemy/groups.py | 3 - aiida/orm/implementation/sqlalchemy/logs.py | 3 - aiida/orm/implementation/sqlalchemy/nodes.py | 3 - .../implementation/sqlalchemy/querybuilder.py | 3 - aiida/orm/implementation/sqlalchemy/users.py | 3 - aiida/orm/implementation/sqlalchemy/utils.py | 3 - aiida/orm/implementation/users.py | 3 - aiida/orm/implementation/utils.py | 3 - aiida/orm/logs.py | 3 - aiida/orm/nodes/__init__.py | 3 - aiida/orm/nodes/data/__init__.py | 3 - aiida/orm/nodes/data/array/__init__.py | 3 - aiida/orm/nodes/data/array/array.py | 3 - aiida/orm/nodes/data/array/bands.py | 4 -- aiida/orm/nodes/data/array/kpoints.py | 3 - aiida/orm/nodes/data/array/projection.py | 3 - aiida/orm/nodes/data/array/trajectory.py | 3 - aiida/orm/nodes/data/array/xy.py | 3 - aiida/orm/nodes/data/base.py | 3 - aiida/orm/nodes/data/bool.py | 3 - aiida/orm/nodes/data/cif.py | 3 - aiida/orm/nodes/data/code.py | 3 - aiida/orm/nodes/data/data.py | 3 - aiida/orm/nodes/data/dict.py | 3 - aiida/orm/nodes/data/float.py | 3 - aiida/orm/nodes/data/folder.py | 3 - aiida/orm/nodes/data/int.py | 3 - aiida/orm/nodes/data/list.py | 3 - aiida/orm/nodes/data/numeric.py | 3 - aiida/orm/nodes/data/orbital.py | 3 - aiida/orm/nodes/data/remote.py | 3 - aiida/orm/nodes/data/singlefile.py | 3 - aiida/orm/nodes/data/str.py | 3 - aiida/orm/nodes/data/structure.py | 3 - aiida/orm/nodes/data/upf.py | 3 - aiida/orm/nodes/node.py | 3 - aiida/orm/nodes/process/__init__.py | 3 - .../orm/nodes/process/calculation/__init__.py | 3 - .../nodes/process/calculation/calcfunction.py | 3 - .../orm/nodes/process/calculation/calcjob.py | 3 - .../nodes/process/calculation/calculation.py | 3 - aiida/orm/nodes/process/process.py | 3 - aiida/orm/nodes/process/workflow/__init__.py | 3 - aiida/orm/nodes/process/workflow/workchain.py | 3 - aiida/orm/nodes/process/workflow/workflow.py | 3 - .../nodes/process/workflow/workfunction.py | 3 - aiida/orm/querybuilder.py | 3 - aiida/orm/users.py | 3 - aiida/orm/utils/__init__.py | 3 - aiida/orm/utils/builders/code.py | 3 - aiida/orm/utils/builders/computer.py | 3 - aiida/orm/utils/calcjob.py | 3 - aiida/orm/utils/links.py | 3 - aiida/orm/utils/loaders.py | 3 - aiida/orm/utils/log.py | 3 - aiida/orm/utils/managers.py | 3 - aiida/orm/utils/mixins.py | 3 - aiida/orm/utils/node.py | 3 - aiida/orm/utils/remote.py | 3 - aiida/orm/utils/repository.py | 3 - aiida/orm/utils/serialize.py | 3 - aiida/parsers/__init__.py | 3 - aiida/parsers/parser.py | 3 - aiida/parsers/plugins/arithmetic/add.py | 3 - .../plugins/templatereplacer/doubler.py | 3 - aiida/plugins/__init__.py | 3 - aiida/plugins/entry_point.py | 3 - aiida/plugins/factories.py | 3 - aiida/plugins/utils.py | 3 - aiida/restapi/api.py | 3 - aiida/restapi/common/config.py | 3 - aiida/restapi/common/exceptions.py | 3 - aiida/restapi/common/identifiers.py | 3 - aiida/restapi/common/utils.py | 3 - aiida/restapi/resources.py | 4 -- aiida/restapi/run_api.py | 3 - aiida/restapi/translator/base.py | 4 -- aiida/restapi/translator/computer.py | 3 - aiida/restapi/translator/group.py | 3 - .../restapi/translator/nodes/data/__init__.py | 4 -- .../translator/nodes/data/array/bands.py | 3 - aiida/restapi/translator/nodes/data/cif.py | 3 - aiida/restapi/translator/nodes/data/code.py | 3 - .../restapi/translator/nodes/data/kpoints.py | 3 - .../translator/nodes/data/structure.py | 4 -- aiida/restapi/translator/nodes/data/upf.py | 3 - aiida/restapi/translator/nodes/node.py | 3 - .../nodes/process/calculation/calcfunction.py | 4 -- .../nodes/process/calculation/calcjob.py | 4 -- .../translator/nodes/process/process.py | 3 - .../nodes/process/workflow/workchain.py | 4 -- .../nodes/process/workflow/workfunction.py | 4 -- aiida/restapi/translator/user.py | 3 - aiida/schedulers/__init__.py | 3 - aiida/schedulers/datastructures.py | 3 - aiida/schedulers/plugins/direct.py | 3 - aiida/schedulers/plugins/lsf.py | 3 - aiida/schedulers/plugins/pbsbaseclasses.py | 3 - aiida/schedulers/plugins/pbspro.py | 3 - aiida/schedulers/plugins/sge.py | 3 - aiida/schedulers/plugins/slurm.py | 3 - aiida/schedulers/plugins/test_direct.py | 3 - aiida/schedulers/plugins/test_lsf.py | 3 - aiida/schedulers/plugins/test_pbspro.py | 3 - aiida/schedulers/plugins/test_sge.py | 3 - aiida/schedulers/plugins/test_slurm.py | 6 +- aiida/schedulers/plugins/test_torque.py | 3 - aiida/schedulers/plugins/torque.py | 3 - aiida/schedulers/scheduler.py | 3 - aiida/schedulers/test_datastructures.py | 3 - aiida/sphinxext/__init__.py | 4 -- aiida/sphinxext/calcjob.py | 4 -- aiida/sphinxext/process.py | 4 -- aiida/sphinxext/tests/conftest.py | 3 - aiida/sphinxext/tests/demo_workchain.py | 3 - aiida/sphinxext/tests/test_workchain.py | 3 - .../sphinxext/tests/workchain_source/conf.py | 3 - aiida/sphinxext/workchain.py | 4 -- aiida/tools/__init__.py | 3 - aiida/tools/calculations/__init__.py | 3 - aiida/tools/calculations/base.py | 3 - aiida/tools/data/array/kpoints/__init__.py | 3 - aiida/tools/data/array/kpoints/legacy.py | 3 - aiida/tools/data/array/kpoints/seekpath.py | 3 - aiida/tools/data/array/trajectory.py | 3 - aiida/tools/data/cif.py | 3 - aiida/tools/data/orbital/__init__.py | 3 - aiida/tools/data/orbital/orbital.py | 3 - aiida/tools/data/orbital/realhydrogen.py | 3 - aiida/tools/data/structure/__init__.py | 3 - aiida/tools/dbimporters/__init__.py | 3 - aiida/tools/dbimporters/baseclasses.py | 3 - aiida/tools/dbimporters/plugins/cod.py | 3 - aiida/tools/dbimporters/plugins/icsd.py | 3 - .../dbimporters/plugins/materialsproject.py | 3 - aiida/tools/dbimporters/plugins/mpds.py | 3 - aiida/tools/dbimporters/plugins/mpod.py | 3 - aiida/tools/dbimporters/plugins/nninc.py | 3 - aiida/tools/dbimporters/plugins/oqmd.py | 3 - aiida/tools/dbimporters/plugins/pcod.py | 3 - aiida/tools/dbimporters/plugins/tcod.py | 3 - aiida/tools/dbimporters/plugins/test_icsd.py | 4 -- .../plugins/test_materialsproject.py | 3 - aiida/tools/importexport/__init__.py | 3 - aiida/tools/importexport/common/__init__.py | 3 - aiida/tools/importexport/common/archive.py | 3 - aiida/tools/importexport/common/config.py | 3 - aiida/tools/importexport/common/exceptions.py | 3 - aiida/tools/importexport/common/utils.py | 3 - aiida/tools/importexport/dbexport/__init__.py | 3 - aiida/tools/importexport/dbexport/utils.py | 3 - aiida/tools/importexport/dbexport/zip.py | 3 - aiida/tools/importexport/dbimport/__init__.py | 3 - .../dbimport/backends/django/__init__.py | 3 - .../dbimport/backends/sqla/__init__.py | 3 - .../dbimport/backends/sqla/utils.py | 3 - .../importexport/dbimport/backends/utils.py | 3 - .../tools/importexport/migration/__init__.py | 3 - aiida/tools/importexport/migration/utils.py | 3 - .../importexport/migration/v01_to_v02.py | 3 - .../importexport/migration/v02_to_v03.py | 3 - .../importexport/migration/v03_to_v04.py | 3 - .../importexport/migration/v04_to_v05.py | 3 - .../importexport/migration/v05_to_v06.py | 3 - .../importexport/migration/v06_to_v07.py | 3 - .../importexport/migration/v07_to_v08.py | 3 - aiida/tools/ipython/aiida_magic_register.py | 3 - aiida/tools/ipython/ipython_magics.py | 3 - aiida/tools/visualization/__init__.py | 3 - aiida/tools/visualization/graph.py | 3 - aiida/transports/__init__.py | 3 - aiida/transports/cli.py | 3 - aiida/transports/plugins/local.py | 4 -- aiida/transports/plugins/ssh.py | 3 - aiida/transports/plugins/test_all_plugins.py | 3 - aiida/transports/plugins/test_local.py | 3 - aiida/transports/plugins/test_ssh.py | 3 - aiida/transports/transport.py | 3 - aiida/transports/util.py | 3 - docs/rtd_settings.py | 3 - docs/source/conf.py | 3 - .../developer_guide/plugins/conftest.py | 3 - docs/source/import_export/dbimporters/cod.rst | 1 - .../source/import_export/dbimporters/icsd.rst | 1 - .../workflows/expose_inputs/run_complex.py | 1 - .../workflows/expose_inputs/run_simple.py | 1 - docs/source/working_with_aiida/cookbook.rst | 1 - docs/update_req_for_rtd.py | 3 - docs/wsgi/app1/config.py | 3 - docs/wsgi/app2/config.py | 3 - examples/__init__.py | 3 - examples/work/workchain.py | 3 - examples/work/workchain_outline.py | 3 - examples/work/workfunction.py | 3 - setup.py | 4 -- utils/fastentrypoints.py | 3 - utils/update_dependencies.py | 3 - utils/validate_consistency.py | 3 - 683 files changed, 3 insertions(+), 2198 deletions(-) diff --git a/.ci/polish/cli.py b/.ci/polish/cli.py index d1e18680fb..9904fe5df7 100755 --- a/.ci/polish/cli.py +++ b/.ci/polish/cli.py @@ -9,9 +9,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Command line interface to dynamically create and run a WorkChain that can evaluate a reversed polish expression.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/.ci/polish/lib/expression.py b/.ci/polish/lib/expression.py index e212b2d89a..3396fb8c7a 100644 --- a/.ci/polish/lib/expression.py +++ b/.ci/polish/lib/expression.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Functions to dynamically generate reversed polish notation expressions.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import operator as operators diff --git a/.ci/polish/lib/workchain.py b/.ci/polish/lib/workchain.py index 4cf5f67954..74b3939e3b 100644 --- a/.ci/polish/lib/workchain.py +++ b/.ci/polish/lib/workchain.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Functions to dynamically generate a WorkChain from a reversed polish notation expression.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import errno diff --git a/.ci/pytest/conftest.py b/.ci/pytest/conftest.py index 8ff89ddb82..339bd83ce2 100644 --- a/.ci/pytest/conftest.py +++ b/.ci/pytest/conftest.py @@ -11,9 +11,6 @@ For pytest, put this file in the root directory of the package to make the fixtures available to all tests. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import pytest # pylint: disable=unused-import pytest_plugins = ['aiida.manage.tests.pytest_fixtures'] # pylint: disable=invalid-name diff --git a/.ci/pytest/test_pytest_fixtures.py b/.ci/pytest/test_pytest_fixtures.py index c24e5ddf5a..b64d7e0611 100644 --- a/.ci/pytest/test_pytest_fixtures.py +++ b/.ci/pytest/test_pytest_fixtures.py @@ -10,9 +10,6 @@ """ Test pytest fixtures. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import def test_aiida_localhost(aiida_localhost): diff --git a/.ci/pytest/test_unittest_example.py b/.ci/pytest/test_unittest_example.py index 9a53c3459d..412a6199c7 100644 --- a/.ci/pytest/test_unittest_example.py +++ b/.ci/pytest/test_unittest_example.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test running unittest test cases through pytest.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import unittest import pytest diff --git a/.ci/test_daemon.py b/.ci/test_daemon.py index 687ebd2a19..78514abf6b 100644 --- a/.ci/test_daemon.py +++ b/.ci/test_daemon.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import subprocess import sys diff --git a/.ci/test_plugin_testcase.py b/.ci/test_plugin_testcase.py index 4358d602ac..60aff51545 100644 --- a/.ci/test_plugin_testcase.py +++ b/.ci/test_plugin_testcase.py @@ -13,9 +13,6 @@ This must be in a standalone script because it would clash with other tests, Since the dbenv gets loaded on the temporary profile. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import sys import unittest diff --git a/.ci/test_profile_manager.py b/.ci/test_profile_manager.py index af748f41de..6a15ab3e74 100644 --- a/.ci/test_profile_manager.py +++ b/.ci/test_profile_manager.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unittests for TestManager""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import unittest import warnings diff --git a/.ci/test_test_manager.py b/.ci/test_test_manager.py index 9abbd1df83..1143b7d20b 100644 --- a/.ci/test_test_manager.py +++ b/.ci/test_test_manager.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unittests for TestManager""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import unittest import warnings import sys diff --git a/.ci/workchains.py b/.ci/workchains.py index c4a018a6e7..89e124002f 100644 --- a/.ci/workchains.py +++ b/.ci/workchains.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.engine import calcfunction, workfunction, WorkChain, ToContext, append_ from aiida.engine.persistence import ObjectLoader diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff4ed4e025..9ea9d8dff6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -234,75 +234,3 @@ aiida/__init__.py )$ pass_filenames: false - -# modernizer: make sure our code-base is Python 3 ready -- repo: https://github.com/python-modernize/python-modernize.git - rev: a234ce4e185cf77a55632888f1811d83b4ad9ef2 - hooks: - - id: python-modernize - exclude: > - (?x)^( - docs/.*| - aiida/engine/utils.py # exclude because tornado WaitIterator.next() does not work with next(...) - )$ - args: - - --write - - --nobackups -# Following are all the fixers in python-modernize. -# Those marked as 'done' were run at some point and their results checked -# and incorporated if necessary, but they can't be applied without breaking valid cases - - --fix=apply - - --fix=except - - --fix=exec - - --fix=execfile - - --fix=exitfunc - - --fix=funcattrs -#done: - --fix=has_key -#optional: - --fix=idioms -#done: - --fix=long - - --fix=methodattrs - - --fix=ne - - --fix=numliterals - - --fix=operator - - --fix=paren - - --fix=reduce - - --fix=renames - - --fix=repr -#optional: - --fix=set_literal - - --fix=standarderror - - --fix=sys_exc - - --fix=throw - - --fix=tuple_params - - --fix=types -#optional: - --fix=ws_comma - - --fix=xreadlines - - --fix=basestring - - --fix=classic_division -#done: - --fix=dict_six - - --fix=file - - --fix=filter - - --fix=import - - --fix=imports_six - - --fix=input_six - - --fix=int_long_tuple - - --fix=itertools_imports_six - - --fix=itertools_six - - --fix=map - - --fix=metaclass - - --fix=next -#optional: - --fix=open - - --fix=print - - --fix=raise - - --fix=raise_six - - --fix=unichr - - --fix=unicode - - --fix=unicode_future - - --fix=unicode_type - - --fix=urllib_six - - --fix=xrange_six - - --fix=zip - -- repo: git://github.com/pre-commit/pre-commit-hooks - rev: v1.1.1 - hooks: - - id: check-yaml diff --git a/aiida/__init__.py b/aiida/__init__.py index 06b6eca8f5..202afe4dd7 100644 --- a/aiida/__init__.py +++ b/aiida/__init__.py @@ -20,9 +20,6 @@ More information at http://www.aiida.net """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import warnings import six diff --git a/aiida/backends/__init__.py b/aiida/backends/__init__.py index a4d87dc829..4a60f9ce8a 100644 --- a/aiida/backends/__init__.py +++ b/aiida/backends/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for implementations of database backends.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import BACKEND_DJANGO = 'django' BACKEND_SQLA = 'sqlalchemy' diff --git a/aiida/backends/djsite/db/migrations/0001_initial.py b/aiida/backends/djsite/db/migrations/0001_initial.py index eb288d4a02..4cb9e2a06a 100644 --- a/aiida/backends/djsite/db/migrations/0001_initial.py +++ b/aiida/backends/djsite/db/migrations/0001_initial.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations import django.db.models.deletion diff --git a/aiida/backends/djsite/db/migrations/0002_db_state_change.py b/aiida/backends/djsite/db/migrations/0002_db_state_change.py index 30f6331772..7e5eaf1a49 100644 --- a/aiida/backends/djsite/db/migrations/0002_db_state_change.py +++ b/aiida/backends/djsite/db/migrations/0002_db_state_change.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations diff --git a/aiida/backends/djsite/db/migrations/0003_add_link_type.py b/aiida/backends/djsite/db/migrations/0003_add_link_type.py index 29e4ffd795..40117da428 100644 --- a/aiida/backends/djsite/db/migrations/0003_add_link_type.py +++ b/aiida/backends/djsite/db/migrations/0003_add_link_type.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations import aiida.common.timezone diff --git a/aiida/backends/djsite/db/migrations/0004_add_daemon_and_uuid_indices.py b/aiida/backends/djsite/db/migrations/0004_add_daemon_and_uuid_indices.py index f018a9ec6e..5bf78b5bdf 100644 --- a/aiida/backends/djsite/db/migrations/0004_add_daemon_and_uuid_indices.py +++ b/aiida/backends/djsite/db/migrations/0004_add_daemon_and_uuid_indices.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models from django.db import migrations diff --git a/aiida/backends/djsite/db/migrations/0005_add_cmtime_indices.py b/aiida/backends/djsite/db/migrations/0005_add_cmtime_indices.py index 5a500356ff..71a901f1a0 100644 --- a/aiida/backends/djsite/db/migrations/0005_add_cmtime_indices.py +++ b/aiida/backends/djsite/db/migrations/0005_add_cmtime_indices.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations import aiida.common.timezone diff --git a/aiida/backends/djsite/db/migrations/0006_delete_dbpath.py b/aiida/backends/djsite/db/migrations/0006_delete_dbpath.py index de6a43e7e0..905c459960 100644 --- a/aiida/backends/djsite/db/migrations/0006_delete_dbpath.py +++ b/aiida/backends/djsite/db/migrations/0006_delete_dbpath.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0007_update_linktypes.py b/aiida/backends/djsite/db/migrations/0007_update_linktypes.py index 822e1270e8..c694cb793b 100644 --- a/aiida/backends/djsite/db/migrations/0007_update_linktypes.py +++ b/aiida/backends/djsite/db/migrations/0007_update_linktypes.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0008_code_hidden_to_extra.py b/aiida/backends/djsite/db/migrations/0008_code_hidden_to_extra.py index 970665194d..52b3292951 100644 --- a/aiida/backends/djsite/db/migrations/0008_code_hidden_to_extra.py +++ b/aiida/backends/djsite/db/migrations/0008_code_hidden_to_extra.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0009_base_data_plugin_type_string.py b/aiida/backends/djsite/db/migrations/0009_base_data_plugin_type_string.py index b9de6cfe50..2ca434e3e4 100644 --- a/aiida/backends/djsite/db/migrations/0009_base_data_plugin_type_string.py +++ b/aiida/backends/djsite/db/migrations/0009_base_data_plugin_type_string.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0010_process_type.py b/aiida/backends/djsite/db/migrations/0010_process_type.py index ffbfdd2db6..11fb34bd32 100644 --- a/aiida/backends/djsite/db/migrations/0010_process_type.py +++ b/aiida/backends/djsite/db/migrations/0010_process_type.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py b/aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py index 5d8c1ccdbc..35cdeb715c 100644 --- a/aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py +++ b/aiida/backends/djsite/db/migrations/0011_delete_kombu_tables.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0012_drop_dblock.py b/aiida/backends/djsite/db/migrations/0012_drop_dblock.py index 2e90970a52..b89787f3f1 100644 --- a/aiida/backends/djsite/db/migrations/0012_drop_dblock.py +++ b/aiida/backends/djsite/db/migrations/0012_drop_dblock.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0013_django_1_8.py b/aiida/backends/djsite/db/migrations/0013_django_1_8.py index 840ccd3519..6448e3b924 100644 --- a/aiida/backends/djsite/db/migrations/0013_django_1_8.py +++ b/aiida/backends/djsite/db/migrations/0013_django_1_8.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import models, migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0014_add_node_uuid_unique_constraint.py b/aiida/backends/djsite/db/migrations/0014_add_node_uuid_unique_constraint.py index c69dff8ec9..48794a87c5 100644 --- a/aiida/backends/djsite/db/migrations/0014_add_node_uuid_unique_constraint.py +++ b/aiida/backends/djsite/db/migrations/0014_add_node_uuid_unique_constraint.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name """Add a uniqueness constraint to the uuid column of DbNode table.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations, models from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0015_invalidating_node_hash.py b/aiida/backends/djsite/db/migrations/0015_invalidating_node_hash.py index a29bca99f8..62e8e446b9 100644 --- a/aiida/backends/djsite/db/migrations/0015_invalidating_node_hash.py +++ b/aiida/backends/djsite/db/migrations/0015_invalidating_node_hash.py @@ -11,10 +11,6 @@ """ Invalidating node hash - User should rehash nodes for caching """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0016_code_sub_class_of_data.py b/aiida/backends/djsite/db/migrations/0016_code_sub_class_of_data.py index 387429d8f6..611a324dc1 100644 --- a/aiida/backends/djsite/db/migrations/0016_code_sub_class_of_data.py +++ b/aiida/backends/djsite/db/migrations/0016_code_sub_class_of_data.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0017_drop_dbcalcstate.py b/aiida/backends/djsite/db/migrations/0017_drop_dbcalcstate.py index 7172cbe3c6..4f7bcd904e 100644 --- a/aiida/backends/djsite/db/migrations/0017_drop_dbcalcstate.py +++ b/aiida/backends/djsite/db/migrations/0017_drop_dbcalcstate.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0018_django_1_11.py b/aiida/backends/djsite/db/migrations/0018_django_1_11.py index 4859d684fd..5de1faf5ce 100644 --- a/aiida/backends/djsite/db/migrations/0018_django_1_11.py +++ b/aiida/backends/djsite/db/migrations/0018_django_1_11.py @@ -11,11 +11,6 @@ # pylint: disable=invalid-name,too-few-public-methods """Migration for upgrade to django 1.11""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - # 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 diff --git a/aiida/backends/djsite/db/migrations/0019_migrate_builtin_calculations.py b/aiida/backends/djsite/db/migrations/0019_migrate_builtin_calculations.py index cba6c4e405..7e4326fdfd 100644 --- a/aiida/backends/djsite/db/migrations/0019_migrate_builtin_calculations.py +++ b/aiida/backends/djsite/db/migrations/0019_migrate_builtin_calculations.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Migration to reflect the name change of the built in calculation entry points in the database.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0020_provenance_redesign.py b/aiida/backends/djsite/db/migrations/0020_provenance_redesign.py index 24a35decc5..d6d58e1463 100644 --- a/aiida/backends/djsite/db/migrations/0020_provenance_redesign.py +++ b/aiida/backends/djsite/db/migrations/0020_provenance_redesign.py @@ -10,11 +10,6 @@ # pylint: disable=invalid-name,too-few-public-methods,unused-argument """Migration after the provenance redesign""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error from django.db import migrations diff --git a/aiida/backends/djsite/db/migrations/0021_dbgroup_name_to_label_type_to_type_string.py b/aiida/backends/djsite/db/migrations/0021_dbgroup_name_to_label_type_to_type_string.py index ea3a212c4c..4dc20c70c2 100644 --- a/aiida/backends/djsite/db/migrations/0021_dbgroup_name_to_label_type_to_type_string.py +++ b/aiida/backends/djsite/db/migrations/0021_dbgroup_name_to_label_type_to_type_string.py @@ -10,11 +10,6 @@ # pylint: disable=invalid-name,too-few-public-methods """Migration that renames name and type columns to label and type_string""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - # pylint: disable=no-name-in-module,import-error from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0022_dbgroup_type_string_change_content.py b/aiida/backends/djsite/db/migrations/0022_dbgroup_type_string_change_content.py index 3373c9a623..ae086cc6b6 100644 --- a/aiida/backends/djsite/db/migrations/0022_dbgroup_type_string_change_content.py +++ b/aiida/backends/djsite/db/migrations/0022_dbgroup_type_string_change_content.py @@ -10,11 +10,6 @@ # pylint: disable=invalid-name,too-few-public-methods """Migration after the update of group_types""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - # pylint: disable=no-name-in-module,import-error from django.db import migrations from aiida.backends.djsite.db.migrations import upgrade_schema_version diff --git a/aiida/backends/djsite/db/migrations/0023_calc_job_option_attribute_keys.py b/aiida/backends/djsite/db/migrations/0023_calc_job_option_attribute_keys.py index 6fda22c1d7..8877a93c79 100644 --- a/aiida/backends/djsite/db/migrations/0023_calc_job_option_attribute_keys.py +++ b/aiida/backends/djsite/db/migrations/0023_calc_job_option_attribute_keys.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Migration of ProcessNode attributes for metadata options whose key changed.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0024_dblog_update.py b/aiida/backends/djsite/db/migrations/0024_dblog_update.py index 2c3545ce93..f9b46606b4 100644 --- a/aiida/backends/djsite/db/migrations/0024_dblog_update.py +++ b/aiida/backends/djsite/db/migrations/0024_dblog_update.py @@ -11,11 +11,6 @@ # pylint: disable=invalid-name,too-few-public-methods """Migration for the update of the DbLog table. Addition of uuids""" -from __future__ import division -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import print_function import sys from six.moves import zip import click diff --git a/aiida/backends/djsite/db/migrations/0025_move_data_within_node_module.py b/aiida/backends/djsite/db/migrations/0025_move_data_within_node_module.py index aa1e8a0ea6..d8b6aec054 100644 --- a/aiida/backends/djsite/db/migrations/0025_move_data_within_node_module.py +++ b/aiida/backends/djsite/db/migrations/0025_move_data_within_node_module.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Data migration for `Data` nodes after it was moved in the `aiida.orm.node` module changing the type string.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0026_trajectory_symbols_to_attribute.py b/aiida/backends/djsite/db/migrations/0026_trajectory_symbols_to_attribute.py index c84d96895e..b031d12a11 100644 --- a/aiida/backends/djsite/db/migrations/0026_trajectory_symbols_to_attribute.py +++ b/aiida/backends/djsite/db/migrations/0026_trajectory_symbols_to_attribute.py @@ -12,10 +12,6 @@ This process has to be done in two separate consecutive migrations to prevent data loss in between. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-member,no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0027_delete_trajectory_symbols_array.py b/aiida/backends/djsite/db/migrations/0027_delete_trajectory_symbols_array.py index 831420d960..68f8813c3a 100644 --- a/aiida/backends/djsite/db/migrations/0027_delete_trajectory_symbols_array.py +++ b/aiida/backends/djsite/db/migrations/0027_delete_trajectory_symbols_array.py @@ -12,10 +12,6 @@ This process has to be done in two separate consecutive migrations to prevent data loss in between. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0028_remove_node_prefix.py b/aiida/backends/djsite/db/migrations/0028_remove_node_prefix.py index 848580f9a5..9ef96369fc 100644 --- a/aiida/backends/djsite/db/migrations/0028_remove_node_prefix.py +++ b/aiida/backends/djsite/db/migrations/0028_remove_node_prefix.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Final data migration for `Nodes` after `aiida.orm.nodes` reorganization was finalized to remove the `node.` prefix""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0029_rename_parameter_data_to_dict.py b/aiida/backends/djsite/db/migrations/0029_rename_parameter_data_to_dict.py index 9f487a1079..632e1ca16b 100644 --- a/aiida/backends/djsite/db/migrations/0029_rename_parameter_data_to_dict.py +++ b/aiida/backends/djsite/db/migrations/0029_rename_parameter_data_to_dict.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Data migration for after `ParameterData` was renamed to `Dict`.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0030_dbnode_type_to_dbnode_node_type.py b/aiida/backends/djsite/db/migrations/0030_dbnode_type_to_dbnode_node_type.py index c8f7ecc76e..c0aa6303c3 100644 --- a/aiida/backends/djsite/db/migrations/0030_dbnode_type_to_dbnode_node_type.py +++ b/aiida/backends/djsite/db/migrations/0030_dbnode_type_to_dbnode_node_type.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Renaming `DbNode.type` to `DbNode.node_type`""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0031_remove_dbcomputer_enabled.py b/aiida/backends/djsite/db/migrations/0031_remove_dbcomputer_enabled.py index 064a134a67..6fcfa94069 100644 --- a/aiida/backends/djsite/db/migrations/0031_remove_dbcomputer_enabled.py +++ b/aiida/backends/djsite/db/migrations/0031_remove_dbcomputer_enabled.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Remove `DbComputer.enabled`""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0032_remove_legacy_workflows.py b/aiida/backends/djsite/db/migrations/0032_remove_legacy_workflows.py index b52afc32cd..5057896835 100644 --- a/aiida/backends/djsite/db/migrations/0032_remove_legacy_workflows.py +++ b/aiida/backends/djsite/db/migrations/0032_remove_legacy_workflows.py @@ -9,11 +9,7 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Remove legacy workflow.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import import sys import click diff --git a/aiida/backends/djsite/db/migrations/0033_replace_text_field_with_json_field.py b/aiida/backends/djsite/db/migrations/0033_replace_text_field_with_json_field.py index fa9e58259f..f2905e9253 100644 --- a/aiida/backends/djsite/db/migrations/0033_replace_text_field_with_json_field.py +++ b/aiida/backends/djsite/db/migrations/0033_replace_text_field_with_json_field.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Replace use of text fields to store JSON data with builtin JSONField.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error,no-member diff --git a/aiida/backends/djsite/db/migrations/0034_drop_node_columns_nodeversion_public.py b/aiida/backends/djsite/db/migrations/0034_drop_node_columns_nodeversion_public.py index aca6fa6412..5dc85f3ac8 100644 --- a/aiida/backends/djsite/db/migrations/0034_drop_node_columns_nodeversion_public.py +++ b/aiida/backends/djsite/db/migrations/0034_drop_node_columns_nodeversion_public.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Drop the columns `nodeversion` and `public` from the `DbNode` model.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error,no-member diff --git a/aiida/backends/djsite/db/migrations/0035_simplify_user_model.py b/aiida/backends/djsite/db/migrations/0035_simplify_user_model.py index bb3d39235a..37cc99f595 100644 --- a/aiida/backends/djsite/db/migrations/0035_simplify_user_model.py +++ b/aiida/backends/djsite/db/migrations/0035_simplify_user_model.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Simplify the `DbUser` model.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error,no-member diff --git a/aiida/backends/djsite/db/migrations/0036_drop_computer_transport_params.py b/aiida/backends/djsite/db/migrations/0036_drop_computer_transport_params.py index 400b4da41d..a92d5ed2fa 100644 --- a/aiida/backends/djsite/db/migrations/0036_drop_computer_transport_params.py +++ b/aiida/backends/djsite/db/migrations/0036_drop_computer_transport_params.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Drop the `transport_params` from the `Computer` database model.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error,no-member diff --git a/aiida/backends/djsite/db/migrations/0037_attributes_extras_settings_json.py b/aiida/backends/djsite/db/migrations/0037_attributes_extras_settings_json.py index 7484e2f089..966b7d9870 100644 --- a/aiida/backends/djsite/db/migrations/0037_attributes_extras_settings_json.py +++ b/aiida/backends/djsite/db/migrations/0037_attributes_extras_settings_json.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,import-error,no-name-in-module,too-few-public-methods,no-member """Adding JSONB field for Node.attributes and Node.Extras""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import math diff --git a/aiida/backends/djsite/db/migrations/0038_data_migration_legacy_job_calculations.py b/aiida/backends/djsite/db/migrations/0038_data_migration_legacy_job_calculations.py index e2eabaddae..a3e94a8b6e 100644 --- a/aiida/backends/djsite/db/migrations/0038_data_migration_legacy_job_calculations.py +++ b/aiida/backends/djsite/db/migrations/0038_data_migration_legacy_job_calculations.py @@ -39,10 +39,6 @@ Note: in addition to the three attributes mentioned in the table, all matched nodes will get `Legacy JobCalculation` as their `process_label` which is one of the default columns of `verdi process list`. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0039_reset_hash.py b/aiida/backends/djsite/db/migrations/0039_reset_hash.py index 098acc6a32..0cd1e3c8ed 100644 --- a/aiida/backends/djsite/db/migrations/0039_reset_hash.py +++ b/aiida/backends/djsite/db/migrations/0039_reset_hash.py @@ -11,10 +11,6 @@ """ Invalidating node hash - User should rehash nodes for caching """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0040_data_migration_legacy_process_attributes.py b/aiida/backends/djsite/db/migrations/0040_data_migration_legacy_process_attributes.py index edb5226c38..f97c56b3d0 100644 --- a/aiida/backends/djsite/db/migrations/0040_data_migration_legacy_process_attributes.py +++ b/aiida/backends/djsite/db/migrations/0040_data_migration_legacy_process_attributes.py @@ -26,10 +26,6 @@ `running`; or `waiting`, because those are valid active processes that are not yet sealed. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0041_seal_unsealed_processes.py b/aiida/backends/djsite/db/migrations/0041_seal_unsealed_processes.py index 5b91817e0c..85302f7217 100644 --- a/aiida/backends/djsite/db/migrations/0041_seal_unsealed_processes.py +++ b/aiida/backends/djsite/db/migrations/0041_seal_unsealed_processes.py @@ -19,10 +19,6 @@ case for legacy calculations like `InlineCalculation` nodes. Their node type was already migrated in `0020` but most of them will be unsealed. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0042_prepare_schema_reset.py b/aiida/backends/djsite/db/migrations/0042_prepare_schema_reset.py index fe42ad0c7f..6caf7f66df 100644 --- a/aiida/backends/djsite/db/migrations/0042_prepare_schema_reset.py +++ b/aiida/backends/djsite/db/migrations/0042_prepare_schema_reset.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-few-public-methods """Prepare the schema reset.""" -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/0043_default_link_label.py b/aiida/backends/djsite/db/migrations/0043_default_link_label.py index b3af227040..29a2ab3ce1 100644 --- a/aiida/backends/djsite/db/migrations/0043_default_link_label.py +++ b/aiida/backends/djsite/db/migrations/0043_default_link_label.py @@ -13,10 +13,6 @@ The old process functions used to use `_return` as the default link label, however, since labels that start or end with and underscore are illegal because they are used for namespacing. """ -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/djsite/db/migrations/__init__.py b/aiida/backends/djsite/db/migrations/__init__.py index 7c71f7bbfd..78519ea1fe 100644 --- a/aiida/backends/djsite/db/migrations/__init__.py +++ b/aiida/backends/djsite/db/migrations/__init__.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/backends/djsite/db/models.py b/aiida/backends/djsite/db/models.py index f7e09adfbb..6e7d1414ee 100644 --- a/aiida/backends/djsite/db/models.py +++ b/aiida/backends/djsite/db/models.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import contextlib import six diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0037_attributes_extras_settings_json.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0037_attributes_extras_settings_json.py index a6685144ea..90bc8bc9ff 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0037_attributes_extras_settings_json.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0037_attributes_extras_settings_json.py @@ -12,9 +12,6 @@ Tests for the migrations of the attributes, extras and settings from EAV to JSONB Migration 0037_attributes_extras_settings_json """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import copy diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0038_data_migration_legacy_job_calculations.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0038_data_migration_legacy_job_calculations.py index 3a33a613cc..b8d04cae0f 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0038_data_migration_legacy_job_calculations.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0038_data_migration_legacy_job_calculations.py @@ -12,9 +12,6 @@ Tests for the migrations of the attributes, extras and settings from EAV to JSONB Migration 0037_attributes_extras_settings_json """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import six diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0040_data_migration_legacy_process_attributes.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0040_data_migration_legacy_process_attributes.py index 34f20dab7f..00bde3d350 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0040_data_migration_legacy_process_attributes.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0040_data_migration_legacy_process_attributes.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module,invalid-name """Tests for the migrations of legacy process attributes.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from aiida.backends.djsite.db.subtests.migrations.test_migrations_common import TestMigrations diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0041_seal_unsealed_processes.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0041_seal_unsealed_processes.py index dd25a37cc7..0c3141d5fd 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0041_seal_unsealed_processes.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0041_seal_unsealed_processes.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module,invalid-name """Tests for the migrations of legacy process attributes.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from aiida.backends.djsite.db.subtests.migrations.test_migrations_common import TestMigrations diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0043_default_link_label.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0043_default_link_label.py index 0e388ffbf9..7a3416e26d 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_0043_default_link_label.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_0043_default_link_label.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module,invalid-name """Tests for the migrations of legacy process attributes.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from aiida.backends.djsite.db.subtests.migrations.test_migrations_common import TestMigrations diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_common.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_common.py index dfe72abdb3..3067988e29 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_common.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_common.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module,invalid-name """ The basic functionality for the migration tests""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from django.apps import apps from django.db.migrations.executor import MigrationExecutor diff --git a/aiida/backends/djsite/db/subtests/migrations/test_migrations_many.py b/aiida/backends/djsite/db/subtests/migrations/test_migrations_many.py index e6bba241fb..a3d3ef76f0 100644 --- a/aiida/backends/djsite/db/subtests/migrations/test_migrations_many.py +++ b/aiida/backends/djsite/db/subtests/migrations/test_migrations_many.py @@ -12,9 +12,6 @@ This file contains the majority of the migration tests that are too short to go to a separate file. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range diff --git a/aiida/backends/djsite/db/subtests/test_generic.py b/aiida/backends/djsite/db/subtests/test_generic.py index 1abbf3c19e..1256cabba2 100644 --- a/aiida/backends/djsite/db/subtests/test_generic.py +++ b/aiida/backends/djsite/db/subtests/test_generic.py @@ -10,9 +10,6 @@ """ Generic tests that need the use of the DB """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/djsite/db/testbase.py b/aiida/backends/djsite/db/testbase.py index 39766a242d..fe602e328d 100644 --- a/aiida/backends/djsite/db/testbase.py +++ b/aiida/backends/djsite/db/testbase.py @@ -10,9 +10,6 @@ """ Base class for AiiDA tests """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testimplbase import AiidaTestImplementation from aiida.orm.implementation.django.backend import DjangoBackend diff --git a/aiida/backends/djsite/manage.py b/aiida/backends/djsite/manage.py index 4489e9def9..4cdde7ce7c 100755 --- a/aiida/backends/djsite/manage.py +++ b/aiida/backends/djsite/manage.py @@ -8,12 +8,7 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -# pylint: disable=import-error,no-name-in-module,unused-argument """Simple wrapper around Django's `manage.py` CLI script.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - import click from aiida.cmdline.params import options, types @@ -22,9 +17,9 @@ @click.command() @options.PROFILE(required=True, type=types.ProfileParamType(load_profile=True)) @click.argument('command', nargs=-1) -def main(profile, command): +def main(profile, command): # pylint: disable=unused-argument """Simple wrapper around the Django command line tool that first loads an AiiDA profile.""" - from django.core.management import execute_from_command_line + from django.core.management import execute_from_command_line # pylint: disable=import-error,no-name-in-module from aiida.manage.manager import get_manager manager = get_manager() diff --git a/aiida/backends/djsite/manager.py b/aiida/backends/djsite/manager.py index b5a9460db9..a08022b82e 100644 --- a/aiida/backends/djsite/manager.py +++ b/aiida/backends/djsite/manager.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # pylint: disable=import-error,no-name-in-module """Utilities and configuration of the Django database schema.""" -from __future__ import absolute_import import os import django diff --git a/aiida/backends/djsite/queries.py b/aiida/backends/djsite/queries.py index 3329ef374e..86233d6e49 100644 --- a/aiida/backends/djsite/queries.py +++ b/aiida/backends/djsite/queries.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from six.moves import zip from aiida.backends.general.abstractqueries import AbstractQueryManager diff --git a/aiida/backends/djsite/settings.py b/aiida/backends/djsite/settings.py index b497d60b4f..342e7c288a 100644 --- a/aiida/backends/djsite/settings.py +++ b/aiida/backends/djsite/settings.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error, no-name-in-module """ Django settings for the AiiDA project. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from sqlalchemy.dialects.postgresql import JSONB from sqlalchemy.dialects.postgresql import UUID diff --git a/aiida/backends/djsite/utils.py b/aiida/backends/djsite/utils.py index 4f0b5b50a7..710f9af81d 100644 --- a/aiida/backends/djsite/utils.py +++ b/aiida/backends/djsite/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions specific to the Django backend.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import def delete_nodes_and_connections_django(pks_to_delete): # pylint: disable=invalid-name diff --git a/aiida/backends/general/abstractqueries.py b/aiida/backends/general/abstractqueries.py index 53e8f051c3..0c01fd33bd 100644 --- a/aiida/backends/general/abstractqueries.py +++ b/aiida/backends/general/abstractqueries.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from abc import ABCMeta import six diff --git a/aiida/backends/general/migrations/calc_state.py b/aiida/backends/general/migrations/calc_state.py index 08c884403b..caac32716c 100644 --- a/aiida/backends/general/migrations/calc_state.py +++ b/aiida/backends/general/migrations/calc_state.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Data structures for mapping legacy `JobCalculation` data to new process attributes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import namedtuple StateMapping = namedtuple('StateMapping', ['state', 'process_state', 'exit_status', 'process_status']) diff --git a/aiida/backends/general/migrations/provenance_redesign.py b/aiida/backends/general/migrations/provenance_redesign.py index 408ca0fdeb..c40e85e1ad 100644 --- a/aiida/backends/general/migrations/provenance_redesign.py +++ b/aiida/backends/general/migrations/provenance_redesign.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SQL statements to detect invalid/ununderstood links for the provenance redesign migration.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import SELECT_CALCULATIONS_WITH_OUTGOING_CALL = """ SELECT node_in.uuid, node_out.uuid, link.type, link.label diff --git a/aiida/backends/general/migrations/utils.py b/aiida/backends/general/migrations/utils.py index dabee8da58..0c310a6b5f 100644 --- a/aiida/backends/general/migrations/utils.py +++ b/aiida/backends/general/migrations/utils.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name """Various utils that should be used during migrations and migrations tests because the AiiDA ORM cannot be used.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import errno diff --git a/aiida/backends/manager.py b/aiida/backends/manager.py index 7497fbe131..550dc9d54a 100644 --- a/aiida/backends/manager.py +++ b/aiida/backends/manager.py @@ -8,7 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for settings and utilities to determine and set the database schema versions.""" -from __future__ import absolute_import import abc import collections diff --git a/aiida/backends/profile.py b/aiida/backends/profile.py index 88ed830d45..1ba7e46965 100644 --- a/aiida/backends/profile.py +++ b/aiida/backends/profile.py @@ -12,9 +12,6 @@ .. deprecated:: 1.0.0 Will be removed in `v1.1.0`, use :mod:`aiida.backends` instead. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import warnings diff --git a/aiida/backends/sqlalchemy/__init__.py b/aiida/backends/sqlalchemy/__init__.py index d5b04d89f2..5d3e284179 100644 --- a/aiida/backends/sqlalchemy/__init__.py +++ b/aiida/backends/sqlalchemy/__init__.py @@ -9,10 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module,global-statement """Module with implementation of the database backend using SqlAlchemy.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - from sqlalchemy import create_engine from sqlalchemy.orm import scoped_session from sqlalchemy.orm import sessionmaker diff --git a/aiida/backends/sqlalchemy/manage.py b/aiida/backends/sqlalchemy/manage.py index 9e4780da23..d593b6bb7e 100755 --- a/aiida/backends/sqlalchemy/manage.py +++ b/aiida/backends/sqlalchemy/manage.py @@ -9,9 +9,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Simple wrapper around the alembic command line tool that first loads an AiiDA profile.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import alembic import click diff --git a/aiida/backends/sqlalchemy/manager.py b/aiida/backends/sqlalchemy/manager.py index 625b0b6e88..662a29ecfc 100644 --- a/aiida/backends/sqlalchemy/manager.py +++ b/aiida/backends/sqlalchemy/manager.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # pylint: disable=import-error,no-name-in-module """Utilities and configuration of the SqlAlchemy database schema.""" -from __future__ import absolute_import import os import contextlib diff --git a/aiida/backends/sqlalchemy/migrations/env.py b/aiida/backends/sqlalchemy/migrations/env.py index eaacd87727..a36415e04f 100644 --- a/aiida/backends/sqlalchemy/migrations/env.py +++ b/aiida/backends/sqlalchemy/migrations/env.py @@ -7,10 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import with_statement -from __future__ import absolute_import from alembic import context diff --git a/aiida/backends/sqlalchemy/migrations/versions/041a79fc615f_dblog_cleaning.py b/aiida/backends/sqlalchemy/migrations/versions/041a79fc615f_dblog_cleaning.py index a5e652df10..2d7d5d1fcf 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/041a79fc615f_dblog_cleaning.py +++ b/aiida/backends/sqlalchemy/migrations/versions/041a79fc615f_dblog_cleaning.py @@ -19,9 +19,6 @@ Create Date: 2018-12-28 15:53:14.596810 """ # pylint: disable=wrong-import-order -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import sys from six.moves import zip diff --git a/aiida/backends/sqlalchemy/migrations/versions/07fac78e6209_drop_computer_transport_params.py b/aiida/backends/sqlalchemy/migrations/versions/07fac78e6209_drop_computer_transport_params.py index 229ed59c74..d38f1fe672 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/07fac78e6209_drop_computer_transport_params.py +++ b/aiida/backends/sqlalchemy/migrations/versions/07fac78e6209_drop_computer_transport_params.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/0aebbeab274d_base_data_plugin_type_string.py b/aiida/backends/sqlalchemy/migrations/versions/0aebbeab274d_base_data_plugin_type_string.py index a4e940f516..0f3392ce6f 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/0aebbeab274d_base_data_plugin_type_string.py +++ b/aiida/backends/sqlalchemy/migrations/versions/0aebbeab274d_base_data_plugin_type_string.py @@ -14,9 +14,6 @@ Create Date: 2018-02-24 20:12:44.731358 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/118349c10896_default_link_label.py b/aiida/backends/sqlalchemy/migrations/versions/118349c10896_default_link_label.py index 42b9538e56..11bb63b7f6 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/118349c10896_default_link_label.py +++ b/aiida/backends/sqlalchemy/migrations/versions/118349c10896_default_link_label.py @@ -18,9 +18,6 @@ Create Date: 2019-11-21 09:43:45.006053 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=no-member,no-name-in-module,import-error from alembic import op diff --git a/aiida/backends/sqlalchemy/migrations/versions/12536798d4d3_trajectory_symbols_to_attribute.py b/aiida/backends/sqlalchemy/migrations/versions/12536798d4d3_trajectory_symbols_to_attribute.py index 071eca4625..835cdff566 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/12536798d4d3_trajectory_symbols_to_attribute.py +++ b/aiida/backends/sqlalchemy/migrations/versions/12536798d4d3_trajectory_symbols_to_attribute.py @@ -15,10 +15,6 @@ """ # pylint: disable=invalid-name -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-member,no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/140c971ae0a3_migrate_builtin_calculations.py b/aiida/backends/sqlalchemy/migrations/versions/140c971ae0a3_migrate_builtin_calculations.py index 5cc588f7ac..b0b0332dee 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/140c971ae0a3_migrate_builtin_calculations.py +++ b/aiida/backends/sqlalchemy/migrations/versions/140c971ae0a3_migrate_builtin_calculations.py @@ -15,9 +15,6 @@ Create Date: 2018-12-06 12:42:01.897037 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed diff --git a/aiida/backends/sqlalchemy/migrations/versions/162b99bca4a2_drop_dbcalcstate.py b/aiida/backends/sqlalchemy/migrations/versions/162b99bca4a2_drop_dbcalcstate.py index 00ef50082b..1151eea5d8 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/162b99bca4a2_drop_dbcalcstate.py +++ b/aiida/backends/sqlalchemy/migrations/versions/162b99bca4a2_drop_dbcalcstate.py @@ -14,9 +14,6 @@ Create Date: 2018-11-14 08:37:13.719646 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.dialects import postgresql import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/1830c8430131_drop_node_columns_nodeversion_public.py b/aiida/backends/sqlalchemy/migrations/versions/1830c8430131_drop_node_columns_nodeversion_public.py index 0295c32afb..7f42c2d91a 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/1830c8430131_drop_node_columns_nodeversion_public.py +++ b/aiida/backends/sqlalchemy/migrations/versions/1830c8430131_drop_node_columns_nodeversion_public.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/1b8ed3425af9_remove_legacy_workflows.py b/aiida/backends/sqlalchemy/migrations/versions/1b8ed3425af9_remove_legacy_workflows.py index dc3d595e1c..b4935f83bd 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/1b8ed3425af9_remove_legacy_workflows.py +++ b/aiida/backends/sqlalchemy/migrations/versions/1b8ed3425af9_remove_legacy_workflows.py @@ -15,9 +15,6 @@ Create Date: 2019-04-03 17:11:44.073582 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import sys import click diff --git a/aiida/backends/sqlalchemy/migrations/versions/239cea6d2452_provenance_redesign.py b/aiida/backends/sqlalchemy/migrations/versions/239cea6d2452_provenance_redesign.py index 56f191f183..74988e63b6 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/239cea6d2452_provenance_redesign.py +++ b/aiida/backends/sqlalchemy/migrations/versions/239cea6d2452_provenance_redesign.py @@ -15,9 +15,6 @@ Create Date: 2018-12-04 21:14:15.250247 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/26d561acd560_data_migration_legacy_job_calculations.py b/aiida/backends/sqlalchemy/migrations/versions/26d561acd560_data_migration_legacy_job_calculations.py index e53f98ac7f..16ca636185 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/26d561acd560_data_migration_legacy_job_calculations.py +++ b/aiida/backends/sqlalchemy/migrations/versions/26d561acd560_data_migration_legacy_job_calculations.py @@ -45,9 +45,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module,line-too-long -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/35d4ee9a1b0e_code_hidden_attr_to_extra.py b/aiida/backends/sqlalchemy/migrations/versions/35d4ee9a1b0e_code_hidden_attr_to_extra.py index 8c27aa2889..7cacdbb518 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/35d4ee9a1b0e_code_hidden_attr_to_extra.py +++ b/aiida/backends/sqlalchemy/migrations/versions/35d4ee9a1b0e_code_hidden_attr_to_extra.py @@ -14,9 +14,6 @@ Create Date: 2018-02-21 22:00:43.460534 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/375c2db70663_dblog_uuid_uniqueness_constraint.py b/aiida/backends/sqlalchemy/migrations/versions/375c2db70663_dblog_uuid_uniqueness_constraint.py index eebdbc4ae7..73ccd2b232 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/375c2db70663_dblog_uuid_uniqueness_constraint.py +++ b/aiida/backends/sqlalchemy/migrations/versions/375c2db70663_dblog_uuid_uniqueness_constraint.py @@ -17,9 +17,6 @@ Create Date: 2019-01-30 20:26:16.550071 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # revision identifiers, used by Alembic. diff --git a/aiida/backends/sqlalchemy/migrations/versions/37f3d4882837_make_all_uuid_columns_unique.py b/aiida/backends/sqlalchemy/migrations/versions/37f3d4882837_make_all_uuid_columns_unique.py index 3c0f349ee4..76d6e1569d 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/37f3d4882837_make_all_uuid_columns_unique.py +++ b/aiida/backends/sqlalchemy/migrations/versions/37f3d4882837_make_all_uuid_columns_unique.py @@ -16,9 +16,6 @@ """ # pylint: disable=invalid-name -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed diff --git a/aiida/backends/sqlalchemy/migrations/versions/3d6190594e19_remove_dbcomputer_enabled.py b/aiida/backends/sqlalchemy/migrations/versions/3d6190594e19_remove_dbcomputer_enabled.py index 20b8ffef79..a0ce3fdda4 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/3d6190594e19_remove_dbcomputer_enabled.py +++ b/aiida/backends/sqlalchemy/migrations/versions/3d6190594e19_remove_dbcomputer_enabled.py @@ -15,9 +15,6 @@ Create Date: 2019-04-03 14:38:50.585639 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-member,no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/59edaf8a8b79_adding_indexes_and_constraints_to_the_.py b/aiida/backends/sqlalchemy/migrations/versions/59edaf8a8b79_adding_indexes_and_constraints_to_the_.py index c82cfa089e..f42d245587 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/59edaf8a8b79_adding_indexes_and_constraints_to_the_.py +++ b/aiida/backends/sqlalchemy/migrations/versions/59edaf8a8b79_adding_indexes_and_constraints_to_the_.py @@ -14,9 +14,6 @@ Create Date: 2018-06-22 14:50:18.447211 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.engine.reflection import Inspector diff --git a/aiida/backends/sqlalchemy/migrations/versions/5a49629f0d45_dblink_indices.py b/aiida/backends/sqlalchemy/migrations/versions/5a49629f0d45_dblink_indices.py index bc6ec0d2bd..17661d95e2 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/5a49629f0d45_dblink_indices.py +++ b/aiida/backends/sqlalchemy/migrations/versions/5a49629f0d45_dblink_indices.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # revision identifiers, used by Alembic. diff --git a/aiida/backends/sqlalchemy/migrations/versions/5d4d844852b6_invalidating_node_hash.py b/aiida/backends/sqlalchemy/migrations/versions/5d4d844852b6_invalidating_node_hash.py index 29d956e27d..3622531a02 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/5d4d844852b6_invalidating_node_hash.py +++ b/aiida/backends/sqlalchemy/migrations/versions/5d4d844852b6_invalidating_node_hash.py @@ -15,9 +15,6 @@ Create Date: 2018-10-26 17:14:33.566670 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed diff --git a/aiida/backends/sqlalchemy/migrations/versions/5ddd24e52864_dbnode_type_to_dbnode_node_type.py b/aiida/backends/sqlalchemy/migrations/versions/5ddd24e52864_dbnode_type_to_dbnode_node_type.py index 1b3a347949..9685949640 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/5ddd24e52864_dbnode_type_to_dbnode_node_type.py +++ b/aiida/backends/sqlalchemy/migrations/versions/5ddd24e52864_dbnode_type_to_dbnode_node_type.py @@ -15,9 +15,6 @@ Create Date: 2019-02-22 17:09:57.715114 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/61fc0913fae9_remove_node_prefix.py b/aiida/backends/sqlalchemy/migrations/versions/61fc0913fae9_remove_node_prefix.py index efe27ad1ed..e988b836f0 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/61fc0913fae9_remove_node_prefix.py +++ b/aiida/backends/sqlalchemy/migrations/versions/61fc0913fae9_remove_node_prefix.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/62fe0d36de90_add_node_uuid_unique_constraint.py b/aiida/backends/sqlalchemy/migrations/versions/62fe0d36de90_add_node_uuid_unique_constraint.py index 627ff9c2c9..fb67adf396 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/62fe0d36de90_add_node_uuid_unique_constraint.py +++ b/aiida/backends/sqlalchemy/migrations/versions/62fe0d36de90_add_node_uuid_unique_constraint.py @@ -14,9 +14,6 @@ Create Date: 2018-07-02 17:50:42.929382 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from alembic import op # revision identifiers, used by Alembic. diff --git a/aiida/backends/sqlalchemy/migrations/versions/6a5c2ea1439d_move_data_within_node_module.py b/aiida/backends/sqlalchemy/migrations/versions/6a5c2ea1439d_move_data_within_node_module.py index 6dcd7697d8..f6e32c800e 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/6a5c2ea1439d_move_data_within_node_module.py +++ b/aiida/backends/sqlalchemy/migrations/versions/6a5c2ea1439d_move_data_within_node_module.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/6c629c886f84_process_type.py b/aiida/backends/sqlalchemy/migrations/versions/6c629c886f84_process_type.py index 9620bc86ff..79fd26ca75 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/6c629c886f84_process_type.py +++ b/aiida/backends/sqlalchemy/migrations/versions/6c629c886f84_process_type.py @@ -14,9 +14,6 @@ Create Date: 2018-03-15 13:23:12.941148 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/70c7d732f1b2_delete_dbpath.py b/aiida/backends/sqlalchemy/migrations/versions/70c7d732f1b2_delete_dbpath.py index 2dac1763df..a74596b65b 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/70c7d732f1b2_delete_dbpath.py +++ b/aiida/backends/sqlalchemy/migrations/versions/70c7d732f1b2_delete_dbpath.py @@ -14,9 +14,6 @@ Create Date: 2017-10-17 10:30:23.327195 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql diff --git a/aiida/backends/sqlalchemy/migrations/versions/7a6587e16f4c_unique_constraints_for_the_db_dbgroup_.py b/aiida/backends/sqlalchemy/migrations/versions/7a6587e16f4c_unique_constraints_for_the_db_dbgroup_.py index 39336a44fe..3fa4f5a96b 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/7a6587e16f4c_unique_constraints_for_the_db_dbgroup_.py +++ b/aiida/backends/sqlalchemy/migrations/versions/7a6587e16f4c_unique_constraints_for_the_db_dbgroup_.py @@ -15,9 +15,6 @@ Create Date: 2019-02-11 19:25:11.744902 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # revision identifiers, used by Alembic. diff --git a/aiida/backends/sqlalchemy/migrations/versions/7b38a9e783e7_seal_unsealed_processes.py b/aiida/backends/sqlalchemy/migrations/versions/7b38a9e783e7_seal_unsealed_processes.py index 52a52d992c..4efa91aa29 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/7b38a9e783e7_seal_unsealed_processes.py +++ b/aiida/backends/sqlalchemy/migrations/versions/7b38a9e783e7_seal_unsealed_processes.py @@ -24,9 +24,6 @@ Create Date: 2019-10-28 13:22:56.224234 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/7ca08c391c49_calc_job_option_attribute_keys.py b/aiida/backends/sqlalchemy/migrations/versions/7ca08c391c49_calc_job_option_attribute_keys.py index 86d2e952d2..953111f23e 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/7ca08c391c49_calc_job_option_attribute_keys.py +++ b/aiida/backends/sqlalchemy/migrations/versions/7ca08c391c49_calc_job_option_attribute_keys.py @@ -15,9 +15,6 @@ Create Date: 2019-01-15 15:03:43.876133 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/89176227b25_add_indexes_to_dbworkflowdata_table.py b/aiida/backends/sqlalchemy/migrations/versions/89176227b25_add_indexes_to_dbworkflowdata_table.py index 01607984ec..cd7ff83347 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/89176227b25_add_indexes_to_dbworkflowdata_table.py +++ b/aiida/backends/sqlalchemy/migrations/versions/89176227b25_add_indexes_to_dbworkflowdata_table.py @@ -14,9 +14,6 @@ Create Date: 2017-11-03 11:06:00.327195 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # revision identifiers, used by Alembic. diff --git a/aiida/backends/sqlalchemy/migrations/versions/91b573400be5_prepare_schema_reset.py b/aiida/backends/sqlalchemy/migrations/versions/91b573400be5_prepare_schema_reset.py index 4180957daa..88ec6ded94 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/91b573400be5_prepare_schema_reset.py +++ b/aiida/backends/sqlalchemy/migrations/versions/91b573400be5_prepare_schema_reset.py @@ -15,9 +15,6 @@ Create Date: 2019-07-25 14:58:39.866822 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/a514d673c163_drop_dblock.py b/aiida/backends/sqlalchemy/migrations/versions/a514d673c163_drop_dblock.py index 4d9ed12e38..427d8c565e 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/a514d673c163_drop_dblock.py +++ b/aiida/backends/sqlalchemy/migrations/versions/a514d673c163_drop_dblock.py @@ -14,9 +14,6 @@ Create Date: 2018-05-10 19:08:51.780194 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.dialects import postgresql import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/a603da2cc809_code_sub_class_of_data.py b/aiida/backends/sqlalchemy/migrations/versions/a603da2cc809_code_sub_class_of_data.py index 81dd3d54c5..7342df1e61 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/a603da2cc809_code_sub_class_of_data.py +++ b/aiida/backends/sqlalchemy/migrations/versions/a603da2cc809_code_sub_class_of_data.py @@ -14,9 +14,6 @@ Create Date: 2018-11-13 18:15:07.300709 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/a6048f0ffca8_update_linktypes.py b/aiida/backends/sqlalchemy/migrations/versions/a6048f0ffca8_update_linktypes.py index e7ea021d5c..7636241e41 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/a6048f0ffca8_update_linktypes.py +++ b/aiida/backends/sqlalchemy/migrations/versions/a6048f0ffca8_update_linktypes.py @@ -14,9 +14,6 @@ Create Date: 2017-10-17 10:51:23.327195 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/b8b23ddefad4_dbgroup_name_to_label_type_to_type_string.py b/aiida/backends/sqlalchemy/migrations/versions/b8b23ddefad4_dbgroup_name_to_label_type_to_type_string.py index 7b2cb62041..48ae39eb1d 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/b8b23ddefad4_dbgroup_name_to_label_type_to_type_string.py +++ b/aiida/backends/sqlalchemy/migrations/versions/b8b23ddefad4_dbgroup_name_to_label_type_to_type_string.py @@ -15,9 +15,6 @@ Create Date: 2018-12-06 15:25:32.865136 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=no-name-in-module,import-error from alembic import op diff --git a/aiida/backends/sqlalchemy/migrations/versions/ce56d84bcc35_delete_trajectory_symbols_array.py b/aiida/backends/sqlalchemy/migrations/versions/ce56d84bcc35_delete_trajectory_symbols_array.py index afdd6014bc..cf5932e79e 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/ce56d84bcc35_delete_trajectory_symbols_array.py +++ b/aiida/backends/sqlalchemy/migrations/versions/ce56d84bcc35_delete_trajectory_symbols_array.py @@ -15,10 +15,6 @@ """ # pylint: disable=invalid-name -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-member,no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/d254fdfed416_rename_parameter_data_to_dict.py b/aiida/backends/sqlalchemy/migrations/versions/d254fdfed416_rename_parameter_data_to_dict.py index 16a9b8c7be..071e548ce3 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/d254fdfed416_rename_parameter_data_to_dict.py +++ b/aiida/backends/sqlalchemy/migrations/versions/d254fdfed416_rename_parameter_data_to_dict.py @@ -15,9 +15,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/de2eaf6978b4_simplify_user_model.py b/aiida/backends/sqlalchemy/migrations/versions/de2eaf6978b4_simplify_user_model.py index fffe4b2183..143054fe7b 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/de2eaf6978b4_simplify_user_model.py +++ b/aiida/backends/sqlalchemy/migrations/versions/de2eaf6978b4_simplify_user_model.py @@ -17,9 +17,6 @@ """ # pylint: disable=invalid-name,no-member,import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/e15ef2630a1b_initial_schema.py b/aiida/backends/sqlalchemy/migrations/versions/e15ef2630a1b_initial_schema.py index 91157f9a6c..e63e8633e6 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/e15ef2630a1b_initial_schema.py +++ b/aiida/backends/sqlalchemy/migrations/versions/e15ef2630a1b_initial_schema.py @@ -14,9 +14,6 @@ Create Date: 2017-06-28 17:12:23.327195 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql diff --git a/aiida/backends/sqlalchemy/migrations/versions/e72ad251bcdb_dbgroup_class_change_type_string_values.py b/aiida/backends/sqlalchemy/migrations/versions/e72ad251bcdb_dbgroup_class_change_type_string_values.py index 22ade772cb..dc5ee00764 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/e72ad251bcdb_dbgroup_class_change_type_string_values.py +++ b/aiida/backends/sqlalchemy/migrations/versions/e72ad251bcdb_dbgroup_class_change_type_string_values.py @@ -15,9 +15,6 @@ Create Date: 2018-12-06 19:34:47.732890 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=no-name-in-module,import-error from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/migrations/versions/e734dd5e50d7_data_migration_legacy_process_attributes.py b/aiida/backends/sqlalchemy/migrations/versions/e734dd5e50d7_data_migration_legacy_process_attributes.py index 26f5b67434..7b73c85547 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/e734dd5e50d7_data_migration_legacy_process_attributes.py +++ b/aiida/backends/sqlalchemy/migrations/versions/e734dd5e50d7_data_migration_legacy_process_attributes.py @@ -30,9 +30,6 @@ Create Date: 2019-07-04 18:23:56.127994 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed # pylint: disable=no-name-in-module,import-error diff --git a/aiida/backends/sqlalchemy/migrations/versions/e797afa09270_reset_hash.py b/aiida/backends/sqlalchemy/migrations/versions/e797afa09270_reset_hash.py index ac0e07a40a..1bb3880178 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/e797afa09270_reset_hash.py +++ b/aiida/backends/sqlalchemy/migrations/versions/e797afa09270_reset_hash.py @@ -15,9 +15,6 @@ Create Date: 2019-07-01 19:39:33.605457 """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from alembic import op # Remove when https://github.com/PyCQA/pylint/issues/1931 is fixed diff --git a/aiida/backends/sqlalchemy/migrations/versions/ea2f50e7f615_dblog_create_uuid_column.py b/aiida/backends/sqlalchemy/migrations/versions/ea2f50e7f615_dblog_create_uuid_column.py index 52b94397ee..b7b0a91862 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/ea2f50e7f615_dblog_create_uuid_column.py +++ b/aiida/backends/sqlalchemy/migrations/versions/ea2f50e7f615_dblog_create_uuid_column.py @@ -18,9 +18,6 @@ """ # pylint: disable=no-name-in-module,import-error -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from six.moves import zip from alembic import op import sqlalchemy as sa diff --git a/aiida/backends/sqlalchemy/migrations/versions/f9a69de76a9a_delete_kombu_tables.py b/aiida/backends/sqlalchemy/migrations/versions/f9a69de76a9a_delete_kombu_tables.py index 518a40c6c8..ff38db86f6 100644 --- a/aiida/backends/sqlalchemy/migrations/versions/f9a69de76a9a_delete_kombu_tables.py +++ b/aiida/backends/sqlalchemy/migrations/versions/f9a69de76a9a_delete_kombu_tables.py @@ -14,9 +14,6 @@ Create Date: 2018-05-10 15:07:59.235950 """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from alembic import op from sqlalchemy.sql import text diff --git a/aiida/backends/sqlalchemy/models/__init__.py b/aiida/backends/sqlalchemy/models/__init__.py index 978d9f4cc4..dda6cbf09f 100644 --- a/aiida/backends/sqlalchemy/models/__init__.py +++ b/aiida/backends/sqlalchemy/models/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module to define the database models for the SqlAlchemy backend.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy_utils import force_instant_defaults diff --git a/aiida/backends/sqlalchemy/models/authinfo.py b/aiida/backends/sqlalchemy/models/authinfo.py index 5a4fb81e2a..bdbe71b2ae 100644 --- a/aiida/backends/sqlalchemy/models/authinfo.py +++ b/aiida/backends/sqlalchemy/models/authinfo.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship diff --git a/aiida/backends/sqlalchemy/models/base.py b/aiida/backends/sqlalchemy/models/base.py index 021c2c4848..1ac40b0cb5 100644 --- a/aiida/backends/sqlalchemy/models/base.py +++ b/aiida/backends/sqlalchemy/models/base.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import orm from sqlalchemy.ext.declarative import declarative_base diff --git a/aiida/backends/sqlalchemy/models/comment.py b/aiida/backends/sqlalchemy/models/comment.py index 0c782e5c49..adbb7ee0ba 100644 --- a/aiida/backends/sqlalchemy/models/comment.py +++ b/aiida/backends/sqlalchemy/models/comment.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship from sqlalchemy.schema import Column diff --git a/aiida/backends/sqlalchemy/models/computer.py b/aiida/backends/sqlalchemy/models/computer.py index 869fe9c863..252e6c0ee0 100644 --- a/aiida/backends/sqlalchemy/models/computer.py +++ b/aiida/backends/sqlalchemy/models/computer.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy.dialects.postgresql import UUID, JSONB from sqlalchemy.schema import Column diff --git a/aiida/backends/sqlalchemy/models/group.py b/aiida/backends/sqlalchemy/models/group.py index 5ba34408a5..25c3473841 100644 --- a/aiida/backends/sqlalchemy/models/group.py +++ b/aiida/backends/sqlalchemy/models/group.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship, backref from sqlalchemy.schema import Column, Table, UniqueConstraint, Index diff --git a/aiida/backends/sqlalchemy/models/log.py b/aiida/backends/sqlalchemy/models/log.py index 7afdb02eba..a68d85abb2 100644 --- a/aiida/backends/sqlalchemy/models/log.py +++ b/aiida/backends/sqlalchemy/models/log.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import ForeignKey from sqlalchemy.dialects.postgresql import UUID, JSONB diff --git a/aiida/backends/sqlalchemy/models/node.py b/aiida/backends/sqlalchemy/models/node.py index 5b993808db..1faa77330d 100644 --- a/aiida/backends/sqlalchemy/models/node.py +++ b/aiida/backends/sqlalchemy/models/node.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy import ForeignKey from sqlalchemy.orm import relationship, backref diff --git a/aiida/backends/sqlalchemy/models/settings.py b/aiida/backends/sqlalchemy/models/settings.py index 4f391a76fa..c0309fb567 100644 --- a/aiida/backends/sqlalchemy/models/settings.py +++ b/aiida/backends/sqlalchemy/models/settings.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from pytz import UTC diff --git a/aiida/backends/sqlalchemy/models/user.py b/aiida/backends/sqlalchemy/models/user.py index 47facd532d..d48e6d219d 100644 --- a/aiida/backends/sqlalchemy/models/user.py +++ b/aiida/backends/sqlalchemy/models/user.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy.schema import Column from sqlalchemy.types import Integer, String diff --git a/aiida/backends/sqlalchemy/queries.py b/aiida/backends/sqlalchemy/queries.py index 649b31e465..4ff631abd9 100644 --- a/aiida/backends/sqlalchemy/queries.py +++ b/aiida/backends/sqlalchemy/queries.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.general.abstractqueries import AbstractQueryManager diff --git a/aiida/backends/sqlalchemy/tests/test_generic.py b/aiida/backends/sqlalchemy/tests/test_generic.py index 5ca550bb2a..591a532cbd 100644 --- a/aiida/backends/sqlalchemy/tests/test_generic.py +++ b/aiida/backends/sqlalchemy/tests/test_generic.py @@ -10,9 +10,6 @@ """ Generic tests that need the be specific to sqlalchemy """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range diff --git a/aiida/backends/sqlalchemy/tests/test_migrations.py b/aiida/backends/sqlalchemy/tests/test_migrations.py index b083fd88c7..4a3d9eb9f7 100644 --- a/aiida/backends/sqlalchemy/tests/test_migrations.py +++ b/aiida/backends/sqlalchemy/tests/test_migrations.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-lines """Tests for the migration engine (Alembic) as well as for the AiiDA migrations for SQLAlchemy.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from contextlib import contextmanager import os diff --git a/aiida/backends/sqlalchemy/tests/test_nodes.py b/aiida/backends/sqlalchemy/tests/test_nodes.py index c930abb654..36b3764164 100644 --- a/aiida/backends/sqlalchemy/tests/test_nodes.py +++ b/aiida/backends/sqlalchemy/tests/test_nodes.py @@ -11,9 +11,6 @@ Tests for nodes, attributes and links """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.orm import Data from aiida import orm diff --git a/aiida/backends/sqlalchemy/tests/test_query.py b/aiida/backends/sqlalchemy/tests/test_query.py index 11187a822e..f6bf062f5b 100644 --- a/aiida/backends/sqlalchemy/tests/test_query.py +++ b/aiida/backends/sqlalchemy/tests/test_query.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range, zip diff --git a/aiida/backends/sqlalchemy/tests/test_schema.py b/aiida/backends/sqlalchemy/tests/test_schema.py index 45a126931c..216cb218d0 100644 --- a/aiida/backends/sqlalchemy/tests/test_schema.py +++ b/aiida/backends/sqlalchemy/tests/test_schema.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range diff --git a/aiida/backends/sqlalchemy/tests/test_session.py b/aiida/backends/sqlalchemy/tests/test_session.py index 4ba1834c1d..53f50da082 100644 --- a/aiida/backends/sqlalchemy/tests/test_session.py +++ b/aiida/backends/sqlalchemy/tests/test_session.py @@ -11,9 +11,6 @@ Testing Session possible problems. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy.orm import sessionmaker import aiida.backends diff --git a/aiida/backends/sqlalchemy/tests/test_utils.py b/aiida/backends/sqlalchemy/tests/test_utils.py index 9750e38994..9b09ad22f7 100644 --- a/aiida/backends/sqlalchemy/tests/test_utils.py +++ b/aiida/backends/sqlalchemy/tests/test_utils.py @@ -21,9 +21,6 @@ """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy_utils.functions.database import drop_database diff --git a/aiida/backends/sqlalchemy/tests/testbase.py b/aiida/backends/sqlalchemy/tests/testbase.py index 0ddb6c4584..fb4ed23d71 100644 --- a/aiida/backends/sqlalchemy/tests/testbase.py +++ b/aiida/backends/sqlalchemy/tests/testbase.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testimplbase import AiidaTestImplementation from aiida.orm.implementation.sqlalchemy.backend import SqlaBackend diff --git a/aiida/backends/sqlalchemy/utils.py b/aiida/backends/sqlalchemy/utils.py index a2e2b64e5c..edb7369ff3 100644 --- a/aiida/backends/sqlalchemy/utils.py +++ b/aiida/backends/sqlalchemy/utils.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=import-error,no-name-in-module """Utility functions specific to the SqlAlchemy backend.""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function def delete_nodes_and_connections_sqla(pks_to_delete): # pylint: disable=invalid-name diff --git a/aiida/backends/testbase.py b/aiida/backends/testbase.py index 1688601188..d61a72e1b4 100644 --- a/aiida/backends/testbase.py +++ b/aiida/backends/testbase.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import os import sys diff --git a/aiida/backends/testimplbase.py b/aiida/backends/testimplbase.py index f920657b0d..d2aa197685 100644 --- a/aiida/backends/testimplbase.py +++ b/aiida/backends/testimplbase.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from abc import ABCMeta, abstractmethod import six diff --git a/aiida/backends/tests/__init__.py b/aiida/backends/tests/__init__.py index edafb350bd..11a42dabab 100644 --- a/aiida/backends/tests/__init__.py +++ b/aiida/backends/tests/__init__.py @@ -11,9 +11,6 @@ """ Module for defining tests that required access to (a temporary) database """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range from aiida.backends import BACKEND_SQLA, BACKEND_DJANGO diff --git a/aiida/backends/tests/cmdline/commands/test_calcjob.py b/aiida/backends/tests/cmdline/commands/test_calcjob.py index b84ac27b63..81583227bb 100644 --- a/aiida/backends/tests/cmdline/commands/test_calcjob.py +++ b/aiida/backends/tests/cmdline/commands/test_calcjob.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=protected-access,too-many-locals,invalid-name,too-many-public-methods """Tests for `verdi calcjob`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_code.py b/aiida/backends/tests/cmdline/commands/test_code.py index 84882c0676..71be160f05 100644 --- a/aiida/backends/tests/cmdline/commands/test_code.py +++ b/aiida/backends/tests/cmdline/commands/test_code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the 'verdi code' command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import subprocess as sp import traceback diff --git a/aiida/backends/tests/cmdline/commands/test_comment.py b/aiida/backends/tests/cmdline/commands/test_comment.py index c48f099dc8..ea2dc85fae 100644 --- a/aiida/backends/tests/cmdline/commands/test_comment.py +++ b/aiida/backends/tests/cmdline/commands/test_comment.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_computer.py b/aiida/backends/tests/cmdline/commands/test_computer.py index eab23cf8a7..fc9b610fb5 100644 --- a/aiida/backends/tests/cmdline/commands/test_computer.py +++ b/aiida/backends/tests/cmdline/commands/test_computer.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the 'verdi computer' command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import OrderedDict import os diff --git a/aiida/backends/tests/cmdline/commands/test_config.py b/aiida/backends/tests/cmdline/commands/test_config.py index 390816fdb4..b58351bc4b 100644 --- a/aiida/backends/tests/cmdline/commands/test_config.py +++ b/aiida/backends/tests/cmdline/commands/test_config.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi config`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_daemon.py b/aiida/backends/tests/cmdline/commands/test_daemon.py index 23aa2b2999..62665edc85 100644 --- a/aiida/backends/tests/cmdline/commands/test_daemon.py +++ b/aiida/backends/tests/cmdline/commands/test_daemon.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi daemon`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_data.py b/aiida/backends/tests/cmdline/commands/test_data.py index 3295dab7cd..55efca3ea0 100644 --- a/aiida/backends/tests/cmdline/commands/test_data.py +++ b/aiida/backends/tests/cmdline/commands/test_data.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import sys import io import os diff --git a/aiida/backends/tests/cmdline/commands/test_database.py b/aiida/backends/tests/cmdline/commands/test_database.py index 587ccfc9b5..7681d4b968 100644 --- a/aiida/backends/tests/cmdline/commands/test_database.py +++ b/aiida/backends/tests/cmdline/commands/test_database.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,protected-access """Tests for `verdi database`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import enum diff --git a/aiida/backends/tests/cmdline/commands/test_export.py b/aiida/backends/tests/cmdline/commands/test_export.py index ec2d1d6e5a..3ceb6c82c3 100644 --- a/aiida/backends/tests/cmdline/commands/test_export.py +++ b/aiida/backends/tests/cmdline/commands/test_export.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi export`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import os import tempfile diff --git a/aiida/backends/tests/cmdline/commands/test_graph.py b/aiida/backends/tests/cmdline/commands/test_graph.py index b37e5c45b0..9170ed00a6 100644 --- a/aiida/backends/tests/cmdline/commands/test_graph.py +++ b/aiida/backends/tests/cmdline/commands/test_graph.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for verdi graph""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import os diff --git a/aiida/backends/tests/cmdline/commands/test_group.py b/aiida/backends/tests/cmdline/commands/test_group.py index fa5bb965da..1ea6d90d37 100644 --- a/aiida/backends/tests/cmdline/commands/test_group.py +++ b/aiida/backends/tests/cmdline/commands/test_group.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `verdi group` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/cmdline/commands/test_help.py b/aiida/backends/tests/cmdline/commands/test_help.py index b0ac612a75..6b1fe6b116 100644 --- a/aiida/backends/tests/cmdline/commands/test_help.py +++ b/aiida/backends/tests/cmdline/commands/test_help.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi help`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_import.py b/aiida/backends/tests/cmdline/commands/test_import.py index 9e9ac78dfa..5a5ca9c006 100644 --- a/aiida/backends/tests/cmdline/commands/test_import.py +++ b/aiida/backends/tests/cmdline/commands/test_import.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi import`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range diff --git a/aiida/backends/tests/cmdline/commands/test_node.py b/aiida/backends/tests/cmdline/commands/test_node.py index fc22866bcf..9e7b4545e0 100644 --- a/aiida/backends/tests/cmdline/commands/test_node.py +++ b/aiida/backends/tests/cmdline/commands/test_node.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for verdi node""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import errno diff --git a/aiida/backends/tests/cmdline/commands/test_process.py b/aiida/backends/tests/cmdline/commands/test_process.py index 7875dffb3d..2d7e3e5578 100644 --- a/aiida/backends/tests/cmdline/commands/test_process.py +++ b/aiida/backends/tests/cmdline/commands/test_process.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi process`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import subprocess diff --git a/aiida/backends/tests/cmdline/commands/test_profile.py b/aiida/backends/tests/cmdline/commands/test_profile.py index 294e411626..78d206b211 100644 --- a/aiida/backends/tests/cmdline/commands/test_profile.py +++ b/aiida/backends/tests/cmdline/commands/test_profile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi profile`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/backends/tests/cmdline/commands/test_rehash.py b/aiida/backends/tests/cmdline/commands/test_rehash.py index 0a0a9ee147..1fa5154c4a 100644 --- a/aiida/backends/tests/cmdline/commands/test_rehash.py +++ b/aiida/backends/tests/cmdline/commands/test_rehash.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi rehash`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_restapi.py b/aiida/backends/tests/cmdline/commands/test_restapi.py index 5abe3b5c9a..c12d6b517a 100644 --- a/aiida/backends/tests/cmdline/commands/test_restapi.py +++ b/aiida/backends/tests/cmdline/commands/test_restapi.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi restapi`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_run.py b/aiida/backends/tests/cmdline/commands/test_run.py index b878fe4ad4..9085f939a1 100644 --- a/aiida/backends/tests/cmdline/commands/test_run.py +++ b/aiida/backends/tests/cmdline/commands/test_run.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi run`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/cmdline/commands/test_setup.py b/aiida/backends/tests/cmdline/commands/test_setup.py index 39193c3ffc..1967d2c52d 100644 --- a/aiida/backends/tests/cmdline/commands/test_setup.py +++ b/aiida/backends/tests/cmdline/commands/test_setup.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi profile`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import traceback import unittest diff --git a/aiida/backends/tests/cmdline/commands/test_status.py b/aiida/backends/tests/cmdline/commands/test_status.py index f751e820a3..23387e8382 100644 --- a/aiida/backends/tests/cmdline/commands/test_status.py +++ b/aiida/backends/tests/cmdline/commands/test_status.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi status`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/cmdline/commands/test_user.py b/aiida/backends/tests/cmdline/commands/test_user.py index 8f70f04072..f5803a2eec 100644 --- a/aiida/backends/tests/cmdline/commands/test_user.py +++ b/aiida/backends/tests/cmdline/commands/test_user.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi user`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner diff --git a/aiida/backends/tests/cmdline/commands/test_verdi.py b/aiida/backends/tests/cmdline/commands/test_verdi.py index 62dde45a2a..7cd34bdb8c 100644 --- a/aiida/backends/tests/cmdline/commands/test_verdi.py +++ b/aiida/backends/tests/cmdline/commands/test_verdi.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for `verdi`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.testing import CliRunner from aiida import get_version diff --git a/aiida/backends/tests/cmdline/params/types/test_calculation.py b/aiida/backends/tests/cmdline/params/types/test_calculation.py index a2418a3921..7abd622f1f 100644 --- a/aiida/backends/tests/cmdline/params/types/test_calculation.py +++ b/aiida/backends/tests/cmdline/params/types/test_calculation.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `CalculationParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import CalculationParamType diff --git a/aiida/backends/tests/cmdline/params/types/test_code.py b/aiida/backends/tests/cmdline/params/types/test_code.py index b82946484d..a4fa9707a1 100644 --- a/aiida/backends/tests/cmdline/params/types/test_code.py +++ b/aiida/backends/tests/cmdline/params/types/test_code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `CodeParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/backends/tests/cmdline/params/types/test_computer.py b/aiida/backends/tests/cmdline/params/types/test_computer.py index 34e584f7da..1cde31560a 100644 --- a/aiida/backends/tests/cmdline/params/types/test_computer.py +++ b/aiida/backends/tests/cmdline/params/types/test_computer.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `ComputerParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import ComputerParamType from aiida.orm.utils.loaders import OrmEntityLoader diff --git a/aiida/backends/tests/cmdline/params/types/test_data.py b/aiida/backends/tests/cmdline/params/types/test_data.py index 4f9edf1bea..d1649c3fc7 100644 --- a/aiida/backends/tests/cmdline/params/types/test_data.py +++ b/aiida/backends/tests/cmdline/params/types/test_data.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `DataParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import DataParamType diff --git a/aiida/backends/tests/cmdline/params/types/test_group.py b/aiida/backends/tests/cmdline/params/types/test_group.py index 52c47b4729..ffa617ea45 100644 --- a/aiida/backends/tests/cmdline/params/types/test_group.py +++ b/aiida/backends/tests/cmdline/params/types/test_group.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `GroupParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import GroupParamType from aiida.orm import Group diff --git a/aiida/backends/tests/cmdline/params/types/test_identifier.py b/aiida/backends/tests/cmdline/params/types/test_identifier.py index 775aa260a5..1f35a4d373 100644 --- a/aiida/backends/tests/cmdline/params/types/test_identifier.py +++ b/aiida/backends/tests/cmdline/params/types/test_identifier.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `IdentifierParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/backends/tests/cmdline/params/types/test_node.py b/aiida/backends/tests/cmdline/params/types/test_node.py index 6aaad3a13b..4da7446c6f 100644 --- a/aiida/backends/tests/cmdline/params/types/test_node.py +++ b/aiida/backends/tests/cmdline/params/types/test_node.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `NodeParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import NodeParamType from aiida.orm import Data diff --git a/aiida/backends/tests/cmdline/params/types/test_path.py b/aiida/backends/tests/cmdline/params/types/test_path.py index 8baf640c5a..3844c59d93 100644 --- a/aiida/backends/tests/cmdline/params/types/test_path.py +++ b/aiida/backends/tests/cmdline/params/types/test_path.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for Path types""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.cmdline.params.types import ImportPath diff --git a/aiida/backends/tests/cmdline/params/types/test_plugin.py b/aiida/backends/tests/cmdline/params/types/test_plugin.py index 34694dab68..de30e23992 100644 --- a/aiida/backends/tests/cmdline/params/types/test_plugin.py +++ b/aiida/backends/tests/cmdline/params/types/test_plugin.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `PluginParamType`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/backends/tests/cmdline/utils/test_common.py b/aiida/backends/tests/cmdline/utils/test_common.py index 90b5b42d28..0bb9783d22 100644 --- a/aiida/backends/tests/cmdline/utils/test_common.py +++ b/aiida/backends/tests/cmdline/utils/test_common.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for common command line utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/common/test_extendeddicts.py b/aiida/backends/tests/common/test_extendeddicts.py index 99b330ed49..0f117a0113 100644 --- a/aiida/backends/tests/common/test_extendeddicts.py +++ b/aiida/backends/tests/common/test_extendeddicts.py @@ -9,9 +9,6 @@ ########################################################################### """Tests for the extended dictionary classes.""" # pylint: disable=pointless-statement,attribute-defined-outside-init -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy import pickle diff --git a/aiida/backends/tests/common/test_folders.py b/aiida/backends/tests/common/test_folders.py index ee9f56ea3f..33fc9664b8 100644 --- a/aiida/backends/tests/common/test_folders.py +++ b/aiida/backends/tests/common/test_folders.py @@ -10,9 +10,6 @@ """ Tests for the folder class """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/backends/tests/common/test_hashing.py b/aiida/backends/tests/common/test_hashing.py index fc970bf5fd..5c09491633 100644 --- a/aiida/backends/tests/common/test_hashing.py +++ b/aiida/backends/tests/common/test_hashing.py @@ -11,9 +11,6 @@ Unittests for aiida.common.hashing:make_hash with hardcoded hash values """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import itertools import collections from datetime import datetime diff --git a/aiida/backends/tests/common/test_lang.py b/aiida/backends/tests/common/test_lang.py index 566657dda1..f284db215b 100644 --- a/aiida/backends/tests/common/test_lang.py +++ b/aiida/backends/tests/common/test_lang.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the :py:mod:`~aiida.common.lang` module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common import lang diff --git a/aiida/backends/tests/common/test_links.py b/aiida/backends/tests/common/test_links.py index c33ebfaf4d..2c03a2020c 100644 --- a/aiida/backends/tests/common/test_links.py +++ b/aiida/backends/tests/common/test_links.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the links utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.links import validate_link_label diff --git a/aiida/backends/tests/common/test_logging.py b/aiida/backends/tests/common/test_logging.py index d5db24feaa..60ffcd3c70 100644 --- a/aiida/backends/tests/common/test_logging.py +++ b/aiida/backends/tests/common/test_logging.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the logging module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import logging import unittest diff --git a/aiida/backends/tests/common/test_serialize.py b/aiida/backends/tests/common/test_serialize.py index c33ed9a8eb..1a83dea592 100644 --- a/aiida/backends/tests/common/test_serialize.py +++ b/aiida/backends/tests/common/test_serialize.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Serialization tests""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.orm.utils import serialize diff --git a/aiida/backends/tests/common/test_timezone.py b/aiida/backends/tests/common/test_timezone.py index f3eb3883a4..600439eea9 100644 --- a/aiida/backends/tests/common/test_timezone.py +++ b/aiida/backends/tests/common/test_timezone.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the timezone utility module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import unittest diff --git a/aiida/backends/tests/common/test_utils.py b/aiida/backends/tests/common/test_utils.py index 2cf6892654..4436fc208c 100644 --- a/aiida/backends/tests/common/test_utils.py +++ b/aiida/backends/tests/common/test_utils.py @@ -10,9 +10,6 @@ """ Tests for the aiida.common.utils functionality """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import unittest diff --git a/aiida/backends/tests/engine/daemon/test_client.py b/aiida/backends/tests/engine/daemon/test_client.py index 6730c549c8..e344cc24c1 100644 --- a/aiida/backends/tests/engine/daemon/test_client.py +++ b/aiida/backends/tests/engine/daemon/test_client.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the `DaemonClient` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import zmq diff --git a/aiida/backends/tests/engine/test_calc_job.py b/aiida/backends/tests/engine/test_calc_job.py index 8ddba47d95..3eea911f9a 100644 --- a/aiida/backends/tests/engine/test_calc_job.py +++ b/aiida/backends/tests/engine/test_calc_job.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test for the `CalcJob` process sub class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy diff --git a/aiida/backends/tests/engine/test_calcfunctions.py b/aiida/backends/tests/engine/test_calcfunctions.py index 351c288125..6b4aa9b4b7 100644 --- a/aiida/backends/tests/engine/test_calcfunctions.py +++ b/aiida/backends/tests/engine/test_calcfunctions.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the calcfunction decorator and CalcFunctionNode.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common import exceptions diff --git a/aiida/backends/tests/engine/test_class_loader.py b/aiida/backends/tests/engine/test_class_loader.py index caa8b5acfc..8150f9ba32 100644 --- a/aiida/backends/tests/engine/test_class_loader.py +++ b/aiida/backends/tests/engine/test_class_loader.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import aiida diff --git a/aiida/backends/tests/engine/test_daemon.py b/aiida/backends/tests/engine/test_daemon.py index d8b307b3de..cda4cdd9ab 100644 --- a/aiida/backends/tests/engine/test_daemon.py +++ b/aiida/backends/tests/engine/test_daemon.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/engine/test_futures.py b/aiida/backends/tests/engine/test_futures.py index c9e27e39ab..6fa8bb9911 100644 --- a/aiida/backends/tests/engine/test_futures.py +++ b/aiida/backends/tests/engine/test_futures.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime diff --git a/aiida/backends/tests/engine/test_launch.py b/aiida/backends/tests/engine/test_launch.py index a21ddd930c..ad09806145 100644 --- a/aiida/backends/tests/engine/test_launch.py +++ b/aiida/backends/tests/engine/test_launch.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/engine/test_manager.py b/aiida/backends/tests/engine/test_manager.py index f262929662..1a684ac591 100644 --- a/aiida/backends/tests/engine/test_manager.py +++ b/aiida/backends/tests/engine/test_manager.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the classes in `aiida.engine.processes.calcjobs.manager`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import time diff --git a/aiida/backends/tests/engine/test_persistence.py b/aiida/backends/tests/engine/test_persistence.py index 6f3973eaca..f65197c475 100644 --- a/aiida/backends/tests/engine/test_persistence.py +++ b/aiida/backends/tests/engine/test_persistence.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six import plumpy diff --git a/aiida/backends/tests/engine/test_ports.py b/aiida/backends/tests/engine/test_ports.py index 4589306173..ac9b12e02f 100644 --- a/aiida/backends/tests/engine/test_ports.py +++ b/aiida/backends/tests/engine/test_ports.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for process spec ports.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.engine.processes.ports import InputPort, PortNamespace diff --git a/aiida/backends/tests/engine/test_process.py b/aiida/backends/tests/engine/test_process.py index 0e68abe41f..f5bf55aafc 100644 --- a/aiida/backends/tests/engine/test_process.py +++ b/aiida/backends/tests/engine/test_process.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import threading diff --git a/aiida/backends/tests/engine/test_process_builder.py b/aiida/backends/tests/engine/test_process_builder.py index 7a9dbc54c2..cf82529ec2 100644 --- a/aiida/backends/tests/engine/test_process_builder.py +++ b/aiida/backends/tests/engine/test_process_builder.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import Mapping, MutableMapping diff --git a/aiida/backends/tests/engine/test_process_function.py b/aiida/backends/tests/engine/test_process_function.py index baf39cd914..cfa3f8b793 100644 --- a/aiida/backends/tests/engine/test_process_function.py +++ b/aiida/backends/tests/engine/test_process_function.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the process_function decorator.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/engine/test_process_spec.py b/aiida/backends/tests/engine/test_process_spec.py index b2f59475c6..7403837140 100644 --- a/aiida/backends/tests/engine/test_process_spec.py +++ b/aiida/backends/tests/engine/test_process_spec.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `ProcessSpec` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.engine import Process diff --git a/aiida/backends/tests/engine/test_rmq.py b/aiida/backends/tests/engine/test_rmq.py index 1b5bfd28d3..685ea2ced9 100644 --- a/aiida/backends/tests/engine/test_rmq.py +++ b/aiida/backends/tests/engine/test_rmq.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import plumpy diff --git a/aiida/backends/tests/engine/test_run.py b/aiida/backends/tests/engine/test_run.py index 45f318ea80..0ba4f0eb3f 100644 --- a/aiida/backends/tests/engine/test_run.py +++ b/aiida/backends/tests/engine/test_run.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `run` functions.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.backends.tests.utils.processes import DummyProcess diff --git a/aiida/backends/tests/engine/test_runners.py b/aiida/backends/tests/engine/test_runners.py index 477b750b42..16c7282e7b 100644 --- a/aiida/backends/tests/engine/test_runners.py +++ b/aiida/backends/tests/engine/test_runners.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import plumpy diff --git a/aiida/backends/tests/engine/test_transport.py b/aiida/backends/tests/engine/test_transport.py index 9bcd6d355a..a3d6141326 100644 --- a/aiida/backends/tests/engine/test_transport.py +++ b/aiida/backends/tests/engine/test_transport.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range from tornado.gen import coroutine, Return diff --git a/aiida/backends/tests/engine/test_utils.py b/aiida/backends/tests/engine/test_utils.py index b093e8ffed..5d592bd8d0 100644 --- a/aiida/backends/tests/engine/test_utils.py +++ b/aiida/backends/tests/engine/test_utils.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from tornado.ioloop import IOLoop from tornado.gen import coroutine diff --git a/aiida/backends/tests/engine/test_work_chain.py b/aiida/backends/tests/engine/test_work_chain.py index a4a2daa928..d72af1134b 100644 --- a/aiida/backends/tests/engine/test_work_chain.py +++ b/aiida/backends/tests/engine/test_work_chain.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import inspect import unittest diff --git a/aiida/backends/tests/engine/test_workfunctions.py b/aiida/backends/tests/engine/test_workfunctions.py index 50930499cb..783d7a9e74 100644 --- a/aiida/backends/tests/engine/test_workfunctions.py +++ b/aiida/backends/tests/engine/test_workfunctions.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the workfunction decorator and WorkFunctionNode.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.links import LinkType diff --git a/aiida/backends/tests/manage/backup/test_backup_script.py b/aiida/backends/tests/manage/backup/test_backup_script.py index 302623ee2c..e3152378ef 100644 --- a/aiida/backends/tests/manage/backup/test_backup_script.py +++ b/aiida/backends/tests/manage/backup/test_backup_script.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=protected-access,invalid-name """Tests for the Backup classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import importlib import shutil diff --git a/aiida/backends/tests/manage/backup/test_backup_setup_script.py b/aiida/backends/tests/manage/backup/test_backup_setup_script.py index 5ca63bbd38..b118156599 100644 --- a/aiida/backends/tests/manage/backup/test_backup_setup_script.py +++ b/aiida/backends/tests/manage/backup/test_backup_setup_script.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the backup setup script.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/backends/tests/manage/configuration/migrations/test_migrations.py b/aiida/backends/tests/manage/configuration/migrations/test_migrations.py index 41098dca41..1821a2bd7e 100644 --- a/aiida/backends/tests/manage/configuration/migrations/test_migrations.py +++ b/aiida/backends/tests/manage/configuration/migrations/test_migrations.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the configuration migration functionality.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/backends/tests/manage/configuration/test_config.py b/aiida/backends/tests/manage/configuration/test_config.py index ae4e3f6335..c766b475eb 100644 --- a/aiida/backends/tests/manage/configuration/test_config.py +++ b/aiida/backends/tests/manage/configuration/test_config.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the Config class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import shutil diff --git a/aiida/backends/tests/manage/configuration/test_options.py b/aiida/backends/tests/manage/configuration/test_options.py index a008d66872..ce3e5596fd 100644 --- a/aiida/backends/tests/manage/configuration/test_options.py +++ b/aiida/backends/tests/manage/configuration/test_options.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the configuration options.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.backends.tests.utils.configuration import with_temporary_config_instance diff --git a/aiida/backends/tests/manage/configuration/test_profile.py b/aiida/backends/tests/manage/configuration/test_profile.py index cd0d6179d8..8c6e531547 100644 --- a/aiida/backends/tests/manage/configuration/test_profile.py +++ b/aiida/backends/tests/manage/configuration/test_profile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the Profile class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import uuid diff --git a/aiida/backends/tests/manage/external/test_postgres.py b/aiida/backends/tests/manage/external/test_postgres.py index 9ca775b1c1..0d0a9ed5ac 100644 --- a/aiida/backends/tests/manage/external/test_postgres.py +++ b/aiida/backends/tests/manage/external/test_postgres.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for postgres database maintenance functionality""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import unittest import mock diff --git a/aiida/backends/tests/manage/test_caching.py b/aiida/backends/tests/manage/test_caching.py index faeebd01dd..460281554c 100644 --- a/aiida/backends/tests/manage/test_caching.py +++ b/aiida/backends/tests/manage/test_caching.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the functionality that reads and modifies the caching configuration file.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import tempfile import unittest diff --git a/aiida/backends/tests/orm/data/test_data.py b/aiida/backends/tests/orm/data/test_data.py index f0faa38730..8fe588943a 100644 --- a/aiida/backends/tests/orm/data/test_data.py +++ b/aiida/backends/tests/orm/data/test_data.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `Data` base class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import numpy diff --git a/aiida/backends/tests/orm/data/test_dict.py b/aiida/backends/tests/orm/data/test_dict.py index cccc78e835..985b3d968d 100644 --- a/aiida/backends/tests/orm/data/test_dict.py +++ b/aiida/backends/tests/orm/data/test_dict.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `Dict` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.orm import Dict diff --git a/aiida/backends/tests/orm/data/test_folder.py b/aiida/backends/tests/orm/data/test_folder.py index ae8c34136a..767edd0fc3 100644 --- a/aiida/backends/tests/orm/data/test_folder.py +++ b/aiida/backends/tests/orm/data/test_folder.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `FolderData` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/backends/tests/orm/data/test_kpoints.py b/aiida/backends/tests/orm/data/test_kpoints.py index 24e7e75e16..2a6dd788fd 100644 --- a/aiida/backends/tests/orm/data/test_kpoints.py +++ b/aiida/backends/tests/orm/data/test_kpoints.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `KpointsData` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import numpy as np diff --git a/aiida/backends/tests/orm/data/test_orbital.py b/aiida/backends/tests/orm/data/test_orbital.py index 87cab734c5..bc35ccdfe6 100644 --- a/aiida/backends/tests/orm/data/test_orbital.py +++ b/aiida/backends/tests/orm/data/test_orbital.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `OrbitalData` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/orm/data/test_remote.py b/aiida/backends/tests/orm/data/test_remote.py index e276e1ff27..2e38299c43 100644 --- a/aiida/backends/tests/orm/data/test_remote.py +++ b/aiida/backends/tests/orm/data/test_remote.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import io diff --git a/aiida/backends/tests/orm/data/test_singlefile.py b/aiida/backends/tests/orm/data/test_singlefile.py index 58c53f8e64..08a7283a54 100644 --- a/aiida/backends/tests/orm/data/test_singlefile.py +++ b/aiida/backends/tests/orm/data/test_singlefile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `SinglefileData` class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import tempfile diff --git a/aiida/backends/tests/orm/data/test_to_aiida_type.py b/aiida/backends/tests/orm/data/test_to_aiida_type.py index c4092f196e..ea60034bc0 100644 --- a/aiida/backends/tests/orm/data/test_to_aiida_type.py +++ b/aiida/backends/tests/orm/data/test_to_aiida_type.py @@ -10,9 +10,6 @@ """ This module contains tests for the to_aiida_type serializer """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.orm.nodes.data.base import to_aiida_type from aiida.orm import Dict, Int, Float, Bool, Str diff --git a/aiida/backends/tests/orm/data/test_upf.py b/aiida/backends/tests/orm/data/test_upf.py index 463ee84eac..887d239ecd 100644 --- a/aiida/backends/tests/orm/data/test_upf.py +++ b/aiida/backends/tests/orm/data/test_upf.py @@ -10,9 +10,6 @@ """ This module contains tests for UpfData and UpfData related functions. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import tempfile diff --git a/aiida/backends/tests/orm/implementation/test_backend.py b/aiida/backends/tests/orm/implementation/test_backend.py index e37099f63d..40023a43c4 100644 --- a/aiida/backends/tests/orm/implementation/test_backend.py +++ b/aiida/backends/tests/orm/implementation/test_backend.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the ORM Backend class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida import orm from aiida.common import exceptions diff --git a/aiida/backends/tests/orm/implementation/test_comments.py b/aiida/backends/tests/orm/implementation/test_comments.py index 6f47582f33..35510d9d64 100644 --- a/aiida/backends/tests/orm/implementation/test_comments.py +++ b/aiida/backends/tests/orm/implementation/test_comments.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the BackendComment and BackendCommentCollection classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from datetime import datetime from uuid import UUID diff --git a/aiida/backends/tests/orm/implementation/test_logs.py b/aiida/backends/tests/orm/implementation/test_logs.py index d0fb27d4d0..2d3309851b 100644 --- a/aiida/backends/tests/orm/implementation/test_logs.py +++ b/aiida/backends/tests/orm/implementation/test_logs.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the BackendLog and BackendLogCollection classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import logging from datetime import datetime diff --git a/aiida/backends/tests/orm/implementation/test_nodes.py b/aiida/backends/tests/orm/implementation/test_nodes.py index b2fe82d2d2..bc594e1fe2 100644 --- a/aiida/backends/tests/orm/implementation/test_nodes.py +++ b/aiida/backends/tests/orm/implementation/test_nodes.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-public-methods """Unit tests for the BackendNode and BackendNodeCollection classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import OrderedDict from datetime import datetime diff --git a/aiida/backends/tests/orm/node/test_calcjob.py b/aiida/backends/tests/orm/node/test_calcjob.py index 04a0f43155..c457c98dc4 100644 --- a/aiida/backends/tests/orm/node/test_calcjob.py +++ b/aiida/backends/tests/orm/node/test_calcjob.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `CalcJobNode` node sub class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import tempfile diff --git a/aiida/backends/tests/orm/node/test_node.py b/aiida/backends/tests/orm/node/test_node.py index 8a11b8faf5..bd1669dbdd 100644 --- a/aiida/backends/tests/orm/node/test_node.py +++ b/aiida/backends/tests/orm/node/test_node.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-public-methods """Tests for the Node ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os diff --git a/aiida/backends/tests/orm/test_authinfos.py b/aiida/backends/tests/orm/test_authinfos.py index 312109832d..d82b8a2912 100644 --- a/aiida/backends/tests/orm/test_authinfos.py +++ b/aiida/backends/tests/orm/test_authinfos.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the AuthInfo ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common import exceptions diff --git a/aiida/backends/tests/orm/test_comments.py b/aiida/backends/tests/orm/test_comments.py index da6e4925b6..2acc26dfa9 100644 --- a/aiida/backends/tests/orm/test_comments.py +++ b/aiida/backends/tests/orm/test_comments.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the Comment ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.orm.comments import Comment diff --git a/aiida/backends/tests/orm/test_computers.py b/aiida/backends/tests/orm/test_computers.py index 9eca6d072f..2a14c3abe1 100644 --- a/aiida/backends/tests/orm/test_computers.py +++ b/aiida/backends/tests/orm/test_computers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `Computer` ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/orm/test_entities.py b/aiida/backends/tests/orm/test_entities.py index cbdb010d5d..28c4081f27 100644 --- a/aiida/backends/tests/orm/test_entities.py +++ b/aiida/backends/tests/orm/test_entities.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test for general backend entities""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida import orm diff --git a/aiida/backends/tests/orm/test_groups.py b/aiida/backends/tests/orm/test_groups.py index 02df97733a..9c842aa2c4 100644 --- a/aiida/backends/tests/orm/test_groups.py +++ b/aiida/backends/tests/orm/test_groups.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test for the Group ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/orm/test_logs.py b/aiida/backends/tests/orm/test_logs.py index 0de0c6e841..226d88f348 100644 --- a/aiida/backends/tests/orm/test_logs.py +++ b/aiida/backends/tests/orm/test_logs.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """ORM Log tests""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import logging diff --git a/aiida/backends/tests/orm/test_mixins.py b/aiida/backends/tests/orm/test_mixins.py index e9b85aa6af..9e7af3e573 100644 --- a/aiida/backends/tests/orm/test_mixins.py +++ b/aiida/backends/tests/orm/test_mixins.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the ORM mixin classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common import exceptions diff --git a/aiida/backends/tests/orm/test_querybuilder.py b/aiida/backends/tests/orm/test_querybuilder.py index 77694fdcb3..90ae6b0b16 100644 --- a/aiida/backends/tests/orm/test_querybuilder.py +++ b/aiida/backends/tests/orm/test_querybuilder.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,missing-docstring,too-many-lines """Tests for the QueryBuilder.""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import warnings diff --git a/aiida/backends/tests/orm/utils/test_calcjob.py b/aiida/backends/tests/orm/utils/test_calcjob.py index 7813d79c1f..6bf97e28a6 100644 --- a/aiida/backends/tests/orm/utils/test_calcjob.py +++ b/aiida/backends/tests/orm/utils/test_calcjob.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `CalcJob` utils.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.links import LinkType diff --git a/aiida/backends/tests/orm/utils/test_loaders.py b/aiida/backends/tests/orm/utils/test_loaders.py index b437e6cb30..c5d66f4094 100644 --- a/aiida/backends/tests/orm/utils/test_loaders.py +++ b/aiida/backends/tests/orm/utils/test_loaders.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.exceptions import NotExistent from aiida.orm import Node, Group, Data diff --git a/aiida/backends/tests/orm/utils/test_node.py b/aiida/backends/tests/orm/utils/test_node.py index 6a6de73f22..239a2a5cb8 100644 --- a/aiida/backends/tests/orm/utils/test_node.py +++ b/aiida/backends/tests/orm/utils/test_node.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `Node` utils.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.orm import Data diff --git a/aiida/backends/tests/orm/utils/test_repository.py b/aiida/backends/tests/orm/utils/test_repository.py index c902671fbc..5110473d91 100644 --- a/aiida/backends/tests/orm/utils/test_repository.py +++ b/aiida/backends/tests/orm/utils/test_repository.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `Repository` utility class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/backends/tests/parsers/test_parser.py b/aiida/backends/tests/parsers/test_parser.py index 3ecb953be5..c7fd0fa61b 100644 --- a/aiida/backends/tests/parsers/test_parser.py +++ b/aiida/backends/tests/parsers/test_parser.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test for the `Parser` base class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io diff --git a/aiida/backends/tests/plugins/test_entry_point.py b/aiida/backends/tests/plugins/test_entry_point.py index bb10b3cd13..ba177e10ba 100644 --- a/aiida/backends/tests/plugins/test_entry_point.py +++ b/aiida/backends/tests/plugins/test_entry_point.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the :py:mod:`~aiida.plugins.entry_point` module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.plugins.entry_point import validate_registered_entry_points diff --git a/aiida/backends/tests/plugins/test_factories.py b/aiida/backends/tests/plugins/test_factories.py index ecb3f8358d..b0af9a6436 100644 --- a/aiida/backends/tests/plugins/test_factories.py +++ b/aiida/backends/tests/plugins/test_factories.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the :py:mod:`~aiida.plugins.factories` module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import try: from unittest.mock import patch diff --git a/aiida/backends/tests/plugins/test_utils.py b/aiida/backends/tests/plugins/test_utils.py index 80c4c797ed..924f9361c0 100644 --- a/aiida/backends/tests/plugins/test_utils.py +++ b/aiida/backends/tests/plugins/test_utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for utilities dealing with plugins and entry points.""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function from aiida import __version__ as version_core from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/restapi/test_identifiers.py b/aiida/backends/tests/restapi/test_identifiers.py index 893fb5c639..92ed4eb9d0 100644 --- a/aiida/backends/tests/restapi/test_identifiers.py +++ b/aiida/backends/tests/restapi/test_identifiers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the `aiida.restapi.common.identifiers` module.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.restapi.common.identifiers import get_full_type_filters, FULL_TYPE_CONCATENATOR, LIKE_OPERATOR_CHARACTER diff --git a/aiida/backends/tests/test_base_dataclasses.py b/aiida/backends/tests/test_base_dataclasses.py index 9f56e19ede..56e37eeb25 100644 --- a/aiida/backends/tests/test_base_dataclasses.py +++ b/aiida/backends/tests/test_base_dataclasses.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import operator diff --git a/aiida/backends/tests/test_calculation_node.py b/aiida/backends/tests/test_calculation_node.py index b5d34b2fc1..fe95e60e62 100644 --- a/aiida/backends/tests/test_calculation_node.py +++ b/aiida/backends/tests/test_calculation_node.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the CalculationNode and CalcJobNode class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.exceptions import ModificationNotAllowed diff --git a/aiida/backends/tests/test_dataclasses.py b/aiida/backends/tests/test_dataclasses.py index 715242fb2c..08a30f6f8a 100644 --- a/aiida/backends/tests/test_dataclasses.py +++ b/aiida/backends/tests/test_dataclasses.py @@ -10,9 +10,6 @@ """ Tests for specific subclasses of Data """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import io import os diff --git a/aiida/backends/tests/test_dbimporters.py b/aiida/backends/tests/test_dbimporters.py index b6bddea6ac..96b7460f00 100644 --- a/aiida/backends/tests/test_dbimporters.py +++ b/aiida/backends/tests/test_dbimporters.py @@ -10,9 +10,6 @@ """ Tests for subclasses of DbImporter, DbSearchResults and DbEntry """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import io import unittest diff --git a/aiida/backends/tests/test_generic.py b/aiida/backends/tests/test_generic.py index 9957eedbe1..3ff5c8932f 100644 --- a/aiida/backends/tests/test_generic.py +++ b/aiida/backends/tests/test_generic.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Generic tests that need the use of the DB.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida import orm diff --git a/aiida/backends/tests/test_nodes.py b/aiida/backends/tests/test_nodes.py index 542aa7f782..b018bdabef 100644 --- a/aiida/backends/tests/test_nodes.py +++ b/aiida/backends/tests/test_nodes.py @@ -10,9 +10,6 @@ # pylint: disable=too-many-lines,invalid-name,protected-access # pylint: disable=missing-docstring,too-many-locals,too-many-statements # pylint: disable=too-many-public-methods -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import copy import io diff --git a/aiida/backends/tests/test_restapi.py b/aiida/backends/tests/test_restapi.py index bcfcc35e56..8dc010b80f 100644 --- a/aiida/backends/tests/test_restapi.py +++ b/aiida/backends/tests/test_restapi.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-lines """Unittests for REST API.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import tempfile diff --git a/aiida/backends/tests/tools/data/orbital/test_orbitals.py b/aiida/backends/tests/tools/data/orbital/test_orbitals.py index 3dc5a8ec38..244484d331 100644 --- a/aiida/backends/tests/tools/data/orbital/test_orbitals.py +++ b/aiida/backends/tests/tools/data/orbital/test_orbitals.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test for the `Orbital` class and subclasses.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import #from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/tools/importexport/common/test_archive.py b/aiida/backends/tests/tools/importexport/common/test_archive.py index cc614a6e1d..65e20cb5f6 100644 --- a/aiida/backends/tests/tools/importexport/common/test_archive.py +++ b/aiida/backends/tests/tools/importexport/common/test_archive.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the Archive class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.common.exceptions import InvalidOperation diff --git a/aiida/backends/tests/tools/importexport/migration/test_migration.py b/aiida/backends/tests/tools/importexport/migration/test_migration.py index 8e01ec89e2..9f3854f424 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_migration.py +++ b/aiida/backends/tests/tools/importexport/migration/test_migration.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test export file migration from old export versions to the newest""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os diff --git a/aiida/backends/tests/tools/importexport/migration/test_v01_to_v02.py b/aiida/backends/tests/tools/importexport/migration/test_v01_to_v02.py index 6c5f214d81..a72ebc61ec 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v01_to_v02.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v01_to_v02.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test export file migration from export version 0.1 to 0.2""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import get_version from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/tools/importexport/migration/test_v02_to_v03.py b/aiida/backends/tests/tools/importexport/migration/test_v02_to_v03.py index 678fa428e5..117e574b3e 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v02_to_v03.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v02_to_v03.py @@ -9,9 +9,6 @@ ########################################################################### """Test export file migration from export version 0.2 to 0.3""" # pylint: disable=too-many-branches -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.backends.tests.utils.archives import get_json_files diff --git a/aiida/backends/tests/tools/importexport/migration/test_v03_to_v04.py b/aiida/backends/tests/tools/importexport/migration/test_v03_to_v04.py index ac191690b1..5d0df76f93 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v03_to_v04.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v03_to_v04.py @@ -9,9 +9,6 @@ ########################################################################### """Test export file migration from export version 0.3 to 0.4""" # pylint: disable=too-many-locals,too-many-branches,too-many-statements -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import tarfile diff --git a/aiida/backends/tests/tools/importexport/migration/test_v04_to_v05.py b/aiida/backends/tests/tools/importexport/migration/test_v04_to_v05.py index 0d45c3e1b5..d2af5d62b1 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v04_to_v05.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v04_to_v05.py @@ -9,10 +9,6 @@ ########################################################################### """Test export file migration from export version 0.4 to 0.5""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - import io import tarfile import zipfile diff --git a/aiida/backends/tests/tools/importexport/migration/test_v05_to_v06.py b/aiida/backends/tests/tools/importexport/migration/test_v05_to_v06.py index c9b23cb676..8bf923b27a 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v05_to_v06.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v05_to_v06.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test export file migration from export version 0.5 to 0.6""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.general.migrations.calc_state import STATE_MAPPING from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/tools/importexport/migration/test_v06_to_v07.py b/aiida/backends/tests/tools/importexport/migration/test_v06_to_v07.py index 5cc402aaec..c423b4f346 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v06_to_v07.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v06_to_v07.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test export file migration from export version 0.6 to 0.7""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.backends.tests.utils.archives import get_json_files diff --git a/aiida/backends/tests/tools/importexport/migration/test_v07_to_v08.py b/aiida/backends/tests/tools/importexport/migration/test_v07_to_v08.py index 7f48f32090..584c2af721 100644 --- a/aiida/backends/tests/tools/importexport/migration/test_v07_to_v08.py +++ b/aiida/backends/tests/tools/importexport/migration/test_v07_to_v08.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test export file migration from export version 0.7 to 0.8""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.testbase import AiidaTestCase from aiida.backends.tests.utils.archives import get_json_files diff --git a/aiida/backends/tests/tools/importexport/orm/test_attributes.py b/aiida/backends/tests/tools/importexport/orm/test_attributes.py index cde4be3245..55cacf2f7e 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_attributes.py +++ b/aiida/backends/tests/tools/importexport/orm/test_attributes.py @@ -9,10 +9,6 @@ ########################################################################### """Extras tests for the export and import routines""" # pylint: disable=attribute-defined-outside-init -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_calculations.py b/aiida/backends/tests/tools/importexport/orm/test_calculations.py index f1b68734fc..6a9c87f62e 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_calculations.py +++ b/aiida/backends/tests/tools/importexport/orm/test_calculations.py @@ -9,10 +9,6 @@ ########################################################################### """orm.CalcNode tests for the export and import routines""" # pylint: disable=invalid-name -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os from six.moves import range diff --git a/aiida/backends/tests/tools/importexport/orm/test_codes.py b/aiida/backends/tests/tools/importexport/orm/test_codes.py index bff5bbeb37..be9af7bece 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_codes.py +++ b/aiida/backends/tests/tools/importexport/orm/test_codes.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """orm.Code tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_comments.py b/aiida/backends/tests/tools/importexport/orm/test_comments.py index 91eee73765..4ed81460e0 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_comments.py +++ b/aiida/backends/tests/tools/importexport/orm/test_comments.py @@ -9,10 +9,6 @@ ########################################################################### """orm.Comment tests for the export and import routines""" # pylint: disable=too-many-locals,too-many-statements -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_computers.py b/aiida/backends/tests/tools/importexport/orm/test_computers.py index fce0010069..cb37caef95 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_computers.py +++ b/aiida/backends/tests/tools/importexport/orm/test_computers.py @@ -9,10 +9,6 @@ ########################################################################### """orm.Computer tests for the export and import routines""" # pylint: disable=too-many-statements,no-member -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os import six diff --git a/aiida/backends/tests/tools/importexport/orm/test_extras.py b/aiida/backends/tests/tools/importexport/orm/test_extras.py index 6c774725d8..7c1b51e3c5 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_extras.py +++ b/aiida/backends/tests/tools/importexport/orm/test_extras.py @@ -9,10 +9,6 @@ ########################################################################### """Extras tests for the export and import routines""" # pylint: disable=attribute-defined-outside-init -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os import shutil diff --git a/aiida/backends/tests/tools/importexport/orm/test_groups.py b/aiida/backends/tests/tools/importexport/orm/test_groups.py index e38cd91573..0882bc323a 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_groups.py +++ b/aiida/backends/tests/tools/importexport/orm/test_groups.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """orm.Group tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_links.py b/aiida/backends/tests/tools/importexport/orm/test_links.py index 7b95bb9bbf..b1cec4e00b 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_links.py +++ b/aiida/backends/tests/tools/importexport/orm/test_links.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """orm links tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import io import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_logs.py b/aiida/backends/tests/tools/importexport/orm/test_logs.py index 13efb90f49..7f3e8364e1 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_logs.py +++ b/aiida/backends/tests/tools/importexport/orm/test_logs.py @@ -9,10 +9,6 @@ ########################################################################### """orm.Log tests for the export and import routines""" # pylint: disable=too-many-locals,too-many-statements -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/orm/test_users.py b/aiida/backends/tests/tools/importexport/orm/test_users.py index 16faba1236..a92029a102 100644 --- a/aiida/backends/tests/tools/importexport/orm/test_users.py +++ b/aiida/backends/tests/tools/importexport/orm/test_users.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """orm.User tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os diff --git a/aiida/backends/tests/tools/importexport/test_complex.py b/aiida/backends/tests/tools/importexport/test_complex.py index f14bb4c981..9afc54a7aa 100644 --- a/aiida/backends/tests/tools/importexport/test_complex.py +++ b/aiida/backends/tests/tools/importexport/test_complex.py @@ -9,10 +9,6 @@ ########################################################################### """Complex tests for the export and import routines""" # pylint: disable=too-many-locals -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os from six.moves import range diff --git a/aiida/backends/tests/tools/importexport/test_prov_redesign.py b/aiida/backends/tests/tools/importexport/test_prov_redesign.py index 0cbca73b34..89f10c7941 100644 --- a/aiida/backends/tests/tools/importexport/test_prov_redesign.py +++ b/aiida/backends/tests/tools/importexport/test_prov_redesign.py @@ -9,10 +9,6 @@ ########################################################################### """Tests for the export and import routines related to migration provenance_redesign""" # pylint: disable=too-many-locals -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os from six.moves import zip diff --git a/aiida/backends/tests/tools/importexport/test_simple.py b/aiida/backends/tests/tools/importexport/test_simple.py index 070404387a..fed8e2fc21 100644 --- a/aiida/backends/tests/tools/importexport/test_simple.py +++ b/aiida/backends/tests/tools/importexport/test_simple.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Simple tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import io import os diff --git a/aiida/backends/tests/tools/importexport/test_specific_import.py b/aiida/backends/tests/tools/importexport/test_specific_import.py index e3d490c332..8d45d75d58 100644 --- a/aiida/backends/tests/tools/importexport/test_specific_import.py +++ b/aiida/backends/tests/tools/importexport/test_specific_import.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement import os import shutil diff --git a/aiida/backends/tests/tools/importexport/utils.py b/aiida/backends/tests/tools/importexport/utils.py index d9ac1f979f..da2b55cec9 100644 --- a/aiida/backends/tests/tools/importexport/utils.py +++ b/aiida/backends/tests/tools/importexport/utils.py @@ -8,10 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions for tests for the export and import routines""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import -from __future__ import with_statement from aiida.orm import QueryBuilder, Node diff --git a/aiida/backends/tests/tools/visualization/test_graph.py b/aiida/backends/tests/tools/visualization/test_graph.py index d6ada88398..9f15cab9ca 100644 --- a/aiida/backends/tests/tools/visualization/test_graph.py +++ b/aiida/backends/tests/tools/visualization/test_graph.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Tests for creating graphs (using graphviz)""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida import orm from aiida.backends.testbase import AiidaTestCase diff --git a/aiida/backends/tests/utils/archives.py b/aiida/backends/tests/utils/archives.py index 6257f60fb5..f02a2a4b23 100644 --- a/aiida/backends/tests/utils/archives.py +++ b/aiida/backends/tests/utils/archives.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test utility to import, inspect, or migrate AiiDA export archives.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import io diff --git a/aiida/backends/tests/utils/configuration.py b/aiida/backends/tests/utils/configuration.py index f96747fd40..6838aecd47 100644 --- a/aiida/backends/tests/utils/configuration.py +++ b/aiida/backends/tests/utils/configuration.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module that defines methods to mock an AiiDA instance complete with mock configuration and profile.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import contextlib import os diff --git a/aiida/backends/tests/utils/processes.py b/aiida/backends/tests/utils/processes.py index 86ac715fea..931502b154 100644 --- a/aiida/backends/tests/utils/processes.py +++ b/aiida/backends/tests/utils/processes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities for testing components from the workflow engine""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import plumpy diff --git a/aiida/backends/utils.py b/aiida/backends/utils.py index b2ce3ec80b..427b1a5bfc 100644 --- a/aiida/backends/utils.py +++ b/aiida/backends/utils.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends import BACKEND_SQLA, BACKEND_DJANGO from aiida.manage import configuration diff --git a/aiida/calculations/plugins/arithmetic/add.py b/aiida/calculations/plugins/arithmetic/add.py index aec2ec8a72..5e990d550a 100644 --- a/aiida/calculations/plugins/arithmetic/add.py +++ b/aiida/calculations/plugins/arithmetic/add.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Implementation of CalcJobNode to add two numbers for testing and demonstration purposes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/calculations/plugins/templatereplacer.py b/aiida/calculations/plugins/templatereplacer.py index 256a3180df..2696c130ad 100644 --- a/aiida/calculations/plugins/templatereplacer.py +++ b/aiida/calculations/plugins/templatereplacer.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Implementation of CalcJobNode to replace a template for testing and demonstration purposes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/cmdline/__init__.py b/aiida/cmdline/__init__.py index 39957c51b8..34a245187e 100644 --- a/aiida/cmdline/__init__.py +++ b/aiida/cmdline/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable """The command line interface of AiiDA.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .params.arguments import * from .params.options import * diff --git a/aiida/cmdline/commands/__init__.py b/aiida/cmdline/commands/__init__.py index 878e705254..ffe15e545c 100644 --- a/aiida/cmdline/commands/__init__.py +++ b/aiida/cmdline/commands/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-arguments, wrong-import-position """The `verdi` command line interface.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click_completion # Activate the completion of parameter types provided by the click_completion package diff --git a/aiida/cmdline/commands/cmd_calcjob.py b/aiida/cmdline/commands/cmd_calcjob.py index ea46e58ef4..2dd1043867 100644 --- a/aiida/cmdline/commands/cmd_calcjob.py +++ b/aiida/cmdline/commands/cmd_calcjob.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-many-locals """`verdi calcjob` commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import click diff --git a/aiida/cmdline/commands/cmd_code.py b/aiida/cmdline/commands/cmd_code.py index d959d9c3f3..1c2d6eef73 100644 --- a/aiida/cmdline/commands/cmd_code.py +++ b/aiida/cmdline/commands/cmd_code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi code` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from functools import partial import click diff --git a/aiida/cmdline/commands/cmd_comment.py b/aiida/cmdline/commands/cmd_comment.py index d137cd2b8b..34113d3f4d 100644 --- a/aiida/cmdline/commands/cmd_comment.py +++ b/aiida/cmdline/commands/cmd_comment.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi comment` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_completioncommand.py b/aiida/cmdline/commands/cmd_completioncommand.py index 870035e7d6..a9b3ba2817 100644 --- a/aiida/cmdline/commands/cmd_completioncommand.py +++ b/aiida/cmdline/commands/cmd_completioncommand.py @@ -11,9 +11,6 @@ `verdi completioncommand` command, to return the string to insert into the bash script to activate completion. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from aiida.cmdline.commands.cmd_verdi import verdi diff --git a/aiida/cmdline/commands/cmd_computer.py b/aiida/cmdline/commands/cmd_computer.py index b282228000..8750b4c316 100644 --- a/aiida/cmdline/commands/cmd_computer.py +++ b/aiida/cmdline/commands/cmd_computer.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-many-statements,too-many-branches """`verdi computer` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io from functools import partial diff --git a/aiida/cmdline/commands/cmd_config.py b/aiida/cmdline/commands/cmd_config.py index 8977e74968..8e978b869e 100644 --- a/aiida/cmdline/commands/cmd_config.py +++ b/aiida/cmdline/commands/cmd_config.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi config` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_daemon.py b/aiida/cmdline/commands/cmd_daemon.py index 4cfdf4a710..9355ecebde 100644 --- a/aiida/cmdline/commands/cmd_daemon.py +++ b/aiida/cmdline/commands/cmd_daemon.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi daemon` commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import subprocess diff --git a/aiida/cmdline/commands/cmd_data/__init__.py b/aiida/cmdline/commands/cmd_data/__init__.py index c7886b5f64..1087e7a864 100644 --- a/aiida/cmdline/commands/cmd_data/__init__.py +++ b/aiida/cmdline/commands/cmd_data/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """The `verdi data` command line interface.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.commands.cmd_verdi import verdi from aiida.cmdline.utils.pluginable import Pluginable diff --git a/aiida/cmdline/commands/cmd_data/cmd_array.py b/aiida/cmdline/commands/cmd_data/cmd_array.py index c56feb5fec..8df64e20c3 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_array.py +++ b/aiida/cmdline/commands/cmd_data/cmd_array.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data array` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.commands.cmd_data import verdi_data from aiida.cmdline.params import arguments, options, types diff --git a/aiida/cmdline/commands/cmd_data/cmd_bands.py b/aiida/cmdline/commands/cmd_data/cmd_bands.py index c75554e31a..1fa9478fca 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_bands.py +++ b/aiida/cmdline/commands/cmd_data/cmd_bands.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data bands` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from six.moves import range diff --git a/aiida/cmdline/commands/cmd_data/cmd_cif.py b/aiida/cmdline/commands/cmd_data/cmd_cif.py index 2eb6a11fa8..1a666b3fca 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_cif.py +++ b/aiida/cmdline/commands/cmd_data/cmd_cif.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data cif` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range import click diff --git a/aiida/cmdline/commands/cmd_data/cmd_dict.py b/aiida/cmdline/commands/cmd_data/cmd_dict.py index 2be41d6cd9..81697d07fe 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_dict.py +++ b/aiida/cmdline/commands/cmd_data/cmd_dict.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data dict` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.commands.cmd_data import verdi_data from aiida.cmdline.params import arguments, options, types diff --git a/aiida/cmdline/commands/cmd_data/cmd_export.py b/aiida/cmdline/commands/cmd_data/cmd_export.py index 21dd0cbda8..371a7f2d8b 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_export.py +++ b/aiida/cmdline/commands/cmd_data/cmd_export.py @@ -10,9 +10,6 @@ """ This module provides export functionality to all data types """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from aiida.cmdline.utils import echo diff --git a/aiida/cmdline/commands/cmd_data/cmd_list.py b/aiida/cmdline/commands/cmd_data/cmd_list.py index f694bd732e..118780f05a 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_list.py +++ b/aiida/cmdline/commands/cmd_data/cmd_list.py @@ -10,9 +10,6 @@ """ This module provides list functionality to all data types. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.params import options diff --git a/aiida/cmdline/commands/cmd_data/cmd_remote.py b/aiida/cmdline/commands/cmd_data/cmd_remote.py index f7107105fc..ff2660c07a 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_remote.py +++ b/aiida/cmdline/commands/cmd_data/cmd_remote.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data remote` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import click diff --git a/aiida/cmdline/commands/cmd_data/cmd_show.py b/aiida/cmdline/commands/cmd_data/cmd_show.py index 8ef07f1249..8a443e2945 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_show.py +++ b/aiida/cmdline/commands/cmd_data/cmd_show.py @@ -10,9 +10,6 @@ """ This allows to manage showfunctionality to all data types. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import click diff --git a/aiida/cmdline/commands/cmd_data/cmd_singlefile.py b/aiida/cmdline/commands/cmd_data/cmd_singlefile.py index c567cbea62..82e9709fb4 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_singlefile.py +++ b/aiida/cmdline/commands/cmd_data/cmd_singlefile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data singlefile` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.commands.cmd_data import verdi_data from aiida.cmdline.params import arguments, types diff --git a/aiida/cmdline/commands/cmd_data/cmd_structure.py b/aiida/cmdline/commands/cmd_data/cmd_structure.py index 3bb8fd30fa..16ffceb875 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_structure.py +++ b/aiida/cmdline/commands/cmd_data/cmd_structure.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data structure` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io diff --git a/aiida/cmdline/commands/cmd_data/cmd_trajectory.py b/aiida/cmdline/commands/cmd_data/cmd_trajectory.py index 4e7a534d7d..c204f13624 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_trajectory.py +++ b/aiida/cmdline/commands/cmd_data/cmd_trajectory.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data trajectory` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six.moves import range import click diff --git a/aiida/cmdline/commands/cmd_data/cmd_upf.py b/aiida/cmdline/commands/cmd_data/cmd_upf.py index 959de8ef26..5757415a18 100644 --- a/aiida/cmdline/commands/cmd_data/cmd_upf.py +++ b/aiida/cmdline/commands/cmd_data/cmd_upf.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi data upf` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/cmdline/commands/cmd_database.py b/aiida/cmdline/commands/cmd_database.py index b0771cba75..7ca1dabf3d 100644 --- a/aiida/cmdline/commands/cmd_database.py +++ b/aiida/cmdline/commands/cmd_database.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi database` commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_devel.py b/aiida/cmdline/commands/cmd_devel.py index 8c48af9d46..4711c2738b 100644 --- a/aiida/cmdline/commands/cmd_devel.py +++ b/aiida/cmdline/commands/cmd_devel.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi devel` commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import sys import click diff --git a/aiida/cmdline/commands/cmd_export.py b/aiida/cmdline/commands/cmd_export.py index f08ef393bb..7d972f5232 100644 --- a/aiida/cmdline/commands/cmd_export.py +++ b/aiida/cmdline/commands/cmd_export.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-arguments,import-error,too-many-locals """`verdi export` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/cmdline/commands/cmd_graph.py b/aiida/cmdline/commands/cmd_graph.py index bc49520e3a..9811adf16c 100644 --- a/aiida/cmdline/commands/cmd_graph.py +++ b/aiida/cmdline/commands/cmd_graph.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi graph` commands""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_group.py b/aiida/cmdline/commands/cmd_group.py index 91238e5585..dff712033a 100644 --- a/aiida/cmdline/commands/cmd_group.py +++ b/aiida/cmdline/commands/cmd_group.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi group` commands""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_help.py b/aiida/cmdline/commands/cmd_help.py index 24bd722cf8..5503a43774 100644 --- a/aiida/cmdline/commands/cmd_help.py +++ b/aiida/cmdline/commands/cmd_help.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Command for `verdi help`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_import.py b/aiida/cmdline/commands/cmd_import.py index 9578e7977e..54e975d4a1 100644 --- a/aiida/cmdline/commands/cmd_import.py +++ b/aiida/cmdline/commands/cmd_import.py @@ -9,9 +9,6 @@ ########################################################################### """`verdi import` command.""" # pylint: disable=broad-except,too-many-arguments,too-many-locals,too-many-branches -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from enum import Enum import traceback import click diff --git a/aiida/cmdline/commands/cmd_node.py b/aiida/cmdline/commands/cmd_node.py index fa926c8f91..3f74d12f29 100644 --- a/aiida/cmdline/commands/cmd_node.py +++ b/aiida/cmdline/commands/cmd_node.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi node` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click import tabulate diff --git a/aiida/cmdline/commands/cmd_plugin.py b/aiida/cmdline/commands/cmd_plugin.py index 8a392baa0f..f09c064950 100644 --- a/aiida/cmdline/commands/cmd_plugin.py +++ b/aiida/cmdline/commands/cmd_plugin.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Command for `verdi plugins`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_process.py b/aiida/cmdline/commands/cmd_process.py index 633ada445b..a2459f1153 100644 --- a/aiida/cmdline/commands/cmd_process.py +++ b/aiida/cmdline/commands/cmd_process.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-arguments """`verdi process` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_profile.py b/aiida/cmdline/commands/cmd_profile.py index bd981f1ebe..8d5563139e 100644 --- a/aiida/cmdline/commands/cmd_profile.py +++ b/aiida/cmdline/commands/cmd_profile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi profile` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click import tabulate diff --git a/aiida/cmdline/commands/cmd_rehash.py b/aiida/cmdline/commands/cmd_rehash.py index a597d0ddf4..34526922de 100644 --- a/aiida/cmdline/commands/cmd_rehash.py +++ b/aiida/cmdline/commands/cmd_rehash.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi rehash` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_restapi.py b/aiida/cmdline/commands/cmd_restapi.py index 324d812cc0..a6b8c9adf4 100644 --- a/aiida/cmdline/commands/cmd_restapi.py +++ b/aiida/cmdline/commands/cmd_restapi.py @@ -12,9 +12,6 @@ Main advantage of doing this by means of a verdi command is that different profiles can be selected at hook-up (-p flag). """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import click diff --git a/aiida/cmdline/commands/cmd_run.py b/aiida/cmdline/commands/cmd_run.py index 79aaf42b90..271665604d 100644 --- a/aiida/cmdline/commands/cmd_run.py +++ b/aiida/cmdline/commands/cmd_run.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi run` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import contextlib import sys diff --git a/aiida/cmdline/commands/cmd_setup.py b/aiida/cmdline/commands/cmd_setup.py index cb8f0b1311..4edc23426b 100644 --- a/aiida/cmdline/commands/cmd_setup.py +++ b/aiida/cmdline/commands/cmd_setup.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """The `verdi setup` and `verdi quicksetup` commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/commands/cmd_shell.py b/aiida/cmdline/commands/cmd_shell.py index 26f0b676e0..2891e9ad40 100644 --- a/aiida/cmdline/commands/cmd_shell.py +++ b/aiida/cmdline/commands/cmd_shell.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """The verdi shell command""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/cmdline/commands/cmd_status.py b/aiida/cmdline/commands/cmd_status.py index 372aef46d3..2d68bce17a 100644 --- a/aiida/cmdline/commands/cmd_status.py +++ b/aiida/cmdline/commands/cmd_status.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi status` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import sys diff --git a/aiida/cmdline/commands/cmd_user.py b/aiida/cmdline/commands/cmd_user.py index 9c793fa7b1..cd20475c14 100644 --- a/aiida/cmdline/commands/cmd_user.py +++ b/aiida/cmdline/commands/cmd_user.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`verdi user` command.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from functools import partial import click diff --git a/aiida/cmdline/commands/cmd_verdi.py b/aiida/cmdline/commands/cmd_verdi.py index 0bb496afe5..45f5edc418 100644 --- a/aiida/cmdline/commands/cmd_verdi.py +++ b/aiida/cmdline/commands/cmd_verdi.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """The main `verdi` click group.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import difflib import click diff --git a/aiida/cmdline/params/arguments/__init__.py b/aiida/cmdline/params/arguments/__init__.py index 8b2cd4787f..2ceb521725 100644 --- a/aiida/cmdline/params/arguments/__init__.py +++ b/aiida/cmdline/params/arguments/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # yapf: disable """Module with pre-defined reusable commandline arguments that can be used as `click` decorators.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/arguments/overridable.py b/aiida/cmdline/params/arguments/overridable.py index 66697394e8..369c2343fb 100644 --- a/aiida/cmdline/params/arguments/overridable.py +++ b/aiida/cmdline/params/arguments/overridable.py @@ -12,9 +12,6 @@ :synopsis: Convenience class which can be used to defined a set of commonly used arguments that can be easily reused and which improves consistency across the command line interface """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/__init__.py b/aiida/cmdline/params/options/__init__.py index c2cfb82c15..c67e520bb8 100644 --- a/aiida/cmdline/params/options/__init__.py +++ b/aiida/cmdline/params/options/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with pre-defined reusable commandline options that can be used as `click` decorators.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/commands/code.py b/aiida/cmdline/params/options/commands/code.py index 043712ef33..00f1cace38 100644 --- a/aiida/cmdline/params/options/commands/code.py +++ b/aiida/cmdline/params/options/commands/code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Reusable command line interface options for Code commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/commands/computer.py b/aiida/cmdline/params/options/commands/computer.py index 3ee6bb0c33..1209524de5 100644 --- a/aiida/cmdline/params/options/commands/computer.py +++ b/aiida/cmdline/params/options/commands/computer.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Reusable command line interface options for Computer commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/commands/setup.py b/aiida/cmdline/params/options/commands/setup.py index 61657ce8aa..781aa97be9 100644 --- a/aiida/cmdline/params/options/commands/setup.py +++ b/aiida/cmdline/params/options/commands/setup.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Reusable command line interface options for the setup commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools import getpass diff --git a/aiida/cmdline/params/options/conditional.py b/aiida/cmdline/params/options/conditional.py index e6ddf226f1..f9ccef9f1f 100644 --- a/aiida/cmdline/params/options/conditional.py +++ b/aiida/cmdline/params/options/conditional.py @@ -12,9 +12,6 @@ :synopsis: Tools for options which are required only if a a set of conditions on the context are fulfilled """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/config.py b/aiida/cmdline/params/options/config.py index c2b0a15675..0d2b387f18 100644 --- a/aiida/cmdline/params/options/config.py +++ b/aiida/cmdline/params/options/config.py @@ -12,9 +12,6 @@ .. py:module::config :synopsis: Convenience class for configuration file option """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import yaml import click_config_file diff --git a/aiida/cmdline/params/options/interactive.py b/aiida/cmdline/params/options/interactive.py index 67157a1879..f1a21ca1b8 100644 --- a/aiida/cmdline/params/options/interactive.py +++ b/aiida/cmdline/params/options/interactive.py @@ -12,9 +12,6 @@ :synopsis: Tools and an option class for interactive parameter entry with additional features such as help lookup. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/multivalue.py b/aiida/cmdline/params/options/multivalue.py index d5d40e81aa..a6028fddc9 100644 --- a/aiida/cmdline/params/options/multivalue.py +++ b/aiida/cmdline/params/options/multivalue.py @@ -10,9 +10,6 @@ """ Module to define multi value options for click. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/overridable.py b/aiida/cmdline/params/options/overridable.py index be1593e099..67fc88acef 100644 --- a/aiida/cmdline/params/options/overridable.py +++ b/aiida/cmdline/params/options/overridable.py @@ -13,9 +13,6 @@ :synopsis: Convenience class which can be used to defined a set of commonly used options that can be easily reused and which improves consistency across the command line interface """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/options/test_conditional.py b/aiida/cmdline/params/options/test_conditional.py index 0b67d8b786..6517d056ca 100644 --- a/aiida/cmdline/params/options/test_conditional.py +++ b/aiida/cmdline/params/options/test_conditional.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the ConditionalOption.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import unittest diff --git a/aiida/cmdline/params/options/test_interactive.py b/aiida/cmdline/params/options/test_interactive.py index 099697b83d..aa4f649af8 100644 --- a/aiida/cmdline/params/options/test_interactive.py +++ b/aiida/cmdline/params/options/test_interactive.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for the InteractiveOption.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import unittest import click diff --git a/aiida/cmdline/params/types/__init__.py b/aiida/cmdline/params/types/__init__.py index ecf6c36a87..f2849e7933 100644 --- a/aiida/cmdline/params/types/__init__.py +++ b/aiida/cmdline/params/types/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Provides all parameter types.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .calculation import CalculationParamType from .choice import LazyChoice diff --git a/aiida/cmdline/params/types/calculation.py b/aiida/cmdline/params/types/calculation.py index 25bdc896b3..a9dd484b4f 100644 --- a/aiida/cmdline/params/types/calculation.py +++ b/aiida/cmdline/params/types/calculation.py @@ -11,9 +11,6 @@ Module for the calculation parameter type """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .identifier import IdentifierParamType diff --git a/aiida/cmdline/params/types/choice.py b/aiida/cmdline/params/types/choice.py index ac4157cd9a..89f578ad48 100644 --- a/aiida/cmdline/params/types/choice.py +++ b/aiida/cmdline/params/types/choice.py @@ -10,9 +10,6 @@ """ A custom click type that defines a lazy choice """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/code.py b/aiida/cmdline/params/types/code.py index 09641f07ad..45cb94d96a 100644 --- a/aiida/cmdline/params/types/code.py +++ b/aiida/cmdline/params/types/code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module to define the custom click type for code.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from .identifier import IdentifierParamType diff --git a/aiida/cmdline/params/types/computer.py b/aiida/cmdline/params/types/computer.py index 26afa0faa1..388b5841f2 100644 --- a/aiida/cmdline/params/types/computer.py +++ b/aiida/cmdline/params/types/computer.py @@ -10,9 +10,6 @@ """ Module for the custom click param type computer """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.types import StringParamType diff --git a/aiida/cmdline/params/types/config.py b/aiida/cmdline/params/types/config.py index 784dfdd2f4..9af822d654 100644 --- a/aiida/cmdline/params/types/config.py +++ b/aiida/cmdline/params/types/config.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module to define the custom click type for code.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/data.py b/aiida/cmdline/params/types/data.py index 0856f0997c..02c896f4b7 100644 --- a/aiida/cmdline/params/types/data.py +++ b/aiida/cmdline/params/types/data.py @@ -10,9 +10,6 @@ """ Module for the custom click param type for data """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .identifier import IdentifierParamType diff --git a/aiida/cmdline/params/types/group.py b/aiida/cmdline/params/types/group.py index 20eb4ffce3..0e17812b9a 100644 --- a/aiida/cmdline/params/types/group.py +++ b/aiida/cmdline/params/types/group.py @@ -10,9 +10,6 @@ """ Module for custom click param type group """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/identifier.py b/aiida/cmdline/params/types/identifier.py index 890406e03c..3485f41f08 100644 --- a/aiida/cmdline/params/types/identifier.py +++ b/aiida/cmdline/params/types/identifier.py @@ -10,9 +10,6 @@ """ Module for custom click param type identifier """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from abc import ABCMeta, abstractproperty import six diff --git a/aiida/cmdline/params/types/multiple.py b/aiida/cmdline/params/types/multiple.py index 3ab9ae9e76..c998aecc21 100644 --- a/aiida/cmdline/params/types/multiple.py +++ b/aiida/cmdline/params/types/multiple.py @@ -10,9 +10,6 @@ """ Module to define custom click param type for multiple values """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/node.py b/aiida/cmdline/params/types/node.py index 0789a156fb..568dbf50fd 100644 --- a/aiida/cmdline/params/types/node.py +++ b/aiida/cmdline/params/types/node.py @@ -10,9 +10,6 @@ """ Module to define the custom click param type for node """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .identifier import IdentifierParamType diff --git a/aiida/cmdline/params/types/nonemptystring.py b/aiida/cmdline/params/types/nonemptystring.py index caa2147b90..a669a225d2 100644 --- a/aiida/cmdline/params/types/nonemptystring.py +++ b/aiida/cmdline/params/types/nonemptystring.py @@ -11,9 +11,6 @@ Module for the non empty string parameter type """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from click.types import StringParamType diff --git a/aiida/cmdline/params/types/path.py b/aiida/cmdline/params/types/path.py index d4b7cb988d..25a353cf26 100644 --- a/aiida/cmdline/params/types/path.py +++ b/aiida/cmdline/params/types/path.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Click parameter types for paths.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import click diff --git a/aiida/cmdline/params/types/plugin.py b/aiida/cmdline/params/types/plugin.py index 8064f08616..98747062e5 100644 --- a/aiida/cmdline/params/types/plugin.py +++ b/aiida/cmdline/params/types/plugin.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Click parameter type for AiiDA Plugins.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six import click diff --git a/aiida/cmdline/params/types/process.py b/aiida/cmdline/params/types/process.py index e167bd0429..e18ef66bd7 100644 --- a/aiida/cmdline/params/types/process.py +++ b/aiida/cmdline/params/types/process.py @@ -11,9 +11,6 @@ Module for the process node parameter type """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .identifier import IdentifierParamType diff --git a/aiida/cmdline/params/types/profile.py b/aiida/cmdline/params/types/profile.py index b6327b8f1f..14bd23e03c 100644 --- a/aiida/cmdline/params/types/profile.py +++ b/aiida/cmdline/params/types/profile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Profile param type for click.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/test_module.py b/aiida/cmdline/params/types/test_module.py index 993be7c917..6a2d4bb2e9 100644 --- a/aiida/cmdline/params/types/test_module.py +++ b/aiida/cmdline/params/types/test_module.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Test module parameter type for click.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/params/types/user.py b/aiida/cmdline/params/types/user.py index 83a78e7cae..561cb2531d 100644 --- a/aiida/cmdline/params/types/user.py +++ b/aiida/cmdline/params/types/user.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """User param type for click.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from aiida.cmdline.utils.decorators import with_dbenv diff --git a/aiida/cmdline/params/types/workflow.py b/aiida/cmdline/params/types/workflow.py index 388a530b38..0a3fc48b6a 100644 --- a/aiida/cmdline/params/types/workflow.py +++ b/aiida/cmdline/params/types/workflow.py @@ -11,9 +11,6 @@ Module for the workflow parameter type """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .identifier import IdentifierParamType diff --git a/aiida/cmdline/utils/ascii_vis.py b/aiida/cmdline/utils/ascii_vis.py index b3ae84dc92..40aa589f5a 100644 --- a/aiida/cmdline/utils/ascii_vis.py +++ b/aiida/cmdline/utils/ascii_vis.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions to draw ASCII diagrams to the command line.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from ete3 import Tree diff --git a/aiida/cmdline/utils/common.py b/aiida/cmdline/utils/common.py index 733f750368..32f3e8d0c6 100644 --- a/aiida/cmdline/utils/common.py +++ b/aiida/cmdline/utils/common.py @@ -9,9 +9,6 @@ ########################################################################### """Common utility functions for command line commands.""" # pylint: disable=import-error -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import sys diff --git a/aiida/cmdline/utils/daemon.py b/aiida/cmdline/utils/daemon.py index d00682cb62..48b909bdd2 100644 --- a/aiida/cmdline/utils/daemon.py +++ b/aiida/cmdline/utils/daemon.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions for command line commands related to the daemon.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from tabulate import tabulate diff --git a/aiida/cmdline/utils/decorators.py b/aiida/cmdline/utils/decorators.py index 089a8bfaa6..1e77952e0d 100644 --- a/aiida/cmdline/utils/decorators.py +++ b/aiida/cmdline/utils/decorators.py @@ -19,9 +19,6 @@ code branch gets visited and possibly avoiding the overhead if not """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from contextlib import contextmanager diff --git a/aiida/cmdline/utils/defaults.py b/aiida/cmdline/utils/defaults.py index 85f8e12b70..43f825e827 100644 --- a/aiida/cmdline/utils/defaults.py +++ b/aiida/cmdline/utils/defaults.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Default values and lazy default get methods for command line options.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.utils import echo from aiida.common import exceptions diff --git a/aiida/cmdline/utils/echo.py b/aiida/cmdline/utils/echo.py index ee9178d553..65b482c701 100644 --- a/aiida/cmdline/utils/echo.py +++ b/aiida/cmdline/utils/echo.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """ Convenience functions for printing output from verdi commands """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from enum import IntEnum from collections import OrderedDict diff --git a/aiida/cmdline/utils/multi_line_input.py b/aiida/cmdline/utils/multi_line_input.py index e4384cea52..131bf68682 100644 --- a/aiida/cmdline/utils/multi_line_input.py +++ b/aiida/cmdline/utils/multi_line_input.py @@ -10,9 +10,6 @@ """ utilities for getting multi line input from the commandline """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from aiida.common.exceptions import InputValidationError diff --git a/aiida/cmdline/utils/pluginable.py b/aiida/cmdline/utils/pluginable.py index 13a2aac3d6..ceeebb24ca 100644 --- a/aiida/cmdline/utils/pluginable.py +++ b/aiida/cmdline/utils/pluginable.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Plugin aware click command Group.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click from aiida.common import exceptions diff --git a/aiida/cmdline/utils/query/calculation.py b/aiida/cmdline/utils/query/calculation.py index 57623d6cea..94e9b832f3 100644 --- a/aiida/cmdline/utils/query/calculation.py +++ b/aiida/cmdline/utils/query/calculation.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """A utility module with a factory of standard QueryBuilder instances for Calculation nodes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.lang import classproperty from aiida.cmdline.utils.query.mapping import CalculationProjectionMapper diff --git a/aiida/cmdline/utils/query/formatting.py b/aiida/cmdline/utils/query/formatting.py index e2396236fe..526ef98858 100644 --- a/aiida/cmdline/utils/query/formatting.py +++ b/aiida/cmdline/utils/query/formatting.py @@ -9,10 +9,6 @@ ########################################################################### """A utility module with simple functions to format variables into strings for cli outputs.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - def format_relative_time(datetime): """ diff --git a/aiida/cmdline/utils/query/mapping.py b/aiida/cmdline/utils/query/mapping.py index 6a2f7b564c..9bc373048d 100644 --- a/aiida/cmdline/utils/query/mapping.py +++ b/aiida/cmdline/utils/query/mapping.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """A utility module with mapper objects that map database entities projections on attributes and labels.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.utils.query import formatting diff --git a/aiida/cmdline/utils/repository.py b/aiida/cmdline/utils/repository.py index a8786887dd..d6331fe98b 100644 --- a/aiida/cmdline/utils/repository.py +++ b/aiida/cmdline/utils/repository.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions for command line commands operating on the repository.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import click diff --git a/aiida/cmdline/utils/shell.py b/aiida/cmdline/utils/shell.py index 5370a80b2f..a8c55bdd42 100644 --- a/aiida/cmdline/utils/shell.py +++ b/aiida/cmdline/utils/shell.py @@ -9,10 +9,6 @@ ########################################################################### """Definition of modules that are to be automatically loaded for `verdi shell`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - DEFAULT_MODULES_LIST = [ ('aiida.common.links', 'LinkType', 'LinkType'), ('aiida.orm', 'Node', 'Node'), diff --git a/aiida/cmdline/utils/templates.py b/aiida/cmdline/utils/templates.py index d8a8ca00d3..591a805eb3 100644 --- a/aiida/cmdline/utils/templates.py +++ b/aiida/cmdline/utils/templates.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Templates for input/output of verdi commands.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from jinja2 import Environment, PackageLoader #pylint: disable=invalid-name diff --git a/aiida/cmdline/utils/test_multiline.py b/aiida/cmdline/utils/test_multiline.py index bea28e86fd..50fbee9451 100644 --- a/aiida/cmdline/utils/test_multiline.py +++ b/aiida/cmdline/utils/test_multiline.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Unit tests for editing pre and post bash scripts, comments, etc.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os import unittest diff --git a/aiida/common/__init__.py b/aiida/common/__init__.py index 64207f4b9b..938113d34b 100644 --- a/aiida/common/__init__.py +++ b/aiida/common/__init__.py @@ -14,9 +14,6 @@ .. note:: Modules in this sub package have to run without a loaded database environment """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .datastructures import * from .exceptions import * diff --git a/aiida/common/constants.py b/aiida/common/constants.py index bffb0f7d11..7a80dade9e 100644 --- a/aiida/common/constants.py +++ b/aiida/common/constants.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module to define the (physical) constants used throughout the code.""" -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division # This is the precision with which AiiDA internally will store float numbers # In particular, before storing a number (in attributes/extras), diff --git a/aiida/common/datastructures.py b/aiida/common/datastructures.py index e368ebf37e..49e9e51ae6 100644 --- a/aiida/common/datastructures.py +++ b/aiida/common/datastructures.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module to define commonly used data structures.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from enum import Enum, IntEnum diff --git a/aiida/common/escaping.py b/aiida/common/escaping.py index 547eed23fa..fd6fa6b2c9 100644 --- a/aiida/common/escaping.py +++ b/aiida/common/escaping.py @@ -9,9 +9,6 @@ ########################################################################### """Miscellaneous functions for escaping strings.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import re diff --git a/aiida/common/exceptions.py b/aiida/common/exceptions.py index 47b0f5ffa5..c9430d1732 100644 --- a/aiida/common/exceptions.py +++ b/aiida/common/exceptions.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module that define the exceptions that are thrown by AiiDA's internal code.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import __all__ = ( 'AiidaException', 'NotExistent', 'MultipleObjectsError', 'RemoteOperationError', 'ContentNotExistent', diff --git a/aiida/common/extendeddicts.py b/aiida/common/extendeddicts.py index c5cb0d449e..a3a77fd6a0 100644 --- a/aiida/common/extendeddicts.py +++ b/aiida/common/extendeddicts.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Various dictionary types with extended functionality.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six import PY2 diff --git a/aiida/common/files.py b/aiida/common/files.py index e647053f9c..f0c41ed235 100644 --- a/aiida/common/files.py +++ b/aiida/common/files.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions to operate on filesystem files.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import hashlib import io diff --git a/aiida/common/folders.py b/aiida/common/folders.py index 88ba236fe3..8f4bc45b42 100644 --- a/aiida/common/folders.py +++ b/aiida/common/folders.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions to operate on filesystem folders.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import fnmatch diff --git a/aiida/common/hashing.py b/aiida/common/hashing.py index 2de5bda383..c04b3feecd 100644 --- a/aiida/common/hashing.py +++ b/aiida/common/hashing.py @@ -11,9 +11,6 @@ Common password and hash generation functions. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import hashlib try: # Python3 from hashlib import blake2b diff --git a/aiida/common/json.py b/aiida/common/json.py index 7cfa286038..559a82b480 100644 --- a/aiida/common/json.py +++ b/aiida/common/json.py @@ -13,9 +13,6 @@ Use this module prefentially over standard json to ensure compatibility. Also note the conventions for using io.open for dump and dumps. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import simplejson diff --git a/aiida/common/lang.py b/aiida/common/lang.py index 075024751d..882622ef26 100644 --- a/aiida/common/lang.py +++ b/aiida/common/lang.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities that extend the basic python language.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools from inspect import stack, currentframe # pylint: disable=ungrouped-imports diff --git a/aiida/common/links.py b/aiida/common/links.py index 26dd0e365f..02f4d9f165 100644 --- a/aiida/common/links.py +++ b/aiida/common/links.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with utilities and data structures pertaining to links between nodes in the provenance graph.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import namedtuple from enum import Enum diff --git a/aiida/common/log.py b/aiida/common/log.py index 4ecf6ba70d..0125cf861f 100644 --- a/aiida/common/log.py +++ b/aiida/common/log.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for all logging methods/classes that don't need the ORM.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy import logging diff --git a/aiida/common/timezone.py b/aiida/common/timezone.py index f32de1b00d..f940b9f17f 100644 --- a/aiida/common/timezone.py +++ b/aiida/common/timezone.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions to operate on datetime objects.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from datetime import datetime import dateutil diff --git a/aiida/common/utils.py b/aiida/common/utils.py index f1eadd9ad2..1e0aaa7cc2 100644 --- a/aiida/common/utils.py +++ b/aiida/common/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Miscellaneous generic utility functions and classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import filecmp import inspect diff --git a/aiida/common/warnings.py b/aiida/common/warnings.py index ab63357774..12baa1ff2b 100644 --- a/aiida/common/warnings.py +++ b/aiida/common/warnings.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Define warnings that can be thrown by AiiDA.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import class AiidaDeprecationWarning(Warning): diff --git a/aiida/engine/__init__.py b/aiida/engine/__init__.py index 0460084da0..41e147e19e 100644 --- a/aiida/engine/__init__.py +++ b/aiida/engine/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable,redefined-builtin """Module with all the internals that make up the engine of `aiida-core`.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .launch import * from .processes import * diff --git a/aiida/engine/daemon/client.py b/aiida/engine/daemon/client.py index ade5c84090..0fd41f5567 100644 --- a/aiida/engine/daemon/client.py +++ b/aiida/engine/daemon/client.py @@ -10,9 +10,6 @@ """ Controls the daemon """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import enum import io diff --git a/aiida/engine/daemon/execmanager.py b/aiida/engine/daemon/execmanager.py index 83fa6e159f..f4c668d152 100644 --- a/aiida/engine/daemon/execmanager.py +++ b/aiida/engine/daemon/execmanager.py @@ -13,9 +13,6 @@ the routines make reference to the suitable plugins for all plugin-specific operations. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os diff --git a/aiida/engine/daemon/runner.py b/aiida/engine/daemon/runner.py index 561879d466..f34b7895c9 100644 --- a/aiida/engine/daemon/runner.py +++ b/aiida/engine/daemon/runner.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Function that starts a daemon runner.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import logging import signal diff --git a/aiida/engine/exceptions.py b/aiida/engine/exceptions.py index 230cbb6a5e..127687fc13 100644 --- a/aiida/engine/exceptions.py +++ b/aiida/engine/exceptions.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Exceptions that can be thrown by parts of the workflow engine.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.exceptions import AiidaException diff --git a/aiida/engine/launch.py b/aiida/engine/launch.py index f261cb115a..3f101aa0b1 100644 --- a/aiida/engine/launch.py +++ b/aiida/engine/launch.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Top level functions that can be used to launch a Process.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import InvalidOperation from aiida.manage import manager diff --git a/aiida/engine/persistence.py b/aiida/engine/persistence.py index 11c4ca36ea..33823cd931 100644 --- a/aiida/engine/persistence.py +++ b/aiida/engine/persistence.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=global-statement """Definition of AiiDA's process persister and the necessary object loaders.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import importlib import logging diff --git a/aiida/engine/processes/__init__.py b/aiida/engine/processes/__init__.py index 2908c9660e..5accd5e45d 100644 --- a/aiida/engine/processes/__init__.py +++ b/aiida/engine/processes/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable,redefined-builtin """Module for processes and related utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .builder import * from .calcjobs import * diff --git a/aiida/engine/processes/builder.py b/aiida/engine/processes/builder.py index 931c38afc8..b0a72d751c 100644 --- a/aiida/engine/processes/builder.py +++ b/aiida/engine/processes/builder.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cell-var-from-loop """Convenience classes to help building the input dictionaries for Processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six import PY2 if PY2: diff --git a/aiida/engine/processes/calcjobs/__init__.py b/aiida/engine/processes/calcjobs/__init__.py index c4aa9bc481..dc7c275880 100644 --- a/aiida/engine/processes/calcjobs/__init__.py +++ b/aiida/engine/processes/calcjobs/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable """Module for the `CalcJob` process and related utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .calcjob import * diff --git a/aiida/engine/processes/calcjobs/calcjob.py b/aiida/engine/processes/calcjobs/calcjob.py index 117ed6f37c..c85a68b191 100644 --- a/aiida/engine/processes/calcjobs/calcjob.py +++ b/aiida/engine/processes/calcjobs/calcjob.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Implementation of the CalcJob process.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/engine/processes/calcjobs/manager.py b/aiida/engine/processes/calcjobs/manager.py index f8b94176d9..b782cc5313 100644 --- a/aiida/engine/processes/calcjobs/manager.py +++ b/aiida/engine/processes/calcjobs/manager.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module containing utilities and classes relating to job calculations running on systems that require transport.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import contextlib import logging diff --git a/aiida/engine/processes/calcjobs/tasks.py b/aiida/engine/processes/calcjobs/tasks.py index 84dcb75a31..9bdb1dd8ce 100644 --- a/aiida/engine/processes/calcjobs/tasks.py +++ b/aiida/engine/processes/calcjobs/tasks.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools import logging diff --git a/aiida/engine/processes/exit_code.py b/aiida/engine/processes/exit_code.py index ce4e8bdc61..cdc16237e0 100644 --- a/aiida/engine/processes/exit_code.py +++ b/aiida/engine/processes/exit_code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """A namedtuple and namespace for ExitCodes that can be used to exit from Processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import namedtuple diff --git a/aiida/engine/processes/functions.py b/aiida/engine/processes/functions.py index 107f0c820a..c5a796d602 100644 --- a/aiida/engine/processes/functions.py +++ b/aiida/engine/processes/functions.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Class and decorators to generate processes out of simple python functions.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools import logging diff --git a/aiida/engine/processes/futures.py b/aiida/engine/processes/futures.py index fd02d21f65..be911afdf1 100644 --- a/aiida/engine/processes/futures.py +++ b/aiida/engine/processes/futures.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cyclic-import """Futures that can poll or receive broadcasted messages while waiting for a task to be completed.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import tornado.gen import plumpy diff --git a/aiida/engine/processes/ports.py b/aiida/engine/processes/ports.py index 81ab4d90ce..bafe664910 100644 --- a/aiida/engine/processes/ports.py +++ b/aiida/engine/processes/ports.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """AiiDA specific implementation of plumpy Ports and PortNamespaces for the ProcessSpec.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import re diff --git a/aiida/engine/processes/process.py b/aiida/engine/processes/process.py index 8616dd11ed..d3d17edc94 100644 --- a/aiida/engine/processes/process.py +++ b/aiida/engine/processes/process.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """The AiiDA process class""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import collections diff --git a/aiida/engine/processes/process_spec.py b/aiida/engine/processes/process_spec.py index 8ee2a71767..3bafe8eb08 100644 --- a/aiida/engine/processes/process_spec.py +++ b/aiida/engine/processes/process_spec.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """AiiDA specific implementation of plumpy's ProcessSpec.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six import plumpy diff --git a/aiida/engine/processes/workchains/__init__.py b/aiida/engine/processes/workchains/__init__.py index 559609d16f..ebf63bdce8 100644 --- a/aiida/engine/processes/workchains/__init__.py +++ b/aiida/engine/processes/workchains/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable """Module for the `WorkChain` process and related utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .context import * from .workchain import * diff --git a/aiida/engine/processes/workchains/awaitable.py b/aiida/engine/processes/workchains/awaitable.py index 719d4d1e97..f7698f7258 100644 --- a/aiida/engine/processes/workchains/awaitable.py +++ b/aiida/engine/processes/workchains/awaitable.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-few-public-methods """Enums and function for the awaitables of Processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from enum import Enum diff --git a/aiida/engine/processes/workchains/context.py b/aiida/engine/processes/workchains/context.py index 03b8667eae..67e82ab064 100644 --- a/aiida/engine/processes/workchains/context.py +++ b/aiida/engine/processes/workchains/context.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Convenience functions to add awaitables to the Context of a WorkChain.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .awaitable import construct_awaitable, AwaitableAction diff --git a/aiida/engine/processes/workchains/workchain.py b/aiida/engine/processes/workchains/workchain.py index b621ed61d7..c62a0b80a3 100644 --- a/aiida/engine/processes/workchains/workchain.py +++ b/aiida/engine/processes/workchains/workchain.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Components for the WorkChain concept of the workflow engine.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import functools diff --git a/aiida/engine/runners.py b/aiida/engine/runners.py index 8ba4be1091..713098e0a8 100644 --- a/aiida/engine/runners.py +++ b/aiida/engine/runners.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=global-statement """Runners that can run and submit processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import logging diff --git a/aiida/engine/transports.py b/aiida/engine/transports.py index 744a35a04c..a4e962717e 100644 --- a/aiida/engine/transports.py +++ b/aiida/engine/transports.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """A transport queue to batch process multiple tasks that require a Transport.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import namedtuple import contextlib import logging diff --git a/aiida/engine/utils.py b/aiida/engine/utils.py index 39b55ff47e..a0cfbd177a 100644 --- a/aiida/engine/utils.py +++ b/aiida/engine/utils.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name """Utilities for the workflow engine.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import contextlib import logging diff --git a/aiida/manage/backup/backup_base.py b/aiida/manage/backup/backup_base.py index 8a5a935175..ff630ac368 100644 --- a/aiida/manage/backup/backup_base.py +++ b/aiida/manage/backup/backup_base.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Base abstract Backup class for all backends.""" -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import io import datetime diff --git a/aiida/manage/backup/backup_general.py b/aiida/manage/backup/backup_general.py index 1e92d88652..f75d7f41f1 100644 --- a/aiida/manage/backup/backup_general.py +++ b/aiida/manage/backup/backup_general.py @@ -9,9 +9,6 @@ ########################################################################### """Backup implementation for any backend (using the QueryBuilder).""" # pylint: disable=no-member -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os diff --git a/aiida/manage/backup/backup_setup.py b/aiida/manage/backup/backup_setup.py index 07f1751fab..504edb176e 100644 --- a/aiida/manage/backup/backup_setup.py +++ b/aiida/manage/backup/backup_setup.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Class to backup an AiiDA instance profile.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import io diff --git a/aiida/manage/backup/backup_utils.py b/aiida/manage/backup/backup_utils.py index e643e274e0..41bf9e55eb 100644 --- a/aiida/manage/backup/backup_utils.py +++ b/aiida/manage/backup/backup_utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities for the backup functionality.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import datetime import sys diff --git a/aiida/manage/caching.py b/aiida/manage/caching.py index c14e08ac32..959355df27 100644 --- a/aiida/manage/caching.py +++ b/aiida/manage/caching.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Definition of caching mechanism and configuration for calculations.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/manage/configuration/__init__.py b/aiida/manage/configuration/__init__.py index 0d32c8461c..3d4fdffda0 100644 --- a/aiida/manage/configuration/__init__.py +++ b/aiida/manage/configuration/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=undefined-variable,wildcard-import,global-statement,redefined-outer-name,cyclic-import """Modules related to the configuration of an AiiDA instance.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .config import * from .options import * diff --git a/aiida/manage/configuration/config.py b/aiida/manage/configuration/config.py index 9578bceb67..04362613bf 100644 --- a/aiida/manage/configuration/config.py +++ b/aiida/manage/configuration/config.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module that defines the configuration file of an AiiDA instance and functions to create and load it.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/manage/configuration/migrations/__init__.py b/aiida/manage/configuration/migrations/__init__.py index 0f81860465..6b99f32a5d 100644 --- a/aiida/manage/configuration/migrations/__init__.py +++ b/aiida/manage/configuration/migrations/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=undefined-variable,wildcard-import """Methods and definitions of migrations for the configuration file of an AiiDA instance.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .migrations import * from .utils import * diff --git a/aiida/manage/configuration/migrations/migrations.py b/aiida/manage/configuration/migrations/migrations.py index 2199586b3e..c97bb0d33f 100644 --- a/aiida/manage/configuration/migrations/migrations.py +++ b/aiida/manage/configuration/migrations/migrations.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Define the current configuration version and migrations.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import __all__ = ('CURRENT_CONFIG_VERSION', 'OLDEST_COMPATIBLE_CONFIG_VERSION') diff --git a/aiida/manage/configuration/migrations/utils.py b/aiida/manage/configuration/migrations/utils.py index 96f8ab4abe..0e89857655 100644 --- a/aiida/manage/configuration/migrations/utils.py +++ b/aiida/manage/configuration/migrations/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Defines utilities for verifying the version of the configuration file and migrating it when necessary.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import exceptions from .migrations import _MIGRATION_LOOKUP, CURRENT_CONFIG_VERSION diff --git a/aiida/manage/configuration/options.py b/aiida/manage/configuration/options.py index 5e28e72688..18acdf2cae 100644 --- a/aiida/manage/configuration/options.py +++ b/aiida/manage/configuration/options.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Definition of known configuration options and methods to parse and get option values.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import six diff --git a/aiida/manage/configuration/profile.py b/aiida/manage/configuration/profile.py index 254a086377..bf77b81985 100644 --- a/aiida/manage/configuration/profile.py +++ b/aiida/manage/configuration/profile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """AiiDA profile related code""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os from six import PY2 diff --git a/aiida/manage/configuration/settings.py b/aiida/manage/configuration/settings.py index a3b81f3741..2614b0670b 100644 --- a/aiida/manage/configuration/settings.py +++ b/aiida/manage/configuration/settings.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Base settings required for the configuration of an AiiDA instance.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import errno import os diff --git a/aiida/manage/configuration/setup.py b/aiida/manage/configuration/setup.py index c60264c627..57b00e759d 100644 --- a/aiida/manage/configuration/setup.py +++ b/aiida/manage/configuration/setup.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module that defines methods required to setup a new AiiDA instance.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os diff --git a/aiida/manage/database/delete/nodes.py b/aiida/manage/database/delete/nodes.py index e0813d3c5b..c738711146 100644 --- a/aiida/manage/database/delete/nodes.py +++ b/aiida/manage/database/delete/nodes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Function to delete nodes from the database.""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import click diff --git a/aiida/manage/database/integrity/__init__.py b/aiida/manage/database/integrity/__init__.py index 6b26cb10cf..2c53a6d803 100644 --- a/aiida/manage/database/integrity/__init__.py +++ b/aiida/manage/database/integrity/__init__.py @@ -10,10 +10,6 @@ # pylint: disable=invalid-name """Methods to validate the database integrity and fix violations.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - WARNING_BORDER = '*' * 120 diff --git a/aiida/manage/database/integrity/duplicate_uuid.py b/aiida/manage/database/integrity/duplicate_uuid.py index f5ecc6945e..763f617f52 100644 --- a/aiida/manage/database/integrity/duplicate_uuid.py +++ b/aiida/manage/database/integrity/duplicate_uuid.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Generic functions to verify the integrity of the database and optionally apply patches to fix problems.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import exceptions from aiida.manage.manager import get_manager diff --git a/aiida/manage/database/integrity/plugins.py b/aiida/manage/database/integrity/plugins.py index 5cae4fe7bd..eb1b4726df 100644 --- a/aiida/manage/database/integrity/plugins.py +++ b/aiida/manage/database/integrity/plugins.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name """Generic functions to verify the integrity of the database and optionally apply patches to fix problems.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # These are all the entry points from the `aiida.calculations` category as registered with the AiiDA registry # on Tuesday December 4 at 13:00:00 UTC diff --git a/aiida/manage/database/integrity/sql/links.py b/aiida/manage/database/integrity/sql/links.py index 66693d3e29..951315dafd 100644 --- a/aiida/manage/database/integrity/sql/links.py +++ b/aiida/manage/database/integrity/sql/links.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SQL statements that test the integrity of the database with respect to links.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.extendeddicts import AttributeDict from aiida.common.links import LinkType diff --git a/aiida/manage/database/integrity/sql/nodes.py b/aiida/manage/database/integrity/sql/nodes.py index 5b795bd9a6..099c7bf098 100644 --- a/aiida/manage/database/integrity/sql/nodes.py +++ b/aiida/manage/database/integrity/sql/nodes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SQL statements that test the integrity of the database with respect to nodes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.extendeddicts import AttributeDict from aiida.orm import Data, CalculationNode, WorkflowNode diff --git a/aiida/manage/external/pgsu.py b/aiida/manage/external/pgsu.py index a30e11b91d..98f433c545 100644 --- a/aiida/manage/external/pgsu.py +++ b/aiida/manage/external/pgsu.py @@ -13,9 +13,6 @@ separate package that can then be tested on multiple OS / postgres setups. Therefore, **please keep this module entirely AiiDA-agnostic**. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import try: import subprocess32 as subprocess diff --git a/aiida/manage/external/postgres.py b/aiida/manage/external/postgres.py index 1a0b1988e2..0c6e9b1c5a 100644 --- a/aiida/manage/external/postgres.py +++ b/aiida/manage/external/postgres.py @@ -15,9 +15,6 @@ installed by default on various systems. If the postgres setup is not the default installation, additional information needs to be provided. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import __all__ = ('Postgres', 'PostgresConnectionMode', 'DEFAULT_DBINFO') diff --git a/aiida/manage/external/rmq.py b/aiida/manage/external/rmq.py index e91b5c69ce..7f1ed2ca31 100644 --- a/aiida/manage/external/rmq.py +++ b/aiida/manage/external/rmq.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cyclic-import """Components to communicate tasks to RabbitMQ.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections import logging diff --git a/aiida/manage/fixtures.py b/aiida/manage/fixtures.py index 91c29b8098..ebc7e65752 100644 --- a/aiida/manage/fixtures.py +++ b/aiida/manage/fixtures.py @@ -11,9 +11,6 @@ Testing infrastructure for easy testing of AiiDA plugins. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import warnings from aiida.common.warnings import AiidaDeprecationWarning diff --git a/aiida/manage/manager.py b/aiida/manage/manager.py index 6f247e6c6d..4c634e28cd 100644 --- a/aiida/manage/manager.py +++ b/aiida/manage/manager.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cyclic-import """AiiDA manager for global settings""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools diff --git a/aiida/manage/tests/__init__.py b/aiida/manage/tests/__init__.py index 0c5f4fc5f1..004d5e17d9 100644 --- a/aiida/manage/tests/__init__.py +++ b/aiida/manage/tests/__init__.py @@ -11,9 +11,6 @@ Testing infrastructure for easy testing of AiiDA plugins. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import tempfile import shutil import os diff --git a/aiida/manage/tests/pytest_fixtures.py b/aiida/manage/tests/pytest_fixtures.py index e79c07e41a..c13dff5e32 100644 --- a/aiida/manage/tests/pytest_fixtures.py +++ b/aiida/manage/tests/pytest_fixtures.py @@ -16,9 +16,6 @@ * aiida_local_code_factory """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import tempfile import shutil diff --git a/aiida/manage/tests/unittest_classes.py b/aiida/manage/tests/unittest_classes.py index 90a4ee69db..b2f45c88c9 100644 --- a/aiida/manage/tests/unittest_classes.py +++ b/aiida/manage/tests/unittest_classes.py @@ -11,10 +11,6 @@ Test classes and test runners for testing AiiDA plugins with unittest. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function - import unittest from aiida.manage.manager import get_manager diff --git a/aiida/orm/__init__.py b/aiida/orm/__init__.py index 362b9ab4fa..fa6f66afde 100644 --- a/aiida/orm/__init__.py +++ b/aiida/orm/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable,redefined-builtin,cyclic-import """Main module to expose all orm classes and methods""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .authinfos import * from .comments import * diff --git a/aiida/orm/authinfos.py b/aiida/orm/authinfos.py index e656f2cc6c..c5500393a7 100644 --- a/aiida/orm/authinfos.py +++ b/aiida/orm/authinfos.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for the `AuthInfo` ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import exceptions from aiida.plugins import TransportFactory diff --git a/aiida/orm/autogroup.py b/aiida/orm/autogroup.py index 247a5d7b24..0546c26c32 100644 --- a/aiida/orm/autogroup.py +++ b/aiida/orm/autogroup.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/orm/comments.py b/aiida/orm/comments.py index 1eb14214ab..61a15d8b72 100644 --- a/aiida/orm/comments.py +++ b/aiida/orm/comments.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Comment objects and functions""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.manage.manager import get_manager from . import entities diff --git a/aiida/orm/computers.py b/aiida/orm/computers.py index b4810eafbf..3ff409040b 100644 --- a/aiida/orm/computers.py +++ b/aiida/orm/computers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for Computer entities""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import logging import os diff --git a/aiida/orm/convert.py b/aiida/orm/convert.py index 23c5d10096..06668fe1f0 100644 --- a/aiida/orm/convert.py +++ b/aiida/orm/convert.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cyclic-import,ungrouped-imports """Module for converting backend entities into frontend, ORM, entities""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from collections import Mapping diff --git a/aiida/orm/entities.py b/aiida/orm/entities.py index d8cf680b27..a236d2bd13 100644 --- a/aiida/orm/entities.py +++ b/aiida/orm/entities.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for all common top level AiiDA entity classes and methods""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import typing diff --git a/aiida/orm/groups.py b/aiida/orm/groups.py index 467f302dc8..418eca8d43 100644 --- a/aiida/orm/groups.py +++ b/aiida/orm/groups.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """ AiiDA Group entites""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from enum import Enum import warnings diff --git a/aiida/orm/implementation/__init__.py b/aiida/orm/implementation/__init__.py index 865d7f9f8f..67e6d210d5 100644 --- a/aiida/orm/implementation/__init__.py +++ b/aiida/orm/implementation/__init__.py @@ -9,9 +9,6 @@ ########################################################################### """Module with the implementations of the various backend entities for various database backends.""" # pylint: disable=wildcard-import,undefined-variable -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .authinfos import * from .backends import * diff --git a/aiida/orm/implementation/authinfos.py b/aiida/orm/implementation/authinfos.py index 7fd1c30959..befc56b7a7 100644 --- a/aiida/orm/implementation/authinfos.py +++ b/aiida/orm/implementation/authinfos.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for the backend implementation of the `AuthInfo` ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/backends.py b/aiida/orm/implementation/backends.py index 71d9971729..2239ae2513 100644 --- a/aiida/orm/implementation/backends.py +++ b/aiida/orm/implementation/backends.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Generic backend related objects""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import typing diff --git a/aiida/orm/implementation/comments.py b/aiida/orm/implementation/comments.py index 568aca033a..b56e10c91e 100644 --- a/aiida/orm/implementation/comments.py +++ b/aiida/orm/implementation/comments.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for comment backend classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/computers.py b/aiida/orm/implementation/computers.py index b5230ed324..974b315afe 100644 --- a/aiida/orm/implementation/computers.py +++ b/aiida/orm/implementation/computers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Backend specific computer objects and methods""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import logging diff --git a/aiida/orm/implementation/django/authinfos.py b/aiida/orm/implementation/django/authinfos.py index 831512e85d..b068506380 100644 --- a/aiida/orm/implementation/django/authinfos.py +++ b/aiida/orm/implementation/django/authinfos.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for the Django backend implementation of the `AuthInfo` ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.djsite.db.models import DbAuthInfo from aiida.common import exceptions diff --git a/aiida/orm/implementation/django/backend.py b/aiida/orm/implementation/django/backend.py index 77a36fc79a..b4ca0fbacd 100644 --- a/aiida/orm/implementation/django/backend.py +++ b/aiida/orm/implementation/django/backend.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Django implementation of `aiida.orm.implementation.backends.Backend`.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from contextlib import contextmanager diff --git a/aiida/orm/implementation/django/comments.py b/aiida/orm/implementation/django/comments.py index df76a8ed9b..52ab54f929 100644 --- a/aiida/orm/implementation/django/comments.py +++ b/aiida/orm/implementation/django/comments.py @@ -9,9 +9,6 @@ ########################################################################### """Django implementations for the Comment entity and collection.""" # pylint: disable=import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from datetime import datetime from django.core.exceptions import ObjectDoesNotExist diff --git a/aiida/orm/implementation/django/computers.py b/aiida/orm/implementation/django/computers.py index 51eb7396b2..55fc3ee71a 100644 --- a/aiida/orm/implementation/django/computers.py +++ b/aiida/orm/implementation/django/computers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Django implementations for the `Computer` entity and collection.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/orm/implementation/django/convert.py b/aiida/orm/implementation/django/convert.py index ebae3049af..2b99d115e3 100644 --- a/aiida/orm/implementation/django/convert.py +++ b/aiida/orm/implementation/django/convert.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=cyclic-import,no-member """Module to get an ORM backend instance from a database model instance.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import try: # Python3 from functools import singledispatch diff --git a/aiida/orm/implementation/django/entities.py b/aiida/orm/implementation/django/entities.py index 0ca6f701c8..65f7c1969b 100644 --- a/aiida/orm/implementation/django/entities.py +++ b/aiida/orm/implementation/django/entities.py @@ -9,10 +9,6 @@ ########################################################################### """Classes and methods for Django specific backend entities""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - import typing from django.db.models import Model # pylint: disable=import-error, no-name-in-module diff --git a/aiida/orm/implementation/django/groups.py b/aiida/orm/implementation/django/groups.py index d43f833846..61fa974925 100644 --- a/aiida/orm/implementation/django/groups.py +++ b/aiida/orm/implementation/django/groups.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=no-member """Django Group entity""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import collections diff --git a/aiida/orm/implementation/django/logs.py b/aiida/orm/implementation/django/logs.py index 89bf7b0969..7bb72cebca 100644 --- a/aiida/orm/implementation/django/logs.py +++ b/aiida/orm/implementation/django/logs.py @@ -9,9 +9,6 @@ ########################################################################### """The Django log and log collection module""" # pylint: disable=import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from django.core.exceptions import ObjectDoesNotExist diff --git a/aiida/orm/implementation/django/nodes.py b/aiida/orm/implementation/django/nodes.py index 14bc02a567..12a69e9568 100644 --- a/aiida/orm/implementation/django/nodes.py +++ b/aiida/orm/implementation/django/nodes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Django implementation of the `BackendNode` and `BackendNodeCollection` classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=import-error,no-name-in-module from datetime import datetime diff --git a/aiida/orm/implementation/django/querybuilder.py b/aiida/orm/implementation/django/querybuilder.py index e14d74659c..245fda6205 100644 --- a/aiida/orm/implementation/django/querybuilder.py +++ b/aiida/orm/implementation/django/querybuilder.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Django query builder""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import uuid import six diff --git a/aiida/orm/implementation/django/users.py b/aiida/orm/implementation/django/users.py index cce42fdef3..0eb2faff7a 100644 --- a/aiida/orm/implementation/django/users.py +++ b/aiida/orm/implementation/django/users.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Django user module""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import functools diff --git a/aiida/orm/implementation/django/utils.py b/aiida/orm/implementation/django/utils.py index 0bc198cfe7..a5496caa2f 100644 --- a/aiida/orm/implementation/django/utils.py +++ b/aiida/orm/implementation/django/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities for the implementation of the Django backend.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=import-error,no-name-in-module from django.db import transaction, IntegrityError diff --git a/aiida/orm/implementation/groups.py b/aiida/orm/implementation/groups.py index 4d2f8521f7..0ae2b6ca2f 100644 --- a/aiida/orm/implementation/groups.py +++ b/aiida/orm/implementation/groups.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Backend group module""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/logs.py b/aiida/orm/implementation/logs.py index 98c17c0d47..ab7a2a8298 100644 --- a/aiida/orm/implementation/logs.py +++ b/aiida/orm/implementation/logs.py @@ -9,9 +9,6 @@ ########################################################################### """Backend group module""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/nodes.py b/aiida/orm/implementation/nodes.py index aeb436bd17..5517182e47 100644 --- a/aiida/orm/implementation/nodes.py +++ b/aiida/orm/implementation/nodes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Abstract BackendNode and BackendNodeCollection implementation.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/querybuilder.py b/aiida/orm/implementation/querybuilder.py index 019f7bb364..f210575851 100644 --- a/aiida/orm/implementation/querybuilder.py +++ b/aiida/orm/implementation/querybuilder.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Backend query implementation classes""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/sql/__init__.py b/aiida/orm/implementation/sql/__init__.py index 934c4a62b3..91890bd3d5 100644 --- a/aiida/orm/implementation/sql/__init__.py +++ b/aiida/orm/implementation/sql/__init__.py @@ -12,9 +12,6 @@ All SQL backends with an ORM should subclass from the classes in this module """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=wildcard-import diff --git a/aiida/orm/implementation/sql/backends.py b/aiida/orm/implementation/sql/backends.py index cd661ea78c..f0db5ed627 100644 --- a/aiida/orm/implementation/sql/backends.py +++ b/aiida/orm/implementation/sql/backends.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Generic backend related objects""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import abc import typing diff --git a/aiida/orm/implementation/sqlalchemy/authinfos.py b/aiida/orm/implementation/sqlalchemy/authinfos.py index b4d08ff366..e221b7ada2 100644 --- a/aiida/orm/implementation/sqlalchemy/authinfos.py +++ b/aiida/orm/implementation/sqlalchemy/authinfos.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for the SqlAlchemy backend implementation of the `AuthInfo` ORM class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.sqlalchemy import get_scoped_session from aiida.backends.sqlalchemy.models.authinfo import DbAuthInfo diff --git a/aiida/orm/implementation/sqlalchemy/backend.py b/aiida/orm/implementation/sqlalchemy/backend.py index 0dadebc1d6..41ccf1f5cf 100644 --- a/aiida/orm/implementation/sqlalchemy/backend.py +++ b/aiida/orm/implementation/sqlalchemy/backend.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SqlAlchemy implementation of `aiida.orm.implementation.backends.Backend`.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function from contextlib import contextmanager diff --git a/aiida/orm/implementation/sqlalchemy/comments.py b/aiida/orm/implementation/sqlalchemy/comments.py index 72c2a48c68..0282c81109 100644 --- a/aiida/orm/implementation/sqlalchemy/comments.py +++ b/aiida/orm/implementation/sqlalchemy/comments.py @@ -9,9 +9,6 @@ ########################################################################### """SQLA implementations for the Comment entity and collection.""" # pylint: disable=import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from datetime import datetime from sqlalchemy.orm.exc import NoResultFound diff --git a/aiida/orm/implementation/sqlalchemy/computers.py b/aiida/orm/implementation/sqlalchemy/computers.py index 7a5106ff52..37f665b96f 100644 --- a/aiida/orm/implementation/sqlalchemy/computers.py +++ b/aiida/orm/implementation/sqlalchemy/computers.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SqlAlchemy implementations for the `Computer` entity and collection.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from copy import copy import six diff --git a/aiida/orm/implementation/sqlalchemy/convert.py b/aiida/orm/implementation/sqlalchemy/convert.py index 8ece66135b..9dc43ae1f8 100644 --- a/aiida/orm/implementation/sqlalchemy/convert.py +++ b/aiida/orm/implementation/sqlalchemy/convert.py @@ -11,10 +11,6 @@ Module to get the backend instance from the Models instance """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - try: # Python3 from functools import singledispatch except ImportError: # Python2 diff --git a/aiida/orm/implementation/sqlalchemy/entities.py b/aiida/orm/implementation/sqlalchemy/entities.py index 9896ffaf36..431b1fcbaa 100644 --- a/aiida/orm/implementation/sqlalchemy/entities.py +++ b/aiida/orm/implementation/sqlalchemy/entities.py @@ -9,10 +9,6 @@ ########################################################################### """Classes and methods for Django specific backend entities""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import - import typing from aiida.backends.sqlalchemy.models.base import Base diff --git a/aiida/orm/implementation/sqlalchemy/groups.py b/aiida/orm/implementation/sqlalchemy/groups.py index 0f53d1d55b..916c965273 100644 --- a/aiida/orm/implementation/sqlalchemy/groups.py +++ b/aiida/orm/implementation/sqlalchemy/groups.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SQLA groups""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function import collections import logging diff --git a/aiida/orm/implementation/sqlalchemy/logs.py b/aiida/orm/implementation/sqlalchemy/logs.py index 57708079ec..9b0872b1de 100644 --- a/aiida/orm/implementation/sqlalchemy/logs.py +++ b/aiida/orm/implementation/sqlalchemy/logs.py @@ -9,9 +9,6 @@ ########################################################################### """SQLA Log and LogCollection module""" # pylint: disable=import-error,no-name-in-module -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from sqlalchemy.orm.exc import NoResultFound diff --git a/aiida/orm/implementation/sqlalchemy/nodes.py b/aiida/orm/implementation/sqlalchemy/nodes.py index 7f84f86aac..830d6def97 100644 --- a/aiida/orm/implementation/sqlalchemy/nodes.py +++ b/aiida/orm/implementation/sqlalchemy/nodes.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SqlAlchemy implementation of the `BackendNode` and `BackendNodeCollection` classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import # pylint: disable=no-name-in-module,import-error from datetime import datetime diff --git a/aiida/orm/implementation/sqlalchemy/querybuilder.py b/aiida/orm/implementation/sqlalchemy/querybuilder.py index 5775142814..0145119b02 100644 --- a/aiida/orm/implementation/sqlalchemy/querybuilder.py +++ b/aiida/orm/implementation/sqlalchemy/querybuilder.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Sqla query builder implementation""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import uuid import six diff --git a/aiida/orm/implementation/sqlalchemy/users.py b/aiida/orm/implementation/sqlalchemy/users.py index 6d217daea9..9ea2314cc7 100644 --- a/aiida/orm/implementation/sqlalchemy/users.py +++ b/aiida/orm/implementation/sqlalchemy/users.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """SQLA user""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.backends.sqlalchemy.models.user import DbUser from aiida.orm.implementation.users import BackendUser, BackendUserCollection from . import entities diff --git a/aiida/orm/implementation/sqlalchemy/utils.py b/aiida/orm/implementation/sqlalchemy/utils.py index c222118d59..47c45c02d3 100644 --- a/aiida/orm/implementation/sqlalchemy/utils.py +++ b/aiida/orm/implementation/sqlalchemy/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities for the implementation of the SqlAlchemy backend.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import contextlib diff --git a/aiida/orm/implementation/users.py b/aiida/orm/implementation/users.py index c62963b6f0..51a5992d34 100644 --- a/aiida/orm/implementation/users.py +++ b/aiida/orm/implementation/users.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Backend user""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/implementation/utils.py b/aiida/orm/implementation/utils.py index 983339568a..538b496769 100644 --- a/aiida/orm/implementation/utils.py +++ b/aiida/orm/implementation/utils.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utility functions for AiiDA ORM implementations.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import __all__ = ('get_attr',) diff --git a/aiida/orm/logs.py b/aiida/orm/logs.py index 80f8483d93..e71e59f418 100644 --- a/aiida/orm/logs.py +++ b/aiida/orm/logs.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for orm logging abstract classes""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import timezone from aiida.manage.manager import get_manager diff --git a/aiida/orm/nodes/__init__.py b/aiida/orm/nodes/__init__.py index b8466c81f3..b11c562245 100644 --- a/aiida/orm/nodes/__init__.py +++ b/aiida/orm/nodes/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable """Module with `Node` sub classes for data and processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .data import * from .process import * diff --git a/aiida/orm/nodes/data/__init__.py b/aiida/orm/nodes/data/__init__.py index c727411f63..0023f8a107 100644 --- a/aiida/orm/nodes/data/__init__.py +++ b/aiida/orm/nodes/data/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub classes for data structures.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .array import ArrayData, BandsData, KpointsData, ProjectionData, TrajectoryData, XyData from .base import BaseType diff --git a/aiida/orm/nodes/data/array/__init__.py b/aiida/orm/nodes/data/array/__init__.py index 0d957993ad..d34d6ad52a 100644 --- a/aiida/orm/nodes/data/array/__init__.py +++ b/aiida/orm/nodes/data/array/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub classes for array based data structures.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .array import ArrayData from .bands import BandsData diff --git a/aiida/orm/nodes/data/array/array.py b/aiida/orm/nodes/data/array/array.py index 7a7f900d19..7a746e761e 100644 --- a/aiida/orm/nodes/data/array/array.py +++ b/aiida/orm/nodes/data/array/array.py @@ -10,9 +10,6 @@ """ AiiDA ORM data class storing (numpy) arrays """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from ..data import Data diff --git a/aiida/orm/nodes/data/array/bands.py b/aiida/orm/nodes/data/array/bands.py index 210ad1046b..797838e4cd 100644 --- a/aiida/orm/nodes/data/array/bands.py +++ b/aiida/orm/nodes/data/array/bands.py @@ -11,9 +11,6 @@ This module defines the classes related to band structures or dispersions in a Brillouin zone, and how to operate on them. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import io from string import Template @@ -1632,7 +1629,6 @@ def _prepare_json(self, main_file_name='', comments=True): # see e.g. http://matplotlib.org/1.3.0/examples/pylab_examples/usetex_baseline_test.html matplotlib_header_template = Template('''# -*- coding: utf-8 -*- -from __future__ import print_function from matplotlib import rc # Uncomment to change default font #rc('font',**{'family':'sans-serif','sans-serif':['Helvetica']}) diff --git a/aiida/orm/nodes/data/array/kpoints.py b/aiida/orm/nodes/data/array/kpoints.py index a281d107d8..6a91aab7c7 100644 --- a/aiida/orm/nodes/data/array/kpoints.py +++ b/aiida/orm/nodes/data/array/kpoints.py @@ -12,9 +12,6 @@ lists and meshes of k-points (i.e., points in the reciprocal space of a periodic crystal structure). """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division from six.moves import range, zip import numpy diff --git a/aiida/orm/nodes/data/array/projection.py b/aiida/orm/nodes/data/array/projection.py index ecfe2d6dd0..6dba504391 100644 --- a/aiida/orm/nodes/data/array/projection.py +++ b/aiida/orm/nodes/data/array/projection.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy import six diff --git a/aiida/orm/nodes/data/array/trajectory.py b/aiida/orm/nodes/data/array/trajectory.py index 454761f1cd..0f273a4b62 100644 --- a/aiida/orm/nodes/data/array/trajectory.py +++ b/aiida/orm/nodes/data/array/trajectory.py @@ -10,9 +10,6 @@ """ AiiDA class to deal with crystal structure trajectories. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import collections import six diff --git a/aiida/orm/nodes/data/array/xy.py b/aiida/orm/nodes/data/array/xy.py index ab7bccefeb..7f53924bec 100644 --- a/aiida/orm/nodes/data/array/xy.py +++ b/aiida/orm/nodes/data/array/xy.py @@ -12,9 +12,6 @@ collections of y-arrays bound to a single x-array, and the methods to operate on them. """ -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six from six.moves import range, zip diff --git a/aiida/orm/nodes/data/base.py b/aiida/orm/nodes/data/base.py index 5cad3c6769..da53a8b1b9 100644 --- a/aiida/orm/nodes/data/base.py +++ b/aiida/orm/nodes/data/base.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to be used as a base for data containers that represent base python data types.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import abc import six diff --git a/aiida/orm/nodes/data/bool.py b/aiida/orm/nodes/data/bool.py index be12fb035e..8afa9fba83 100644 --- a/aiida/orm/nodes/data/bool.py +++ b/aiida/orm/nodes/data/bool.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a boolean value.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import numpy diff --git a/aiida/orm/nodes/data/cif.py b/aiida/orm/nodes/data/cif.py index c821e15a60..c061ca2bb0 100644 --- a/aiida/orm/nodes/data/cif.py +++ b/aiida/orm/nodes/data/cif.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=invalid-name,too-many-locals,too-many-statements """Tools for handling Crystallographic Information Files (CIF)""" -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division from aiida.common.utils import Capturing diff --git a/aiida/orm/nodes/data/code.py b/aiida/orm/nodes/data/code.py index b05d57e4d9..643d2a4266 100644 --- a/aiida/orm/nodes/data/code.py +++ b/aiida/orm/nodes/data/code.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import os diff --git a/aiida/orm/nodes/data/data.py b/aiida/orm/nodes/data/data.py index d181abcdb8..e5f9ddb8e9 100644 --- a/aiida/orm/nodes/data/data.py +++ b/aiida/orm/nodes/data/data.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class `Data` to be used as a base class for data structures.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io diff --git a/aiida/orm/nodes/data/dict.py b/aiida/orm/nodes/data/dict.py index 61424654ac..76f77ed539 100644 --- a/aiida/orm/nodes/data/dict.py +++ b/aiida/orm/nodes/data/dict.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a dictionary.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy diff --git a/aiida/orm/nodes/data/float.py b/aiida/orm/nodes/data/float.py index e7c3d6930f..188a132257 100644 --- a/aiida/orm/nodes/data/float.py +++ b/aiida/orm/nodes/data/float.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a float value.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import numbers diff --git a/aiida/orm/nodes/data/folder.py b/aiida/orm/nodes/data/folder.py index 1ac925023c..bf01e8cd60 100644 --- a/aiida/orm/nodes/data/folder.py +++ b/aiida/orm/nodes/data/folder.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a folder on a file system.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .data import Data diff --git a/aiida/orm/nodes/data/int.py b/aiida/orm/nodes/data/int.py index 18aa7e3845..dc80c5c7f8 100644 --- a/aiida/orm/nodes/data/int.py +++ b/aiida/orm/nodes/data/int.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent an integer value.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import numbers diff --git a/aiida/orm/nodes/data/list.py b/aiida/orm/nodes/data/list.py index 9bd04b388d..0fa97551ed 100644 --- a/aiida/orm/nodes/data/list.py +++ b/aiida/orm/nodes/data/list.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a list.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from six import PY2 if PY2: diff --git a/aiida/orm/nodes/data/numeric.py b/aiida/orm/nodes/data/numeric.py index 1bc941fb8c..6e34f812d7 100644 --- a/aiida/orm/nodes/data/numeric.py +++ b/aiida/orm/nodes/data/numeric.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for defintion of base `Data` sub class for numeric based data types.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .base import to_aiida_type, BaseType diff --git a/aiida/orm/nodes/data/orbital.py b/aiida/orm/nodes/data/orbital.py index a933af83ad..ade31e9c29 100644 --- a/aiida/orm/nodes/data/orbital.py +++ b/aiida/orm/nodes/data/orbital.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy import six diff --git a/aiida/orm/nodes/data/remote.py b/aiida/orm/nodes/data/remote.py index 3218c930ea..292a8bac8c 100644 --- a/aiida/orm/nodes/data/remote.py +++ b/aiida/orm/nodes/data/remote.py @@ -7,9 +7,6 @@ # For further information on the license, see the LICENSE.txt file # # For further information please visit http://www.aiida.net # ########################################################################### -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import os from .data import Data diff --git a/aiida/orm/nodes/data/singlefile.py b/aiida/orm/nodes/data/singlefile.py index 136acde88e..0a2106cbab 100644 --- a/aiida/orm/nodes/data/singlefile.py +++ b/aiida/orm/nodes/data/singlefile.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Data class that can be used to store a single file in its repository.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import warnings import os diff --git a/aiida/orm/nodes/data/str.py b/aiida/orm/nodes/data/str.py index ed449a6beb..0237520075 100644 --- a/aiida/orm/nodes/data/str.py +++ b/aiida/orm/nodes/data/str.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """`Data` sub class to represent a string value.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/orm/nodes/data/structure.py b/aiida/orm/nodes/data/structure.py index c855763b42..7f314051cf 100644 --- a/aiida/orm/nodes/data/structure.py +++ b/aiida/orm/nodes/data/structure.py @@ -11,9 +11,6 @@ This module defines the classes for structures and all related functions to operate on them. """ -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import itertools import copy diff --git a/aiida/orm/nodes/data/upf.py b/aiida/orm/nodes/data/upf.py index e17a0418e3..d4178a5b91 100644 --- a/aiida/orm/nodes/data/upf.py +++ b/aiida/orm/nodes/data/upf.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module of `Data` sub class to represent a pseudopotential single file in UPF format and related utilities.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import io import json diff --git a/aiida/orm/nodes/node.py b/aiida/orm/nodes/node.py index 8fc249805d..32d50e7c35 100644 --- a/aiida/orm/nodes/node.py +++ b/aiida/orm/nodes/node.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=too-many-lines """Package for node ORM classes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import copy import importlib diff --git a/aiida/orm/nodes/process/__init__.py b/aiida/orm/nodes/process/__init__.py index e10c239c95..15e3dd6f03 100644 --- a/aiida/orm/nodes/process/__init__.py +++ b/aiida/orm/nodes/process/__init__.py @@ -9,9 +9,6 @@ ########################################################################### # pylint: disable=wildcard-import,undefined-variable """Module with `Node` sub classes for processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .calculation import * from .process import * diff --git a/aiida/orm/nodes/process/calculation/__init__.py b/aiida/orm/nodes/process/calculation/__init__.py index df82c12c9e..4d6232ba92 100644 --- a/aiida/orm/nodes/process/calculation/__init__.py +++ b/aiida/orm/nodes/process/calculation/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub classes for calculation processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .calculation import CalculationNode from .calcfunction import CalcFunctionNode diff --git a/aiida/orm/nodes/process/calculation/calcfunction.py b/aiida/orm/nodes/process/calculation/calcfunction.py index b0005d0347..c4a9dc50d6 100644 --- a/aiida/orm/nodes/process/calculation/calcfunction.py +++ b/aiida/orm/nodes/process/calculation/calcfunction.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for calculation function processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.links import LinkType from aiida.orm.utils.mixins import FunctionCalculationMixin diff --git a/aiida/orm/nodes/process/calculation/calcjob.py b/aiida/orm/nodes/process/calculation/calcjob.py index d500587bb4..5bb86993fd 100644 --- a/aiida/orm/nodes/process/calculation/calcjob.py +++ b/aiida/orm/nodes/process/calculation/calcjob.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for calculation job processes.""" -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function import warnings import six diff --git a/aiida/orm/nodes/process/calculation/calculation.py b/aiida/orm/nodes/process/calculation/calculation.py index b3c9b34bf5..51a1c7d4d9 100644 --- a/aiida/orm/nodes/process/calculation/calculation.py +++ b/aiida/orm/nodes/process/calculation/calculation.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for calculation processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.links import LinkType from aiida.orm.utils.managers import NodeLinksManager diff --git a/aiida/orm/nodes/process/process.py b/aiida/orm/nodes/process/process.py index b5f05c883c..aada266cc8 100644 --- a/aiida/orm/nodes/process/process.py +++ b/aiida/orm/nodes/process/process.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import enum import six diff --git a/aiida/orm/nodes/process/workflow/__init__.py b/aiida/orm/nodes/process/workflow/__init__.py index f2fee7958e..b4f210da6f 100644 --- a/aiida/orm/nodes/process/workflow/__init__.py +++ b/aiida/orm/nodes/process/workflow/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub classes for workflow processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from .workflow import WorkflowNode from .workchain import WorkChainNode diff --git a/aiida/orm/nodes/process/workflow/workchain.py b/aiida/orm/nodes/process/workflow/workchain.py index ee6b0575f7..5577f58d5b 100644 --- a/aiida/orm/nodes/process/workflow/workchain.py +++ b/aiida/orm/nodes/process/workflow/workchain.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for workchain processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.lang import classproperty diff --git a/aiida/orm/nodes/process/workflow/workflow.py b/aiida/orm/nodes/process/workflow/workflow.py index efb15be194..3b78d2023f 100644 --- a/aiida/orm/nodes/process/workflow/workflow.py +++ b/aiida/orm/nodes/process/workflow/workflow.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for workflow processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.links import LinkType from aiida.orm.utils.managers import NodeLinksManager diff --git a/aiida/orm/nodes/process/workflow/workfunction.py b/aiida/orm/nodes/process/workflow/workfunction.py index 50c946a0ec..c12285476d 100644 --- a/aiida/orm/nodes/process/workflow/workfunction.py +++ b/aiida/orm/nodes/process/workflow/workfunction.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `Node` sub class for workflow function processes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common.links import LinkType from aiida.orm.utils.mixins import FunctionCalculationMixin diff --git a/aiida/orm/querybuilder.py b/aiida/orm/querybuilder.py index b0cbdac4cc..e6d3b9c517 100644 --- a/aiida/orm/querybuilder.py +++ b/aiida/orm/querybuilder.py @@ -19,9 +19,6 @@ when instantiated by the user. """ -from __future__ import division -from __future__ import absolute_import -from __future__ import print_function # Checking for correct input with the inspect module from inspect import isclass as inspect_isclass import copy diff --git a/aiida/orm/users.py b/aiida/orm/users.py index a7ac598364..cf4e3a67c0 100644 --- a/aiida/orm/users.py +++ b/aiida/orm/users.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for the ORM user class.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import warnings diff --git a/aiida/orm/utils/__init__.py b/aiida/orm/utils/__init__.py index 9298bffedc..e997bfa95d 100644 --- a/aiida/orm/utils/__init__.py +++ b/aiida/orm/utils/__init__.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities related to the ORM.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import six diff --git a/aiida/orm/utils/builders/code.py b/aiida/orm/utils/builders/code.py index 510b54e173..ad7834c37a 100644 --- a/aiida/orm/utils/builders/code.py +++ b/aiida/orm/utils/builders/code.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Manage code objects with lazy loading of the db env""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import enum import os diff --git a/aiida/orm/utils/builders/computer.py b/aiida/orm/utils/builders/computer.py index cb8fb1f12b..7d092a9cbd 100644 --- a/aiida/orm/utils/builders/computer.py +++ b/aiida/orm/utils/builders/computer.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Manage computer objects with lazy loading of the db env""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.cmdline.utils.decorators import with_dbenv from aiida.common.utils import ErrorAccumulator diff --git a/aiida/orm/utils/calcjob.py b/aiida/orm/utils/calcjob.py index a357d13dea..8719a5ca22 100644 --- a/aiida/orm/utils/calcjob.py +++ b/aiida/orm/utils/calcjob.py @@ -9,9 +9,6 @@ ########################################################################### """Utilities to operate on `CalcJobNode` instances.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from aiida.common import exceptions __all__ = ('CalcJobResultManager',) diff --git a/aiida/orm/utils/links.py b/aiida/orm/utils/links.py index 1bc8143077..fed90976d1 100644 --- a/aiida/orm/utils/links.py +++ b/aiida/orm/utils/links.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Utilities for dealing with links between nodes.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from collections import namedtuple, OrderedDict, Mapping diff --git a/aiida/orm/utils/loaders.py b/aiida/orm/utils/loaders.py index 7c0fb3bf3b..8110374267 100644 --- a/aiida/orm/utils/loaders.py +++ b/aiida/orm/utils/loaders.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module with `OrmEntityLoader` and its sub classes that simplify loading entities through their identifiers.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import from abc import ABCMeta from enum import Enum diff --git a/aiida/orm/utils/log.py b/aiida/orm/utils/log.py index a511923d8a..c391a30625 100644 --- a/aiida/orm/utils/log.py +++ b/aiida/orm/utils/log.py @@ -8,9 +8,6 @@ # For further information please visit http://www.aiida.net # ########################################################################### """Module for logging methods/classes that need the ORM.""" -from __future__ import division -from __future__ import print_function -from __future__ import absolute_import import logging diff --git a/aiida/orm/utils/managers.py b/aiida/orm/utils/managers.py index c4ad652806..ae41114d39 100644 --- a/aiida/orm/utils/managers.py +++ b/aiida/orm/utils/managers.py @@ -12,9 +12,6 @@ to access members of other classes via TAB-completable attributes (e.g. the class underlying `calculation.inputs` to allow to do `calculation.inputs.