-
Notifications
You must be signed in to change notification settings - Fork 54
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
Fixes for package creation and pip installs #781
Merged
sfc-gh-jsikorski
merged 71 commits into
main
from
jsikorski/SNOW-1053803-fix-anaconda-check-in-install-packages
Mar 11, 2024
Merged
Changes from 12 commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
9466af8
Added dependencies check to venv
sfc-gh-jsikorski 8478785
Problem
sfc-gh-jsikorski 96de24c
Problem2
sfc-gh-jsikorski e1968e9
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 2d7d2a0
Fixed problem
sfc-gh-jsikorski 0c0fecf
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski d628f82
Cleanup
sfc-gh-jsikorski 5a5dcca
Corrected github installs
sfc-gh-jsikorski f9fe510
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 4db4a36
Corrected lib path
sfc-gh-jsikorski 184ab17
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski ad58610
added release notes
sfc-gh-jsikorski ce0ab68
fixes
sfc-gh-jsikorski 6de81a3
fixes
sfc-gh-jsikorski 553a7fd
fixes
sfc-gh-jsikorski a78306a
fixes
sfc-gh-jsikorski 63b81c5
Added native libraries option
sfc-gh-jsikorski 0568766
Added native libraries option
sfc-gh-jsikorski 8758573
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 303d686
Snapshot update
sfc-gh-jsikorski 2cd4957
Snapshot update
sfc-gh-jsikorski 9643779
Fixes
sfc-gh-jsikorski e364798
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 3f12e90
After merge fixes
sfc-gh-jsikorski d04a4af
Minor
sfc-gh-jsikorski e6e8734
fixes
sfc-gh-jsikorski b913bd8
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski ffee145
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski fac040e
Updates
sfc-gh-jsikorski 6eacdb9
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 4473db3
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 5a30415
Performance update
sfc-gh-jsikorski e3f6196
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 2911571
Test fix
sfc-gh-jsikorski 5809275
windows fix
sfc-gh-jsikorski 3cd0016
windows fix
sfc-gh-jsikorski 4c6c737
windows fix
sfc-gh-jsikorski b9afc2a
windows fix
sfc-gh-jsikorski 44ebaa1
windows fix
sfc-gh-jsikorski 9dd57b7
windows fix
sfc-gh-jsikorski 54221b0
windows fix
sfc-gh-jsikorski 24f2135
windows fix
sfc-gh-jsikorski 8a9d663
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 28ba4ee
fixed tests
sfc-gh-jsikorski abcd0fd
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 346f7eb
fixed tests
sfc-gh-jsikorski 420f037
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski dd05ba7
Fixes after review
sfc-gh-jsikorski 024435e
Fixes after review
sfc-gh-jsikorski 7ba5714
Fixes
sfc-gh-jsikorski 50efec9
Fixes
sfc-gh-jsikorski 27d1d0c
Fixes
sfc-gh-jsikorski 8df3710
Fixes
sfc-gh-jsikorski 852a4dd
Fixes
sfc-gh-jsikorski 01a0ae0
Fixes
sfc-gh-jsikorski 21521b7
Fixes
sfc-gh-jsikorski 2578038
Fixes
sfc-gh-jsikorski cc8023a
Replaced deprecated flags
sfc-gh-jsikorski 27aba75
Replaced deprecated flags
sfc-gh-jsikorski 10bfcc9
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski d9b999d
Replaced deprecated flags
sfc-gh-jsikorski 1654c57
Replaced deprecated flags
sfc-gh-jsikorski 6689b91
Fix for encoding
sfc-gh-jsikorski f57aad5
Fix for encoding
sfc-gh-jsikorski cd7ba59
Fix for encoding
sfc-gh-jsikorski 4f610c8
Fix for encoding
sfc-gh-jsikorski 654d54f
Fix for encoding
sfc-gh-jsikorski f767a18
Started cleaning
sfc-gh-jsikorski d95501f
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 2277f88
Cleanup
sfc-gh-jsikorski 9ba815c
Merge branch 'main' into jsikorski/SNOW-1053803-fix-anaconda-check-in…
sfc-gh-jsikorski 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 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 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 |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
from enum import Enum | ||
from typing import List | ||
|
||
from requirements.requirement import Requirement | ||
from requirements import requirement | ||
|
||
|
||
class PypiOption(Enum): | ||
|
@@ -13,6 +13,17 @@ class PypiOption(Enum): | |
ASK = "ask" | ||
|
||
|
||
class Requirement(requirement.Requirement): | ||
@classmethod | ||
def parse_line(cls, line: str) -> Requirement: | ||
result = super().parse_line(line) | ||
|
||
if result.uri and not result.name: | ||
result.name = result.uri | ||
|
||
return result | ||
|
||
|
||
@dataclass | ||
class SplitRequirements: | ||
"""A dataclass to hold the results of parsing requirements files and dividing them into | ||
|
@@ -30,3 +41,20 @@ class RequirementWithFiles: | |
|
||
requirement: Requirement | ||
files: List[str] | ||
|
||
|
||
@dataclass | ||
class RequirementWithFilesAndDeps(RequirementWithFiles): | ||
dependencies: List[str] | ||
|
||
def to_requirement_with_files(self): | ||
return RequirementWithFiles(self.requirement, self.files) | ||
|
||
|
||
pip_failed_msg = """pip failed with return code {}. | ||
If pip is installed correctly, this may mean you`re trying to install a package | ||
that isn't compatible with the host architecture - | ||
and generally means it has native libraries.""" | ||
second_chance_msg = """Good news! The following package dependencies can be | ||
imported directly from Anaconda, and will be excluded from | ||
the zip: {}""" | ||
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. How do those messages look like in cli? Ain't there too many blank lines on the lef? 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. Fixed |
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please add more info?