Merge pull request #5885 from chrisburr/the-future-is-here

[8.0] Remove __future__ imports

Author: fstagni

.github/workflows/basic.yml

@@ -88,3 +88,23 @@ jobs:
         ${{ matrix.command }}
       env:
         REFERENCE_BRANCH: ${{ github['base_ref'] || github['head_ref'] }}
+
+  pylint-py27:
+    name: Pylint for Python 2.7 in Pilot files
+    runs-on: ubuntu-latest
+    if: github.event_name != 'push' || github.repository == 'DIRACGrid/DIRAC'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fail-fast for outdated pipelines
+      run: .github/workflows/fail-fast.sh
+    - name: prepare environment
+      run: |
+        conda config --set add_pip_as_python_dependency false
+        conda create -c conda-forge -n test-env python=2.7 pylint=1.9.2 astroid=1.6.5
+    - name: run pilot wrapper test
+      run: |
+        eval "$(conda shell.bash hook)" && conda activate test-env
+        pylint -E \
+          tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py \
+          src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py \
+          src/DIRAC/Resources/Computing/BatchSystems/*.py

.pre-commit-config.yaml

@@ -22,3 +22,23 @@ repos:
     rev: 22.1.0
     hooks:
       - id: black
+        exclude: |
+          (?x)^(
+              src/DIRAC/Resources/Computing/BatchSystems/[^/]+.py|
+              src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py|
+              tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py
+          )$
+
+  - repo: https://github.com/psf/black
+    rev: 21.9b0
+    hooks:
+      - id: black
+        name: black for files with Python 2.7 compatibility
+        additional_dependencies: [".[python2]"]
+        args: ["--target-version=py27"]
+        files: |
+          (?x)^(
+              src/DIRAC/Resources/Computing/BatchSystems/[^/]+.py|
+              src/DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py|
+              tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py
+          )$

docs/diracdoctools/Config.py

@@ -1,8 +1,4 @@
 """Configuration for the documentation scripts."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import os
 import glob
 import logging

docs/diracdoctools/CustomizedDocs/CustomDErrno.py

@@ -1,7 +1,4 @@
 """Additional docstring for the DErrno module."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
 
 
 class CustomDErrno(object):  # pylint: disable=too-few-public-methods

docs/diracdoctools/CustomizedDocs/CustomTransformation.py

@@ -1,8 +1,4 @@
 """Additional docstring for the Transformation module."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import textwrap
 
 MODULE = "DIRAC.TransformationSystem.Client.Transformation"

docs/diracdoctools/Utilities.py

@@ -1,9 +1,4 @@
 """Utilities used by the documentation scripts."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from __future__ import absolute_import
 
 from builtins import open
 

docs/diracdoctools/__init__.py

@@ -3,10 +3,6 @@
 
 Scripts to build code documentation, and also some mocking, etc.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 # list of packages that should be mocked in sphinx
 # TODO: check if we can install more of these
 DIRAC_DOC_MOCK_LIST = [

docs/diracdoctools/cmd/codeReference.py

@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 """ create rst files for documentation of DIRAC """
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import os
 import shutil
 import socket

docs/diracdoctools/cmd/commandReference.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 """Module to create command references for DIRAC."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from concurrent.futures import ThreadPoolExecutor
 import logging
 import os

docs/diracdoctools/cmd/concatcfg.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 """script to concatenate the dirac.cfg file's Systems sections with the content of the ConfigTemplate.cfg files."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from collections import OrderedDict
 import logging
 import os