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

Merge features into master #4172

Merged
merged 142 commits into from
Oct 16, 2018

Conversation

nicoddemus
Copy link
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 and others added 30 commits September 7, 2018 07:58
…ecedence

-W now takes precedence over filters in ini files
…pat-properties

Actually deprecate long standing features
Optionally raise an exception when parametrize collects no arguments.
Provide the name of the test causing the failure in the exception
message.

See: pytest-dev#3849
…meterset

Raise exception if parametrize collects an empty parameter set
The logging plugin does not output log messages generated during the
collection-phase when live-logging is enabled. This fixes this.

Fixes pytest-dev#3964
Add support for logging in collection-phase
…gs-4013

Show deprecation warnings even if filters are customized
Add 3.9 deprecated features to deprecations.rst
cacoze and others added 25 commits October 14, 2018 18:01
…anup-symlink-is-fine

fix pytest-dev#4135 - handle symlinks in tmp path cleanup
Add returncode argument to pytest.exit
To show the subclassed file in legacy test suits in the runtest output
you have to set the verbosity level to at least "-vv" now.

Closes pytest-dev#3211
…features

Merge master into features (prepare for 3.9, pt2)
Increase required verbosity level for debug output
@RonnyPfannschmidt
Copy link
Member

the travis failure is unrelated and needs a osx sortout

@nicoddemus nicoddemus merged commit f7285b6 into pytest-dev:master Oct 16, 2018
@nicoddemus nicoddemus deleted the merge-features-into-master branch October 16, 2018 21:59
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.06%) to 93.958% when pulling ee0a306 on nicoddemus:merge-features-into-master into f858177 on pytest-dev:master.

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.