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

Use pre-commit in project #7

Merged
merged 4 commits into from
Aug 12, 2019
Merged

Conversation

BeyondEvil
Copy link
Contributor

Since black wasn't used previously, a lot of the changes are due to running it.

from requests.packages.urllib3.util.retry import Retry


@pytest.fixture(autouse=True)
def httpserver(httpserver):
return httpserver
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For some reason, some of the tests fails when using python 2.7 without this, seemingly, redundant fixture. Any idea why, @nicoddemus ?

Tried replacing it with pytestmark = pytest.mark.usefixture("httpserver") without success.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or maybe @davehunt knows/remembers?

Copy link
Contributor

Choose a reason for hiding this comment

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

I would agree this looks redundant, but regretfully I don't recall why this was necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just added it back, with a note about removing it when we drop 2.7 support.

Copy link
Contributor

@davehunt davehunt left a comment

Choose a reason for hiding this comment

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

Typo, and the failing Travis CI build. Otherwise, looks good.

development.rst Outdated
Development
===========

To contribute to `pytest-html` you can use `Pipenv`_ to manage
Copy link
Contributor

Choose a reason for hiding this comment

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

pytest-base-url

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@BeyondEvil BeyondEvil merged commit 40a3b3b into pytest-dev:master Aug 12, 2019
@BeyondEvil BeyondEvil deleted the use-pre-commit branch August 12, 2019 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants