Fix pypi url usage #1226
Merged
Fix pypi url usage #1226
Conversation
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
|
jmthomas
approved these changes
May 2, 2024
| @@ -36,7 +36,7 @@ module OpenC3 | |||
| # and destroy to allow interaction with gem files from the PluginModel and | |||
| # the GemsController. | |||
| class GemModel | |||
| include Api | |||
| extend Api | |||
There was a problem hiding this comment.
Doesn't extend add as class methods vs include adds as instance methods
There was a problem hiding this comment.
Yep. That was the bug as we were using get_setting in a class method not an instance method.
| end | ||
| Logger.info "Installing python package: #{name_or_path}" | ||
| result = OpenC3::ProcessManager.instance.spawn(["pip", "install", "--user", "-i", pypi_url, package_file_path], "package_install", package_filename, Time.now + 3600.0, scope: scope) | ||
| result = OpenC3::ProcessManager.instance.spawn(["/openc3/bin/pipinstall", "--user", "--no-warn-script-location", "-i", pypi_url, package_file_path], "package_install", package_filename, Time.now + 3600.0, scope: scope) |
There was a problem hiding this comment.
Looks like we were using this in the plugin_model.rb but not here. Is this the real fix?
There was a problem hiding this comment.
This adds a retry if the remote install fails, that try to just do local.
| pypi_url += '/simple' | ||
| end | ||
| pypi_url ||= 'https://pypi.org/simple' | ||
| end |
There was a problem hiding this comment.
Logic is cleaner but basically the same?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes #1137