Skip to content

Commit 7fb289a

Browse files
committed
Allow pre-releases and fix error message in DIRAC version check
1 parent 3b78ac8 commit 7fb289a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/WebAppDIRAC/scripts/dirac_webapp_run.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,20 @@ def _checkDIRACVersion():
6565
"""
6666
from importlib.metadata import requires, version # pylint: disable=import-error,no-name-in-module
6767
from packaging.requirements import Requirement # pylint: disable=no-name-in-module
68+
from packaging.specifiers import SpecifierSet
6869

6970
deps = [Requirement(x) for x in requires("WebAppDIRAC")]
7071
deps = [x for x in deps if x.name.lower() == "dirac"]
7172
if len(deps) != 1:
7273
raise NotImplementedError(f"This shouldn't be possible: {deps!r}")
74+
7375
dirac_version = version("DIRAC")
74-
dirac_spec = deps[0].specifier
76+
dirac_spec = SpecifierSet(deps[0].specifier, prereleases=True)
77+
7578
if dirac_version not in dirac_spec:
7679
raise RuntimeError(
7780
"WebAppDIRAC {} requires {} but {} is incompatible".format(
78-
version("WebAppDIRAC"), dirac_version, dirac_spec
81+
version("WebAppDIRAC"), dirac_spec, dirac_version
7982
)
8083
)
8184

0 commit comments

Comments
 (0)