fix: relax version detection checks #30
Merged
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
vvm/utils/versioning.py
Outdated
| match = _VERSION_RE.search(source_code) | ||
| if match is None: | ||
| match = _VERSION_RE.findall(source_code) | ||
| if not match: |
There was a problem hiding this comment.
i'm not a fan of using truthy in predicates -- how about if len(matches) == 0:
There was a problem hiding this comment.
reverted to search instead of findall, as there was no reason to use the latter here.
Co-authored-by: Charles Cooper <[email protected]>
vvm/utils/versioning.py
Outdated
| # adapted from vyper/ast/pre_parse.py at commit c32b9b4c6f0d8 | ||
| # convert npm to pep440 | ||
| version_str = re.sub("^\\^", "~=", version_str) | ||
| version_str = re.sub("^~(?!\\=)", "~=", version_str) |
There was a problem hiding this comment.
what does this line do? it's not in the compiler
There was a problem hiding this comment.
Just removed it, it was doing a ~0.3.0 => ~=0.3.0 conversion, but turns out it doesn't seems to have ever been used in the wild and people were sticking to caret notation in 0.3.
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.
What I did
vvm should never perform checks more restrictive than the compiler itself. As opposed, if checks are not strict enough, the compiler will anyway fail later.
Hence, this PR relaxes the following version detection checks:
>=0.3.10, <0.4.0^0.4.0as it get converted to pep440 even in recent versions of the compiler.~0.3.1as older versions of the compiler accept them.Additionally, this PR exposes
detect_version_specifier_setsuch thattitanoboacan check if the installed vyper version is in the set before callingdetect_vyper_version_from_source.How I did it
Updated
_detect_version_specifierto match Vyper's own pragma validation.How to verify it
See updated test.
Checklist