-
Notifications
You must be signed in to change notification settings - Fork 36
Implemented check of installer Python version vs dependency package #977
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
Open
kalisp
wants to merge
7
commits into
develop
Choose a base branch
from
enhancement/check_python_version_dep_pack_installer
base: develop
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
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6eb1513
Implemented check of installer python version vs dependency package
kalisp f566b15
Removed limitation on production or staging bundles
kalisp f3e3dc6
Ruff
kalisp f5e1f2d
Mypy issue
kalisp 6ebe913
Explicitly select first installer
kalisp 0dcfef6
Add exception handling for missing manifest
kalisp 4116f47
Formatting change
kalisp 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -95,43 +95,9 @@ async def list_installers( | |
| platform: Platform | None = Query(None, description="Platform of the package"), | ||
| variant: Literal["production", "staging"] | None = Query(None), | ||
| ) -> InstallerListModel: | ||
| result: list[Installer] = [] | ||
|
|
||
| if variant in ["production", "staging"]: | ||
| r = await Postgres.fetch( | ||
| f""" | ||
| SELECT data->>'installer_version' as v | ||
| FROM bundles WHERE is_{variant} IS TRUE | ||
| """ | ||
| ) | ||
| if r: | ||
| version = r[0]["v"] | ||
| else: | ||
| raise NotFoundException(f"No {variant} bundle found") | ||
|
|
||
| for filename in iter_names("installers"): | ||
| try: | ||
| manifest = get_manifest(filename) | ||
| except Exception as e: | ||
| logger.warning(f"Failed to load manifest file {filename}: {e}") | ||
| continue | ||
|
|
||
| if filename != manifest.filename: | ||
| logger.warning( | ||
| f"Filenames in manifest don't match: {filename} != {manifest.filename}" | ||
| ) | ||
| continue | ||
|
|
||
| # Filtering | ||
|
|
||
| if platform is not None and platform != manifest.platform: | ||
| continue | ||
|
|
||
| if version is not None and version != manifest.version: | ||
| continue | ||
|
|
||
| result.append(manifest) | ||
| return InstallerListModel(installers=result) | ||
| return await get_installers( | ||
| version=version, platform=platform, variant=variant | ||
| ) | ||
|
|
||
|
|
||
| @router.post("/installers", status_code=201) | ||
|
|
@@ -263,3 +229,47 @@ async def patch_installer(user: CurrentUser, filename: str, payload: SourcesPatc | |
| async with aiofiles.open(manifest.path, "w") as f: | ||
| await f.write(manifest.json(exclude_none=True)) | ||
| return EmptyResponse(status_code=204) | ||
|
|
||
|
|
||
| async def get_installers( | ||
| version: str | None = None, | ||
| platform: Platform | None = None, | ||
| variant: Literal["production", "staging"] | None = None, | ||
| ) -> InstallerListModel: | ||
| result: list[Installer] = [] | ||
|
|
||
| if variant in ["production", "staging"]: | ||
|
Member
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. Looks like dev bundles are not handled? Well, probably are because the logic didn't change, but I wonder how? 🙂 |
||
| r = await Postgres.fetch( | ||
| f""" | ||
| SELECT data->>'installer_version' as v | ||
| FROM bundles WHERE is_{variant} IS TRUE | ||
| """ | ||
| ) | ||
| if r: | ||
| version = r[0]["v"] | ||
| else: | ||
| raise NotFoundException(f"No {variant} bundle found") | ||
|
|
||
| for filename in iter_names("installers"): | ||
| try: | ||
| manifest = get_manifest(filename) | ||
| except Exception as e: | ||
| logger.warning(f"Failed to load manifest file {filename}: {e}") | ||
| continue | ||
|
|
||
| if filename != manifest.filename: | ||
| logger.warning( | ||
| f"Filenames in manifest don't match: {filename} != {manifest.filename}" | ||
| ) | ||
| continue | ||
|
|
||
| # Filtering | ||
|
|
||
| if platform is not None and platform != manifest.platform: | ||
| continue | ||
|
|
||
| if version is not None and version != manifest.version: | ||
| continue | ||
|
|
||
| result.append(manifest) | ||
| return InstallerListModel(installers=result) | ||
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.
Uh oh!
There was an error while loading. Please reload this page.