Skip to content
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

Jump to bottom

fix(mypy): avoid parsing redis asyncio files with Python 2 #3868

Merged
merged 2 commits into from Jul 5, 2022
Merged

fix(mypy): avoid parsing redis asyncio files with Python 2 #3868

merged 2 commits into from Jul 5, 2022

Conversation

majorgreys
Copy link
Collaborator

@majorgreys majorgreys commented Jun 27, 2022 •
edited by mabdinur

Description

Fixes #3845

Checklist

Testing strategy

We do not as yet run Python 2 type checking so this will have to be tested manually.

Reviewer Checklist

  • Title is accurate.
  • Description motivates each change.
  • No unnecessary changes were introduced in this PR.
  • PR cannot be broken up into smaller PRs.
  • Avoid breaking API changes unless absolutely necessary.
  • Tests provided or description of manual testing performed is included in the code or PR.
  • Release note has been added for fixes and features, or else changelog/no-changelog label added.
  • All relevant GitHub issues are correctly linked.
  • Backports are identified and tagged with Mergifyio.
  • Add to milestone.

brettlangdon
brettlangdon previously approved these changes Jun 27, 2022
View reviewed changes
Kyle-Verhoog
Kyle-Verhoog previously approved these changes Jun 27, 2022
View reviewed changes
ddtrace/contrib/redis/patch.py Outdated Show resolved Hide resolved
@mabdinur mabdinur dismissed stale reviews from Kyle-Verhoog and brettlangdon via 5bb42d4 June 30, 2022 18:36
@mabdinur mabdinur force-pushed the majorgreys/fix-mypy-py2-redis branch 2 times, most recently from 5bb42d4 to 30361e7 Compare June 30, 2022 18:38
@mabdinur mabdinur marked this pull request as ready for review June 30, 2022 18:39
@mabdinur mabdinur requested a review from a team as a code owner June 30, 2022 18:39
@mabdinur mabdinur force-pushed the majorgreys/fix-mypy-py2-redis branch from 30361e7 to 7eb736d Compare June 30, 2022 18:39
mabdinur
mabdinur previously approved these changes Jun 30, 2022
View reviewed changes
@mabdinur mabdinur mentioned this pull request Jun 30, 2022
Closed
14 tasks
@mabdinur mabdinur force-pushed the majorgreys/fix-mypy-py2-redis branch from 7eb736d to 408e8f2 Compare July 1, 2022 14:37
brettlangdon
brettlangdon previously approved these changes Jul 1, 2022
View reviewed changes
jd
jd previously approved these changes Jul 4, 2022
View reviewed changes
@mabdinur mabdinur force-pushed the majorgreys/fix-mypy-py2-redis branch from 408e8f2 to cc80ca8 Compare July 5, 2022 13:35
@majorgreys majorgreys dismissed stale reviews from jd and brettlangdon via 38a6bde July 5, 2022 14:33
@majorgreys majorgreys force-pushed the majorgreys/fix-mypy-py2-redis branch from 38a6bde to 6191a6a Compare July 5, 2022 14:43
@codecov-commenter
Copy link

Codecov Report

Merging #3868 (6191a6a) into 1.x (9a2febf) will decrease coverage by 0.07%.
The diff coverage is 64.87%.

@@            Coverage Diff             @@
##              1.x    #3868      +/-   ##
==========================================
- Coverage   78.78%   78.70%   -0.08%     
==========================================
  Files         685      687       +2     
  Lines       53121    53356     +235     
==========================================
+ Hits        41850    41996     +146     
- Misses      11271    11360      +89
Impacted Files Coverage Δ
ddtrace/internal/wrapping.py 0.00% <0.00%> (ø)
tests/contrib/flask/test_flask_helpers.py 0.00% <0.00%> (ø)
tests/contrib/flask/test_signals.py 0.00% <0.00%> (ø)
tests/contrib/flask/test_template.py 0.00% <0.00%> (ø)
tests/contrib/urllib3/test_urllib3.py 99.64% <ø> (ø)
tests/integration/test_propagation.py 0.00% <0.00%> (ø)
tests/internal/test_wrapping.py 0.00% <0.00%> (ø)
tests/utils.py 90.52% <ø> (ø)
ddtrace/internal/periodic.py 56.04% <52.63%> (-3.22%) ⬇️
ddtrace/internal/sampling.py 90.47% <90.47%> (ø)
... and 9 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@majorgreys
Copy link
Collaborator Author

@Mergifyio backport 1.2

@mergify
Copy link
Contributor

mergify bot commented Jul 5, 2022

backport 1.2

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@mergify mergify bot merged commit d2ed33a into 1.x Jul 5, 2022
@mergify mergify bot deleted the majorgreys/fix-mypy-py2-redis branch July 5, 2022 15:45
mergify bot pushed a commit that referenced this pull request Jul 5, 2022
@majorgreys @mergify
fix(mypy): avoid parsing redis asyncio files with Python 2 (#3868)
9b03391 
## Description

Fixes #3845

## Checklist
- [ ] Title must conform to [conventional commit](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional).
- [ ] Add additional sections for `feat` and `fix` pull requests.
- [ ] Ensure tests are passing for affected code.
- [ ] [Library documentation](https://github.com/DataDog/dd-trace-py/tree/1.x/docs) and/or [Datadog's documentation site](https://github.com/DataDog/documentation/) is updated. Link to doc PR in description.

## Testing strategy

We do not as yet run Python 2 type checking so this will have to be tested manually.

## Reviewer Checklist
- [x] Title is accurate.
- [x] Description motivates each change.
- [x] No unnecessary changes were introduced in this PR.
- [x] PR cannot be broken up into smaller PRs.
- [x] Avoid breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary.
- [x] Tests provided or description of manual testing performed is included in the code or PR.
- [x] Release note has been added for fixes and features, or else `changelog/no-changelog` label added.
- [x] All relevant GitHub issues are correctly linked.
- [x] Backports are identified and tagged with Mergifyio.
- [ ] Add to milestone.

(cherry picked from commit d2ed33a)
@mergify mergify bot mentioned this pull request Jul 5, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jul 5, 2022

backport 1.2

✅ Backports have been created

@github-actions github-actions bot added this to the v1.3.0 milestone Jul 5, 2022
Kyle-Verhoog pushed a commit that referenced this pull request Jul 5, 2022
@mergify @majorgreys
fix(mypy): avoid parsing redis asyncio files with Python 2 (#3868) (#…
d370b73 
…3906)

## Description

Fixes #3845

Co-authored-by: Tahir H. Butt <tahir.butt@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kyle-Verhoog Kyle-Verhoog Kyle-Verhoog approved these changes

@mabdinur mabdinur mabdinur approved these changes

@jd jd jd left review comments

@brettlangdon brettlangdon brettlangdon left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.3.0
Development

Successfully merging this pull request may close these issues.

mypy invalid syntax error with python 2
6 participants
@majorgreys @codecov-commenter @jd @brettlangdon @Kyle-Verhoog @mabdinur