fix: Fix validation for web frameworks #148
Open
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
Both Django and Flask have two supported major versions. Fix validation to reflect this.
Try to import appmap.django during initialization, to give us a chance to set up our middleware.
apotterri
force-pushed
the
web-validate_20210927
branch
from
5e4c07c
to
f62bf4f
Compare
dividedmind
reviewed
Sep 29, 2021
Comment on lines
27
to
+43
| dist_version = None | ||
| try: | ||
| dist_version = version(dist) | ||
| for v in versions: | ||
| try: | ||
| dist_version = version(dist) | ||
|
|
||
| required = parse(v) | ||
| actual = parse(dist_version) | ||
| if required.major != actual.major: | ||
| dist_version = None | ||
| continue | ||
|
|
||
| required = parse(v) | ||
| actual = parse(dist_version) | ||
| if actual < required: | ||
| raise ValidationFailure(f'{dist} must have version >= {required}, found {actual}') | ||
|
|
||
| if actual < required: | ||
| raise ValidationFailure(f'{dist} must have version >= {required}, found {actual}') | ||
| except PackageNotFoundError: | ||
| pass | ||
| return dist_version | ||
| except PackageNotFoundError: | ||
| dist_version = None |
There was a problem hiding this comment.
Nitpick: this changed logic is a bit convoluted and difficult to follow. How about something like:
try:
dist_version = version(dist)
actual = parse(dist_version)
required = next(v for v in map(parse, versions) if v.major == actual.major)
if actual < required:
raise ValidationFailure
except PackageNotFoundError, StopIteration:
return None
return dist_version| from . import django | ||
| except ImportError: | ||
| # not using django | ||
| pass |
There was a problem hiding this comment.
Seems ok to me, python isn't as fragile re import order as ruby can be.
Merged
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.
Both Django and Flask have two supported major versions. Fix validation
and update tests to reflect this.