Skip to content

Merge master into features #5559

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

Merged
merged 27 commits into from
Jul 8, 2019

Conversation

nicoddemus
Copy link
Member

No description provided.

NiklasMM and others added 27 commits June 29, 2019 14:02
…est-dev#5517)

doc(plugin_hooks): Improve documentation for writing plugin hooks.
Hopefully by Python 3.9 this will be fixed upstream, if not we will
need to bump the version again.

Fix pytest-dev#5523
…-dev#5526)

Apply workaround for multiple short options for Python <= 3.8
The following edits are for the "Preparing pull requests" section only.
1. remove Python2-related commands.
2. clarifying some details for beginners. Such as that pre-commit must to be installed as admin to function properly.
3. Added "You may not create a changelog entry if the change doesn't affect the documented behaviour of Pytest." on line 270.
Give an overview of how we as an organization will use the donated money,
as well as show this information more prominently in the docs.
Added talk about pytest in PyBCN June 2019
Added talk about pytest in PyBCN June 2019
integrating with `python setup.py test` is not good practice!
Substituted 'yml' to '.yaml' in relevant files
Add docs about Tidelift and OpenCollective
Improve quoting in raises match failure message
Handle xfail(strict=True) properly in --step-wise mode
Preparing release version 5.0.1
@codecov
Copy link

codecov bot commented Jul 5, 2019

Codecov Report

Merging #5559 into features will decrease coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #5559      +/-   ##
============================================
- Coverage      96.1%   96.08%   -0.03%     
============================================
  Files           117      117              
  Lines         25698    25716      +18     
  Branches       2494     2494              
============================================
+ Hits          24697    24709      +12     
- Misses          696      702       +6     
  Partials        305      305
Impacted Files Coverage Δ
testing/test_stepwise.py 100% <100%> (ø) ⬆️
testing/python/raises.py 94.48% <100%> (+0.23%) ⬆️
src/_pytest/_code/code.py 94.32% <100%> (ø) ⬆️
src/_pytest/stepwise.py 96.55% <100%> (ø) ⬆️
src/_pytest/doctest.py 94.38% <0%> (-2.25%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60a358f...d7588b8. Read the comment docs.

@nicoddemus nicoddemus merged commit e33736c into pytest-dev:features Jul 8, 2019
@nicoddemus nicoddemus deleted the merge-master-into-features branch July 8, 2019 20:26
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.

8 participants