Skip to content
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

Can specify package version if not available by other means #87

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Can specify package version if not available by other means #87

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
ca627af
Fixes #83. Loading a recipe that has no version, nor conandata.yml, c…
markfinal Jul 13, 2023
7f37d4f
Fixes #83. Parsing an invalid conandata.yml now shows the exception m…
markfinal Jul 13, 2023
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 cruiz/commands/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ def get_conandata(
if self.parent():
self.parent().record_exception(exception)
else:
raise Exception(
raise ValueError(
"Failed to get conandata YAML dict for recipe"
) from exception
return conandata
Expand Down
7 changes: 6 additions & 1 deletion cruiz/load_recipe/loadrecipewizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ def __init__(
log_details.logging.connect(self._on_error_loading)
with managed_conan_context(DEFAULT_CACHE_NAME, log_details) as context:
self.recipe_attributes = context.inspect_recipe(self._path)
self.conandata = context.get_conandata(self._path)
try:
self.conandata = context.get_conandata(self._path)
except ValueError:
log_details.stderr(
"Unable to obtain version numbers from conandata.yml"
)

def _on_error_loading(self) -> None:
self.ui.intro_message.show()
Expand Down
92 changes: 50 additions & 42 deletions cruiz/load_recipe/pages/packageversionpage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,38 +34,8 @@ def initializePage(self) -> None:

self._ui.version.currentTextChanged.connect(self._on_version_changed)

self._uuid_versions = {}
if self.wizard().recipe_attributes["version"] is None:
# get versions from conandata.yml
versions = self._get_versions_from_conandata(self.wizard().conandata)
if versions:
# get the versions from uuids with the same paths
for uuid in self.wizard().matching_uuids:
with RecipeSettingsReader.from_uuid(uuid) as settings:
attributes = settings.attribute_overrides.resolve()
if "version" in attributes:
self._uuid_versions[attributes["version"]] = uuid

with BlockSignals(self._ui.version) as blocked_widget:
blocked_widget.clear()
model = blocked_widget.model()
for i, version in enumerate(versions):
if version in self._uuid_versions:
blocked_widget.addItem(QtGui.QIcon(":/cruiz.png"), version)
if cruiz.globals.get_main_window().is_recipe_active(
self._uuid_versions[version]
):
item = model.item(i)
item.setFlags(item.flags() & ~QtGui.Qt.ItemIsEnabled)
else:
blocked_widget.addItem(version)
blocked_widget.setCurrentIndex(-1)
else:
with BlockSignals(self._ui.version) as blocked_widget:
blocked_widget.clear()
blocked_widget.addItem(self.wizard().recipe_attributes["version"])
# combobox disabled to ensure it's clear that there's no choice
self._ui.version.setEnabled(False)
self._uuid_versions: typing.Dict[str, str] = {}
self._resolve_ui_to_possible_versions()
super().initializePage()

def cleanupPage(self) -> None:
Expand All @@ -80,19 +50,57 @@ def _on_version_changed(self, text: str) -> None:
self.wizard().uuid = None
self.completeChanged.emit()

def _resolve_ui_to_possible_versions(self) -> None:
self._ui.version.setEditable(False)
version_in_recipe = self.wizard().recipe_attributes.get("version")
if version_in_recipe is None:
# get versions from conandata.yml
conandata = self.wizard().conandata
if conandata:
versions = self._get_versions_from_conandata(conandata)
if versions:
# get the versions from uuids with the same paths
for uuid in self.wizard().matching_uuids:
with RecipeSettingsReader.from_uuid(uuid) as settings:
attributes = settings.attribute_overrides.resolve()
if "version" in attributes:
self._uuid_versions[attributes["version"]] = uuid

with BlockSignals(self._ui.version) as blocked_widget:
blocked_widget.clear()
model = blocked_widget.model()
for i, version in enumerate(versions):
if version in self._uuid_versions:
blocked_widget.addItem(
QtGui.QIcon(":/cruiz.png"), version
)
if cruiz.globals.get_main_window().is_recipe_active(
self._uuid_versions[version]
):
item = model.item(i)
item.setFlags(
item.flags() & ~QtGui.Qt.ItemIsEnabled
)
else:
blocked_widget.addItem(version)
blocked_widget.setCurrentIndex(-1)
else:
# if the conandata.yml is not available, manually specify a version
self._ui.version.setEditable(True)
self._ui.version.lineEdit().setPlaceholderText(
"Package version to use, e.g. 1.2.3"
)
else:
with BlockSignals(self._ui.version) as blocked_widget:
blocked_widget.clear()
blocked_widget.addItem(version_in_recipe)
# combobox disabled to ensure it's clear that there's no choice
self._ui.version.setEnabled(False)

def _get_versions_from_conandata(
self, conandata: typing.Dict[str, typing.Dict[str, str]]
) -> typing.Optional[typing.List[str]]:
if not conandata:
QtWidgets.QMessageBox.information(
self,
"No conandata.yaml file beside recipe",
"Unable to read the conandata.yml beside the recipe. "
"Does the file exist?\n"
"The package version number can be manually specified, "
"or the conanfile.yml can be added next to the recipe.",
)
return None
assert conandata
with ConanSettingsReader() as settings:
path_segments = settings.conandata_version_yaml_pathsegment.resolve()
if path_segments is None:
Expand Down