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

Release 3.6.1 #3534

Merged
merged 3 commits into from
Jun 5, 2018
Merged

Release 3.6.1 #3534

merged 3 commits into from
Jun 5, 2018

Conversation

nicoddemus
Copy link
Member

No description provided.

@nicoddemus
Copy link
Member Author

I noticed that regendoc and our linting environments are not in agreement. After regendoc, linting fails:

hookid: trailing-whitespace

Files were modified by this hook. Additional output:

Fixing doc/en/builtin.rst
Fixing doc/en/cache.rst
Fixing doc/en/tmpdir.rst
Fixing doc/en/warnings.rst
Fixing doc/en/doctest.rst
Fixing doc/en/parametrize.rst
Fixing doc/en/index.rst
Fixing doc/en/usage.rst
Fixing doc/en/example/nonpython.rst
Fixing doc/en/assert.rst
Fixing doc/en/getting-started.rst
Fixing doc/en/example/parametrize.rst
Fixing doc/en/unittest.rst
Fixing doc/en/example/markers.rst
Fixing doc/en/example/pythoncollection.rst
Fixing doc/en/fixture.rst
Fixing doc/en/example/simple.rst
Fixing doc/en/capture.rst
Fixing doc/en/skipping.rst
Fixing doc/en/example/reportingdemo.rst

@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) to 92.752% when pulling 2a79f58 on nicoddemus:release-3.6.1 into cc793a8 on pytest-dev:master.

@nicoddemus
Copy link
Member Author

Thanks @RonnyPfannschmidt. Any thoughts on the regendoc vs linting above? Should we update regendoc to produce the same code?

@RonnyPfannschmidt
Copy link
Member

@nicoddemus should be considered a regendoc bug, for now jsut fix them

@nicoddemus nicoddemus merged commit 56b3a9e into pytest-dev:master Jun 5, 2018
@nicoddemus nicoddemus deleted the release-3.6.1 branch June 5, 2018 17:45
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.

3 participants