Skip to content

Skip version check for incompatible version strings in bootstrapper.py #3106

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

Merged
merged 2 commits into from
Feb 14, 2023
Merged

Skip version check for incompatible version strings in bootstrapper.py #3106

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
13af58a
Skip version check for incompatible version string
cjackal Feb 10, 2023
d136a01
Update airflow bootstrapper.py (#3106)
cjackal Feb 14, 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
15 changes: 7 additions & 8 deletions elyra/airflow/bootstrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,21 +343,20 @@ def package_install(cls) -> None:
"editable package. This may conflict with the required version: "
f"{ver} . Skipping..."
)
elif "git+" in current_packages[package]:
continue
try:
version.Version(current_packages[package])
except version.InvalidVersion: # current version is not PEP-440 compliant
logger.warning(
f"WARNING: Source package '{package}' found already installed from "
f"{current_packages[package]}. This may conflict with the required "
f"version: {ver} . Skipping..."
)
elif isinstance(version.parse(current_packages[package]), version.LegacyVersion):
logger.warning(
f"WARNING: Package '{package}' found with unsupported Legacy version "
f"scheme {current_packages[package]} already installed. Skipping..."
)
elif version.parse(ver) > version.parse(current_packages[package]):
continue
if version.Version(ver) > version.Version(current_packages[package]):
logger.info(f"Updating {package} package from version {current_packages[package]} to {ver}...")
to_install_list.append(f"{package}=={ver}")
elif version.parse(ver) < version.parse(current_packages[package]):
elif version.Version(ver) < version.Version(current_packages[package]):
logger.info(
f"Newer {package} package with version {current_packages[package]} "
f"already installed. Skipping..."
Expand Down
10 changes: 7 additions & 3 deletions elyra/kfp/bootstrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,16 +554,20 @@ def package_install(cls, user_volume_path) -> None:
"editable package. This may conflict with the required version: "
f"{ver} . Skipping..."
)
elif "git+" in current_packages[package]:
continue
try:
version.Version(current_packages[package])
except version.InvalidVersion: # current version is not PEP-440 compliant
logger.warning(
f"WARNING: Source package '{package}' found already installed from "
f"{current_packages[package]}. This may conflict with the required "
f"version: {ver} . Skipping..."
)
elif version.parse(ver) > version.parse(current_packages[package]):
continue
if version.Version(ver) > version.Version(current_packages[package]):
logger.info(f"Updating {package} package from version {current_packages[package]} to {ver}...")
to_install_list.append(f"{package}=={ver}")
elif version.parse(ver) < version.parse(current_packages[package]):
elif version.Version(ver) < version.Version(current_packages[package]):
logger.info(
f"Newer {package} package with version {current_packages[package]} "
f"already installed. Skipping..."
Expand Down