Skip to content

Allow pre-releases and fix error message in DIRAC version check #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxnoe wants to merge 2 commits into
base: integration
Choose a base branch
from
Open

Allow pre-releases and fix error message in DIRAC version check #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a6546c
fix: Allow pre-releases and fix error message in DIRAC version check
maxnoe Jan 15, 2025
9a23baa
fix: fix pre-commit complaint
maxnoe Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Checkout main repository
uses: actions/checkout@v5
with:
fetch-depth: 0 # get full history (so no need for "git fetch --unshallow")
fetch-depth: 0 # get full history (so no need for "git fetch --unshallow")

# Configure git identity
- name: Configure git
Expand Down
7 changes: 5 additions & 2 deletions src/WebAppDIRAC/scripts/dirac_webapp_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,20 @@ def _checkDIRACVersion():
"""
from importlib.metadata import requires, version # pylint: disable=import-error,no-name-in-module
from packaging.requirements import Requirement # pylint: disable=no-name-in-module
from packaging.specifiers import SpecifierSet

deps = [Requirement(x) for x in requires("WebAppDIRAC")]
deps = [x for x in deps if x.name.lower() == "dirac"]
if len(deps) != 1:
raise NotImplementedError(f"This shouldn't be possible: {deps!r}")

dirac_version = version("DIRAC")
dirac_spec = deps[0].specifier
dirac_spec = SpecifierSet(deps[0].specifier, prereleases=True)

if dirac_version not in dirac_spec:
raise RuntimeError(
"WebAppDIRAC {} requires {} but {} is incompatible".format(
version("WebAppDIRAC"), dirac_version, dirac_spec
version("WebAppDIRAC"), dirac_spec, dirac_version
)
)

Expand Down