Merge branch 'develop' into py10_setup_py

Author: boegel

.github/workflows/linting.yml

@@ -7,7 +7,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: 3.8
 

.github/workflows/unit_tests.yml

@@ -116,9 +116,10 @@ jobs:
         GITHUB_TOKEN: ${{secrets.TEST_GITHUB_TOKEN}}
       run: |
         # don't install GitHub token when testing with Lmod 7.x or non-Lmod module tools,
+        # and only when testing with Lua as module syntax,
         # to avoid hitting GitHub rate limit;
         # tests that require a GitHub token are skipped automatically when no GitHub token is available
-        if [[ ! "${{matrix.modules_tool}}" =~ 'Lmod-7' ]] && [[ ! "${{matrix.modules_tool}}" =~ 'modules-' ]]; then
+        if [[ ! "${{matrix.modules_tool}}" =~ 'Lmod-7' ]] && [[ ! "${{matrix.modules_tool}}" =~ 'modules-' ]] && [[ "${{matrix.modules_syntax}}" == 'Lua' ]]; then
           if [ ! -z $GITHUB_TOKEN ]; then
             if [ "x${{matrix.python}}" == 'x2.6' ];
               then SET_KEYRING="keyring.set_keyring(keyring.backends.file.PlaintextKeyring())";

RELEASE_NOTES

@@ -4,6 +4,28 @@ For more detailed information, please see the git log.
 These release notes can also be consulted at https://easybuild.readthedocs.io/en/latest/Release_notes.html.
 
 
+v4.5.2 (January 24th 2022)
+--------------------------
+
+update/bugfix release
+
+- various enhancements, including:
+  - automatically prepend value for env-for-shebang configuration setting with sysroot (#3919)
+  - enhance update_build_option to return original value + add support for update_build_options (#3923)
+  - fix compatibility with Python 3.10 (#3926, #3933)
+  - also take /etc/os-release into account in get_os_name and get_os_version (#3930)
+  - enhance get_cpu_architecture and get_cpu_family to be aware of RISC-V (#3931)
+- various bug fixes, including:
+  - relax pattern checks in test_toy_exts_parallel (#3921)
+  - use sources.easybuild.io as backup URL for downloading Environment Modules sources to run test suite (#3928)
+  - make intelfftw toolchain component aware of GCCcore (#3929)
+- other changes:
+  - deprecate use of (actual) patch files that don't have a filename ending with .patch (#3920)
+  - remove version restriction for keyring in requirements.txt to test with latest version (#3925)
+  - simplify requirements.txt by removing Python 2.6 support (#3927)
+  - only run GitHub tests when testing with Lua module syntax, to avoid hitting GitHub rate limit when running tests (#3938)
+
+
 v4.5.1 (December 13th 2021)
 ---------------------------
 

easybuild/tools/filetools.py

@@ -163,6 +163,8 @@
     '.sh': "cp -a %(filepath)s .",
 }
 
+ZIPPED_PATCH_EXTS = ('.bz2', '.gz', '.xz')
+
 # global set of names of locks that were created in this session
 global_lock_names = set()
 
@@ -1493,8 +1495,11 @@ def create_patch_info(patch_spec):
                                  str(patch_spec))
 
     elif isinstance(patch_spec, string_type):
-        if not patch_spec.endswith('.patch'):
-            _log.deprecated("Use of patch file with filename that doesn't end with .patch: %s" % patch_spec, '5.0')
+        allowed_patch_exts = ['.patch' + x for x in ('',) + ZIPPED_PATCH_EXTS]
+        if not any(patch_spec.endswith(x) for x in allowed_patch_exts):
+            msg = "Use of patch file with filename that doesn't end with correct extension: %s " % patch_spec
+            msg += "(should be any of: %s)" % (', '.join(allowed_patch_exts))
+            _log.deprecated(msg, '5.0')
         patch_info = {'name': patch_spec}
     else:
         error_msg = "Wrong patch spec, should be string of 2-tuple with patch name + argument: %s"
@@ -1548,7 +1553,7 @@ def apply_patch(patch_file, dest, fn=None, copy=False, level=None, use_git_am=Fa
     # split in stem (filename w/o extension) + extension
     patch_stem, patch_extension = os.path.splitext(os.path.split(abs_patch_file)[1])
     # Supports only bz2, gz and xz. zip can be archives which are not supported.
-    if patch_extension in ['.gz', '.bz2', '.xz']:
+    if patch_extension in ZIPPED_PATCH_EXTS:
         # split again to get the second extension
         patch_subextension = os.path.splitext(patch_stem)[1]
         if patch_subextension == ".patch":

easybuild/tools/systemtools.py

@@ -697,9 +697,6 @@ def get_os_name():
         res = name_regex.search(os_release_txt)
         if res:
             os_name = res.group('name')
-    else:
-        # no easy way to determine name of Linux distribution
-        os_name = None
 
     os_name_map = {
         'red hat enterprise linux server': 'RHEL',
@@ -742,8 +739,6 @@ def get_os_version():
             res = version_regex.search(os_release_txt)
             if res:
                 os_version = res.group('version')
-    else:
-        os_version = None
 
     if os_version:
         if get_os_name() in ["suse", "SLES"]:

easybuild/tools/version.py

@@ -43,7 +43,7 @@
 # recent setuptools versions will *TRANSFORM* something like 'X.Y.Zdev' into 'X.Y.Z.dev0', with a warning like
 #   UserWarning: Normalizing '2.4.0dev' to '2.4.0.dev0'
 # This causes problems further up the dependency chain...
-VERSION = LooseVersion('4.5.2.dev0')
+VERSION = LooseVersion('4.5.3.dev0')
 UNKNOWN = 'UNKNOWN'
 
 

test/framework/filetools.py

@@ -1638,11 +1638,14 @@ def test_create_patch_info(self):
         stderr = self.get_stderr()
         self.mock_stderr(False)
         self.disallow_deprecated_behaviour()
-        expected_warning = "Use of patch file with filename that doesn't end with .patch: foo.txt"
-        self.assertTrue(expected_warning in stderr)
+        expected_warning = "Use of patch file with filename that doesn't end with correct extension: foo.txt "
+        expected_warning += "(should be any of: .patch, .patch.bz2, .patch.gz, .patch.xz)"
+        fail_msg = "Warning '%s' should appear in stderr output: %s" % (expected_warning, stderr)
+        self.assertTrue(expected_warning in stderr, fail_msg)
 
         # deprecation warning is treated as an error in context of unit test suite
-        self.assertErrorRegex(EasyBuildError, expected_warning, ft.create_patch_info, 'foo.txt')
+        expected_error = expected_warning.replace('(', '\\(').replace(')', '\\)')
+        self.assertErrorRegex(EasyBuildError, expected_error, ft.create_patch_info, 'foo.txt')
 
         # faulty input
         error_msg = "Wrong patch spec"