-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
versions: add support for version checks via pyproject.toml #386
Open
max-moser
wants to merge
1
commit into
inveniosoftware:master
Choose a base branch
from
max-moser:mm/version-check-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of Invenio. | ||
# Copyright (C) 2022 CERN. | ||
# Copyright (C) 2025 TU Wien. | ||
# | ||
# Invenio is free software; you can redistribute it and/or modify it | ||
# under the terms of the MIT License; see LICENSE file for more details. | ||
|
||
"""Invenio CLI dependencies helper.""" | ||
|
||
import os | ||
import re | ||
|
||
import tomli | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
from packaging.requirements import Requirement | ||
from pipfile import Pipfile | ||
|
||
_version_pattern = re.compile(r"[0-9]*\.[0-9]*\.[0-9]*") | ||
|
||
|
||
def _parse_version(version): | ||
"""Parse a version identifier into a list of numbers.""" | ||
groups = _version_pattern.search(version) | ||
if groups: | ||
return [int(v) for v in groups.group(0).split(".")] | ||
else: | ||
return None | ||
|
||
|
||
def _from_pipfile(dep_name): | ||
"""Parse the stated dependency from the ``Pipfile``.""" | ||
parsed = Pipfile.load(filename="./Pipfile") | ||
version = (parsed.data["default"].get(dep_name, {}).get("version", ""),) | ||
return _parse_version(version) | ||
|
||
|
||
def _from_pyproject_toml(dep_name): | ||
"""Parse the stated dependency from ``pyproject.toml``.""" | ||
with open("./pyproject.toml", "rb") as toml_file: | ||
parsed = tomli.load(toml_file) | ||
|
||
dependencies = [Requirement(d) for d in parsed["project"]["dependencies"]] | ||
app_rdms = [d for d in dependencies if d.name == "invenio-app-rdm"] | ||
if not app_rdms: | ||
return None | ||
|
||
# Get the first concrete positive version specifier | ||
v, *_ = [s for s in app_rdms[0].specifier if not s.operator.startswith("!")] | ||
return _parse_version(v.version) | ||
|
||
|
||
def rdm_version(): | ||
"""Return the latest RDM version.""" | ||
if os.path.isfile("./Pipfile"): | ||
return _from_pipfile("invenio-app-rdm") | ||
|
||
elif os.path.isfile("./pyproject.toml"): | ||
return _from_pyproject_toml("invenio-app-rdm") | ||
|
||
else: | ||
raise FileNotFoundError("Found neither 'Pipfile' nor 'pyproject.toml'") | ||
|
||
|
||
def ils_version(): | ||
"""Return the latest ILS version.""" | ||
if os.path.isfile("./Pipfile"): | ||
return _from_pipfile("invenio-app-ils") | ||
|
||
elif os.path.isfile("./pyproject.toml"): | ||
return _from_pyproject_toml("invenio-app-ils") | ||
|
||
else: | ||
raise FileNotFoundError("Found neither 'Pipfile' nor 'pyproject.toml'") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merged
ils.py
andrdm.py
into this one