fix: Fix validation for web frameworks#148
Open
Uh oh!
There was an error while loading. Please reload this page.
Conversation
This file contains hidden or 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.
apotterriforce-pushed the web-validate_20210927 branch from 5e4c07c to f62bf4fCompare
Contributor
dividedmind left a comment
dividedmind left a comment There was a problem hiding this comment.
Looks good, but note this changes the semantics and it's not clear to me this is intended. In particular, consider what happens when a dependency is detected with a major version different from any on the list of supported ones.
Comment on lines 27 to +43
| dist_version=None | ||
| try: | ||
| dist_version=version(dist) | ||
| forvinversions: | ||
| try: | ||
| dist_version=version(dist) | ||
| required=parse(v) | ||
| actual=parse(dist_version) | ||
| ifrequired.major!=actual.major: | ||
| dist_version=None | ||
| continue | ||
| required=parse(v) | ||
| actual=parse(dist_version) | ||
| ifactual<required: | ||
| raiseValidationFailure(f'{dist} must have version >= {required}, found {actual}') | ||
| ifactual<required: | ||
| raiseValidationFailure(f'{dist} must have version >= {required}, found {actual}') | ||
| exceptPackageNotFoundError: | ||
| pass | ||
| returndist_version | ||
| exceptPackageNotFoundError: | ||
| dist_version=None |
Contributor
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(vforvinmap(parse, versions) ifv.major==actual.major) ifactual<required: raiseValidationFailureexceptPackageNotFoundError, StopIteration: returnNonereturndist_version| from . importdjango | ||
| exceptImportError: | ||
| # not using django | ||
| pass |
Contributor
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 freeto 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.