Merge branch 'develop' into mp_import_support

aiida/sphinxext/__init__.py

@@ -14,8 +14,8 @@
 from __future__ import division
 from __future__ import print_function
 from __future__ import absolute_import
-__version__ = '0.1.0'
 
+import aiida
 from . import workchain
 
 
@@ -25,4 +25,4 @@ def setup(app):
     """
     workchain.setup_aiida_workchain(app)
 
-    return {'version': __version__, 'parallel_read_safe': True}
+    return {'version': aiida.__version__, 'parallel_read_safe': True}

aiida/work/job_calcs.py

@@ -1,8 +1,19 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+# Copyright (c), The AiiDA team. All rights reserved.                     #
+# This file is part of the AiiDA code.                                    #
+#                                                                         #
+# The code is hosted on GitHub at https://github.com/aiidateam/aiida_core #
+# For further information on the license, see the LICENSE.txt file        #
+# 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
 from functools import partial