fix[ux]: raise VersionException with source info
#3920
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
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## master #3920 +/- ##
===========================================
- Coverage 90.03% 51.22% -38.82%
===========================================
Files 95 95
Lines 14411 14411
Branches 3193 3193
===========================================
- Hits 12975 7382 -5593
- Misses 1011 6436 +5425
- Partials 425 593 +168 ☔ View full report in Codecov by Sentry. |
This reverts commit 6ed0436.
vyper/ast/pre_parser.py
Outdated
| @@ -176,7 +177,7 @@ def pre_parse(code: str) -> tuple[Settings, ModificationOffsets, dict, str]: | |||
| if settings.compiler_version is not None: | |||
| raise StructureException("compiler version specified twice!", start) | |||
| compiler_version = contents.removeprefix("@version ").strip() | |||
| validate_version_pragma(compiler_version, start) | |||
| validate_version_pragma(compiler_version, line, start) | |||
There was a problem hiding this comment.
i don't think this works if the version pragma is not on the first line?
tests/unit/ast/test_pre_parser.py
Outdated
|
|
||
| def test_version_conflict_with_imports(make_input_bundle, mock_version): | ||
| lib_version = "~=0.3.10" | ||
| contract_version = "0.4.0" |
There was a problem hiding this comment.
i'm not sure this is necessary (it's also brittle, the test will start failing for the wrong reason after 0.4.0 release)
Co-authored-by: Charles Cooper <cooper.charles.m@gmail.com>
|
failing fuzz is unrelated (see #3918) |
charles-cooper
changed the title
VersionException with source infoVersionException with source info
electriclilies
pushed a commit
to electriclilies/vyper
that referenced
this pull request
Apr 27, 2024
this commit adds source code information to the exception thrown in `validate_version_pragma()` to improve user experience when dealing with imports with invalid (or incompatible) version pragmas.
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
Fix #3910.
How I did it
How to verify it
See test
Commit message
Description for the changelog
Cute Animal Picture