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

Support Python 3 #3028

Merged
merged 3 commits into from
Jan 26, 2019
Merged

Support Python 3 #3028

merged 3 commits into from
Jan 26, 2019

Conversation

nmuesch
Copy link
Collaborator

@nmuesch nmuesch commented Jan 24, 2019

What does this PR do?

New urlparse and urljoin import, division

Motivation

Support 🐍 3️⃣

Review checklist

  • PR has a meaningful title or PR has the no-changelog label attached
  • Feature or bugfix has tests
  • Git history is clean
  • If PR impacts documentation, docs team has been notified or an issue has been opened on the documentation repo
  • If PR adds a configuration option, it has been added to the configuration file.

Additional Notes

Anything else we should know when reviewing?

@codecov-io
Copy link

Codecov Report

Merging #3028 into master will increase coverage by 4.83%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #3028      +/-   ##
==========================================
+ Coverage   84.15%   88.99%   +4.83%     
==========================================
  Files         673       10     -663     
  Lines       36595     1145   -35450     
  Branches     4336      153    -4183     
==========================================
- Hits        30798     1019   -29779     
+ Misses       4548       85    -4463     
+ Partials     1249       41    -1208

Copy link
Contributor

@gmmeyer gmmeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me! Thanks!

from datadog_checks.stubs import aggregator
aggregator.reset()
return aggregator
@pytest.fixture()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you change this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to put this in the PR description, basically there is a bug in requests-mock where the decorator isn't registered as a fixture for pytest, and this only impacts PY3 - pytest-dev/pytest#2749

aggregator.reset()
return aggregator
@pytest.fixture()
def m():
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you name this better?

gmmeyer
gmmeyer previously approved these changes Jan 24, 2019
xvello
xvello previously approved these changes Jan 25, 2019
@nmuesch nmuesch dismissed stale reviews from xvello and gmmeyer via 27bb681 January 25, 2019 19:54
@nmuesch nmuesch merged commit dcc101a into master Jan 26, 2019
@nmuesch nmuesch deleted the nick/kubelet3 branch January 26, 2019 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants