Skip to content

Merge master into features#3949

Merged
RonnyPfannschmidt merged 10 commits into
pytest-dev:featuresfrom
nicoddemus:merge-master-into-features
Sep 7, 2018
Merged

Merge master into features#3949
RonnyPfannschmidt merged 10 commits into
pytest-dev:featuresfrom
nicoddemus:merge-master-into-features

Conversation

@nicoddemus

Copy link
Copy Markdown
Member

Thanks for submitting a PR, your contribution is really appreciated!

Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is
just a guideline):

  • Create a new changelog file in the changelog folder, with a name like <ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.
  • Target the master branch for bug fixes, documentation updates and trivial changes.
  • Target the features branch for new features and removals/deprecations.
  • Include documentation when adding new features.
  • Include new tests or update existing tests when applicable.

Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:

  • Add yourself to AUTHORS in alphabetical order;

@RonnyPfannschmidt

Copy link
Copy Markdown
Member

re-triggered the failed travis to finish the run, will merge afterwards

@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.2%) to 93.902% when pulling c00d934 on nicoddemus:merge-master-into-features into f2a427d on pytest-dev:features.

@RonnyPfannschmidt RonnyPfannschmidt merged commit d12f46c into pytest-dev:features Sep 7, 2018
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