Merge branch 'master' into feat/disable_old_settings

Vasileios Karakasis · web-flow · commit d4051f70478f · 2020-12-02T09:46:40.000+01:00
diff --git a/.github/linters/.flake8 b/.github/linters/.flake8
@@ -0,0 +1,2 @@
+[flake8]
+select = F401
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,24 +47,15 @@ jobs:
       run: |
         docker run reframe:${{ matrix.modules-version }}
 
-  flake8:
-    if: github.event_name == 'pull_request'
+  unusedimports:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Changed Python Files
-      run: |
-        echo 'CHANGED_PYTHON_FILES<<EOF' >> $GITHUB_ENV
-        git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.sha }} | grep '.py' >> $GITHUB_ENV
-        echo 'EOF' >> $GITHUB_ENV
-    - uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-    - name: Unused Imports Check
-      run: |
-        pip install flake8
-        echo 'Checking Python Files:'
-        for f in "$CHANGED_PYTHON_FILES"; do echo "$f"; done
-        flake8 --select F401 $CHANGED_PYTHON_FILES
+    - name: Lint Code Base
+      uses: github/super-linter@v3
+      env:
+        VALIDATE_ALL_CODEBASE: false
+        VALIDATE_PYTHON_FLAKE8: true
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 </a>
 
 [![Build Status](https://github.com/eth-cscs/reframe/workflows/ReFrame%20CI/badge.svg)](https://github.com/eth-cscs/reframe/actions?query=workflow%3A%22ReFrame+CI%22)
+[![GitHub Super-Linter](https://github.com/eth-cscs/reframe/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter)
 [![Documentation Status](https://readthedocs.org/projects/reframe-hpc/badge/?version=latest)](https://reframe-hpc.readthedocs.io/en/latest/?badge=latest)
 [![codecov.io](https://codecov.io/gh/eth-cscs/reframe/branch/master/graph/badge.svg)](https://codecov.io/github/eth-cscs/reframe)<br/>
 ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/eth-cscs/reframe?include_prereleases)
diff --git a/docs/manpage.rst b/docs/manpage.rst
@@ -893,21 +893,6 @@ Here is an alphabetical list of the environment variables recognized by ReFrame:
       ================================== ==================
 
 
-.. versionadded:: 3.3
-
-.. envvar:: RFM_UNUSE_MODULE_PATHS
-
-   A colon-separated list of module paths to be unused before acting on any tests.
-
-   .. table::
-      :align: left
-
-      ================================== ==================
-      Associated command line option     :option:`--unuse-module-path`
-      Associated configuration parameter :js:attr:`unuse_module_paths` general configuration parameter
-      ================================== ==================
-
-
 .. envvar:: RFM_USE_LOGIN_SHELL
 
    Use a login shell for the generated job scripts.
diff --git a/reframe/frontend/cli.py b/reframe/frontend/cli.py
@@ -737,34 +737,47 @@ def print_infoline(param, value):
             printer.debug(str(e))
             raise
 
+        def module_use(*paths):
+            try:
+                rt.modules_system.searchpath_add(*paths)
+            except errors.EnvironError as e:
+                printer.warning(f'could not add module paths correctly')
+                printer.debug(str(e))
+
+        def module_unuse(*paths):
+            try:
+                rt.modules_system.searchpath_remove(*paths)
+            except errors.EnvironError as e:
+                printer.warning(f'could not remove module paths correctly')
+                printer.debug(str(e))
+
         printer.debug('(Un)using module paths from command line')
+        module_paths = {}
         for d in options.module_paths:
             if d.startswith('-'):
-                try:
-                    rt.modules_system.searchpath_remove(d[1:])
-                except errors.EnvironError as e:
-                    printer.warning(
-                        f'could not remove module path {d} correctly; '
-                        f'skipping...'
-                    )
-                    printer.verbose(str(e))
+                module_paths.setdefault('-', [])
+                module_paths['-'].append(d[1:])
             elif d.startswith('+'):
-                try:
-                    rt.modules_system.searchpath_add(d[1:])
-                except errors.EnvironError as e:
-                    printer.warning(
-                        f'could not add module path {d} correctly; '
-                        f'skipping...'
-                    )
-                    printer.verbose(str(e))
+                module_paths.setdefault('+', [])
+                module_paths['+'].append(d[1:])
+            else:
+                module_paths.setdefault('x', [])
+                module_paths['x'].append(d)
+
+        for op, paths in module_paths.items():
+            if op == '+':
+                module_use(*paths)
+            elif op == '-':
+                module_unuse(*paths)
             else:
-                # Here we make sure that we don't try to remove an empty path
-                # from the searchpath
+                # First empty the current module path in a portable way
                 searchpath = [p for p in rt.modules_system.searchpath if p]
                 if searchpath:
                     rt.modules_system.searchpath_remove(*searchpath)
 
-                rt.modules_system.searchpath_add(d)
+                # Treat `A:B` syntax as well in this case
+                paths = itertools.chain(*(p.split(':') for p in paths))
+                module_use(*paths)
 
         printer.debug('Loading user modules from command line')
         for m in site_config.get('general/0/user_modules'):
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from reframe import VERSION
 
 with open('README.md') as read_me:
-    long_description = ''.join(read_me.readlines()[15:])
+    long_description = ''.join(read_me.readlines()[16:])
 
 setuptools.setup(
     name='ReFrame-HPC',
diff --git a/unittests/test_buildsystems.py b/unittests/test_buildsystems.py
@@ -3,8 +3,6 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-import abc
-import functools
 import pytest
 
 import reframe.core.buildsystems as bs
diff --git a/unittests/test_cli.py b/unittests/test_cli.py
@@ -3,16 +3,14 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
+import contextlib
+import io
 import itertools
 import os
-import pathlib
 import pytest
 import re
 import sys
-from contextlib import redirect_stdout, redirect_stderr, suppress
-from io import StringIO
 
-import reframe.core.config as config
 import reframe.core.environments as env
 import reframe.core.logging as logging
 import reframe.core.runtime as rt
@@ -26,11 +24,11 @@ def run_command_inline(argv, funct, *args, **kwargs):
     sys.argv = argv
     exitcode = None
 
-    captured_stdout = StringIO()
-    captured_stderr = StringIO()
+    captured_stdout = io.StringIO()
+    captured_stderr = io.StringIO()
     print(*sys.argv)
-    with redirect_stdout(captured_stdout):
-        with redirect_stderr(captured_stderr):
+    with contextlib.redirect_stdout(captured_stdout):
+        with contextlib.redirect_stderr(captured_stderr):
             try:
                 with rt.temp_runtime(None):
                     exitcode = funct(*args, **kwargs)
@@ -591,13 +589,13 @@ def test_unload_module(run_reframe, user_exec_ctx):
     assert returncode == 0
 
 
-def test_unuse_module_path(run_reframe, user_exec_ctx, monkeypatch):
+def test_unuse_module_path(run_reframe, user_exec_ctx):
     ms = rt.runtime().modules_system
     if ms.name == 'nomod':
         pytest.skip('no modules system found')
 
     module_path = 'unittests/modules'
-    monkeypatch.setenv('MODULEPATH', module_path)
+    ms.searchpath_add(module_path)
     returncode, stdout, stderr = run_reframe(
         more_options=[f'--module-path=-{module_path}', '--module=testmod_foo'],
         config_file=fixtures.USER_CONFIG_FILE, action='run',
@@ -632,6 +630,9 @@ def test_overwrite_module_path(run_reframe, user_exec_ctx):
         pytest.skip('no modules system found')
 
     module_path = 'unittests/modules'
+    with contextlib.suppress(KeyError):
+        module_path += f':{os.environ["MODULEPATH"]}'
+
     returncode, stdout, stderr = run_reframe(
         more_options=[f'--module-path={module_path}', '--module=testmod_foo'],
         config_file=fixtures.USER_CONFIG_FILE, action='run',
diff --git a/unittests/test_pipeline.py b/unittests/test_pipeline.py
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 import os
-import pathlib
 import pytest
 import re
 
@@ -14,8 +13,7 @@
 import reframe.utility.sanity as sn
 import unittests.fixtures as fixtures
 from reframe.core.exceptions import (BuildError, PipelineError, ReframeError,
-                                     ReframeSyntaxError, PerformanceError,
-                                     SanityError)
+                                     PerformanceError, SanityError)
 from reframe.frontend.loader import RegressionCheckLoader
 from unittests.resources.checks.hellocheck import HelloTest
 from unittests.resources.checks.pinnedcheck import PinnedTest
@@ -827,7 +825,6 @@ def __init__(self, a, b):
 
 
 def test_registration_of_tests():
-    import sys
     import unittests.resources.checks_unlisted.good as mod
 
     checks = mod._rfm_gettests()

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: BSD-3-Clause`
`5`	`5`
`6`		`-import abc`
`7`		`-import functools`
`8`	`6`	`import pytest`
`9`	`7`
`10`	`8`	`import reframe.core.buildsystems as bs`