merge: 'main' to hesa-normalize-unknown-behaviour

vinland-technology · Jan 20, 2024 · e8d584d · e8d584d
2 parents b8bc85d + bd95fa6
commit e8d584d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/flict/flictlib/compatibility.py b/flict/flictlib/compatibility.py
@@ -46,7 +46,7 @@ class Compatibility:
     """
 
     def __init__(self, license_db=None):
-        return None
+        pass
 
     def check_compat(self, outbound, inbound):
         return None
@@ -76,7 +76,7 @@ def display_compatibility(self):
             licenses = list(_licenses)
 
             inter_compats = self.check_compatibilities(licenses, self._args.extended_licenses)
-        except BaseException:
+        except Exception:
             raise FlictError(ReturnCodes.RET_INVALID_EXPRESSSION,
                              f'Could not parse license expression: {self._args.license_expression}')
 

diff --git a/flict/flictlib/license_parser.py b/flict/flictlib/license_parser.py
@@ -179,7 +179,7 @@ def licenses(self, expr):
             for key in keys:
                 key_set.add(key.replace("_WITH_", " WITH "))
             return list(key_set)
-        except BaseException:
+        except Exception:
             raise FlictError(ReturnCodes.RET_INVALID_EXPRESSSION, f"Could not parse and list license expression: {expr}")
 
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -5,7 +5,7 @@ flake8 ~= 7.0
 flake8-2020 ~= 1.8
 flake8-bandit ~= 4.1
 flake8-broken-line ~= 1.0
-flake8-bugbear ~= 23.12
+flake8-bugbear ~= 24.1
 flake8-builtins ~= 2.2
 flake8-coding ~= 1.3
 flake8-commas ~= 2.1
@@ -35,5 +35,5 @@ pytest-socket ~= 0.6
 pytest-sugar ~= 0.9
 pytest-tldr ~= 0.2
 twine ~= 4.0
-reuse ~= 2.1
 jsonschema
+reuse ~= 3.0