Merge branch 'master' into assemble_circuits-and-transpiler-peakmem-b…

…enchmarks

docs/LOCALIZATION_CONTRIBUTORS

@@ -21,3 +21,4 @@ Walid El Maouaki
 Philip Düe
 Vicente Pina Canelles
 Adolfo Cruz
+Cristeam Caiola Pasquier

docs/conf.py

@@ -35,8 +35,11 @@
 from docutils import nodes
 from docutils.parsers.rst.directives.tables import Table
 from docutils.parsers.rst import Directive, directives
+from sphinx.util import logging
 
 
+logger = logging.getLogger(__name__)
+
 # -- Project information -----------------------------------------------------
 
 project = 'Qiskit'
@@ -293,8 +296,9 @@ def _get_setup_py(self, version):
                                 cwd=self.repo_root)
         stdout, stderr = proc.communicate()
         if proc.returncode > 0:
-            raise RuntimeError("%s failed with:\nstdout:\n%s\nstderr:\n%s\n"
-                               % (cmd, stdout, stderr))
+            logger.warn("%s failed with:\nstdout:\n%s\nstderr:\n%s\n"
+                        % (cmd, stdout, stderr))
+            return ''
         return stdout.decode('utf8')
 
     def get_versions(self, tags):
@@ -363,9 +367,11 @@ def run(self):
                                 stderr=subprocess.PIPE, cwd=self.repo_root)
         stdout, stderr = proc.communicate()
         if proc.returncode > 0:
-            raise RuntimeError("%s failed with:\nstdout:\n%s\nstderr:\n%s\n"
-                               % (cmd, stdout, stderr))
-        tags = stdout.decode('utf8').splitlines()
+            logger.warn("%s failed with:\nstdout:\n%s\nstderr:\n%s\n"
+                        % (cmd, stdout, stderr))
+            tags = []
+        else:
+            tags = stdout.decode('utf8').splitlines()
         versions = self.get_versions(tags)
         self.max_cols = len(self.headers)
         self.col_widths = self.get_column_widths(self.max_cols)

tools/generate_authors.py

@@ -85,6 +85,8 @@ def generate_authors(git_dir, meta=False):
     authors = sorted(set(authors), key=lambda x: (x.split()[-1], x.split()[:]))
     with open(output_path, 'w') as fd:
         for author in authors:
+            if author == 'qiskit-bot':
+                continue
             fd.write(author + '\n')