Skip to content

Commit 272955a

Browse files
committed
Allow pre-releases and fix error message in DIRAC version check
1 parent 4396fe8 commit 272955a

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/WebAppDIRAC/scripts/dirac_webapp_run.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,20 @@ def _checkDIRACVersion():
6363
"""
6464
from importlib.metadata import requires, version # pylint: disable=import-error,no-name-in-module
6565
from packaging.requirements import Requirement # pylint: disable=no-name-in-module
66+
from packaging.specifiers import SpecifierSet
6667

6768
deps = [Requirement(x) for x in requires("WebAppDIRAC")]
6869
deps = [x for x in deps if x.name.lower() == "dirac"]
6970
if len(deps) != 1:
7071
raise NotImplementedError(f"This shouldn't be possible: {deps!r}")
72+
7173
dirac_version = version("DIRAC")
72-
dirac_spec = deps[0].specifier
74+
dirac_spec = SpecifierSet(deps[0].specifier, prereleases=True)
75+
7376
if dirac_version not in dirac_spec:
7477
raise RuntimeError(
7578
"WebAppDIRAC {} requires {} but {} is incompatible".format(
76-
version("WebAppDIRAC"), dirac_version, dirac_spec
79+
version("WebAppDIRAC"), dirac_spec, dirac_version
7780
)
7881
)
7982

0 commit comments

Comments
 (0)