Merge pull request #85 from populse/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: denisri

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         exclude: ^doc/sphinx/sphinxext/
 
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
     -   id: pyupgrade
         args: [--py311-plus]

bin/soma_delete_all_workflows

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 '''
 @author: Soizic Laguitton

bin/soma_kill_servers

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
-from __future__ import print_function
 import sys
 import argparse
 from soma_workflow import connection

bin/soma_restart_workflow

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 '''
 @author: Soizic Laguitton

bin/soma_stop_workflow

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 '''
 @author: Soizic Laguitton

bin/soma_submit_workflow

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 '''
 @author: Soizic Laguitton

bin/soma_workflow_gui

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-# -*- coding: utf-8 -*-
 
 '''
 @author: Soizic Laguitton

doc/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # soma-workflow documentation build configuration file, created by
 # sphinx-quickstart on Fri Jan 28 10:45:12 2011.
@@ -11,7 +10,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import absolute_import
 import sys
 import os
 import soma_workflow.version
@@ -65,8 +63,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'soma-workflow'
-copyright = u'2011-2021 CEA, Neurospin, France, CATI, France'
+project = 'soma-workflow'
+copyright = '2011-2021 CEA, Neurospin, France, CATI, France'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -204,8 +202,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'soma-workflow.tex', u'soma-workflow Documentation',
-     u'Soizic Laguitton', 'manual'),
+    ('index', 'soma-workflow.tex', 'soma-workflow Documentation',
+     'Soizic Laguitton', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -237,18 +235,18 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'soma-workflow', u'soma-workflow Documentation',
-     [u'Soizic Laguitton'], 1)
+    ('index', 'soma-workflow', 'soma-workflow Documentation',
+     ['Soizic Laguitton'], 1)
 ]
 
 
 # -- Options for Epub output ---------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'soma-workflow'
-epub_author = u'Soizic Laguitton'
-epub_publisher = u'2021 CEA, Neurospin, France, CATI, France'
-epub_copyright = u'2021, '
+epub_title = 'soma-workflow'
+epub_author = 'Soizic Laguitton'
+epub_publisher = '2021 CEA, Neurospin, France, CATI, France'
+epub_copyright = '2021, '
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

doc/source/conf_github.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # soma-workflow documentation build configuration file, created by
 # sphinx-quickstart on Fri Jan 28 10:45:12 2011.
@@ -11,7 +10,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import absolute_import
 import sys
 import os
 import soma_workflow.version
@@ -51,8 +49,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'soma-workflow'
-copyright = u'2011-2021 CEA, Neurospin, France, CATI, France'
+project = 'soma-workflow'
+copyright = '2011-2021 CEA, Neurospin, France, CATI, France'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -189,8 +187,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'soma-workflow.tex', u'soma-workflow Documentation',
-     u'Soizic Laguitton', 'manual'),
+    ('index', 'soma-workflow.tex', 'soma-workflow Documentation',
+     'Soizic Laguitton', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,18 +220,18 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'soma-workflow', u'soma-workflow Documentation',
-     [u'Soizic Laguitton'], 1)
+    ('index', 'soma-workflow', 'soma-workflow Documentation',
+     ['Soizic Laguitton'], 1)
 ]
 
 
 # -- Options for Epub output ---------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = u'soma-workflow'
-epub_author = u'Soizic Laguitton'
-epub_publisher = u'2021 CEA, Neurospin, France, CATI, France'
-epub_copyright = u'2021, '
+epub_title = 'soma-workflow'
+epub_author = 'Soizic Laguitton'
+epub_publisher = '2021 CEA, Neurospin, France, CATI, France'
+epub_copyright = '2021, '
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

python/soma_workflow/MPI_workflow_runner.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 '''
 author: Benoit Da Mota
 author: Soizic Laguitton
@@ -49,7 +48,7 @@ def slave_loop(communicator,
                 epd_tar = tarfile.open(epd_to_deploy)
                 epd_tar.extractall(path=untar_directory)
                 # logger.debug('extract %s' %(epd_to_deploy))
-            except IOError as e:
+            except OSError as e:
                 logger.error("Could not deploy epd: %s" % (e))
                 pass
 
@@ -117,7 +116,7 @@ def slave_loop(communicator,
 
             else:
                 raise Exception('Unknown tag')
-        for job_id, command_def in six.iteritems(commands):
+        for job_id, command_def in commands.items():
             command, env = command_def
             if command == None:
                 # ended_jobs_info[job_id] = (constants.FAILED,
@@ -205,7 +204,7 @@ def slave_loop(communicator,
                                                 ret_value, None, None))
 
         if ended_jobs_info:
-            for job_id in six.iterkeys(ended_jobs_info):
+            for job_id in ended_jobs_info.keys():
                 del commands[job_id]
             logger.debug("[host: " + socket.gethostname() + "] "
                          + "Slave " + repr(rank) + " send JOB_RESULT")