Skip to content

Commit

Permalink
Merge branch 'develop' into fix-3582-renku-graph-export-with-zenodo-d…
Browse files Browse the repository at this point in the history
…ataset
  • Loading branch information
olevski committed Aug 22, 2023
2 parents 431ef2f + ffd987e commit fba90bd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
7 changes: 1 addition & 6 deletions renku/ui/service/controllers/cache_migrations_check.py
Expand Up @@ -20,7 +20,6 @@
from dataclasses import asdict
from pathlib import Path

from renku.command.doctor import doctor_check_command
from renku.command.migrate import MigrationCheckResult, migrations_check
from renku.core.errors import AuthenticationError, MinimumVersionError, ProjectNotFound, RenkuException
from renku.core.util.contexts import renku_project_context
Expand Down Expand Up @@ -79,11 +78,7 @@ def _fast_op_without_cache(self):
def renku_op(self):
"""Renku operation for the controller."""
try:
migrations_check_result = migrations_check().build().execute().output
doctor_result = doctor_check_command(with_fix=False).build().execute(fix=False, force=False).output
migrations_check_result.core_compatibility_status.fixes_available = doctor_result[1]
migrations_check_result.core_compatibility_status.issues_found = doctor_result[2]
return migrations_check_result
return migrations_check().build().execute().output
except MinimumVersionError as e:
return MigrationCheckResult.from_minimum_version_error(e)

Expand Down
6 changes: 0 additions & 6 deletions renku/ui/service/serializers/cache.py
Expand Up @@ -274,12 +274,6 @@ class ProjectCompatibilityResponseDetail(Schema):
migration_required = fields.Boolean(
metadata={"description": "Whether or not a metadata migration is required to be compatible with this service."}
)
fixes_available = fields.Boolean(
metadata={
"description": "Whether automated fixes of metadata (beyond those done during migration) are available."
}
)
issues_found = fields.List(fields.Str, metadata={"description": "Metadata issues found on project."})


class ProjectCompatibilityResponse(OneOfSchema):
Expand Down

0 comments on commit fba90bd

Please sign in to comment.