Merge master into features (including fix from 4816) #4817
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
py37-freeze will be tackled in pytest-dev#4807
Travis: use pypy from Xenial, add pypy3
…ghting_for_two_rst_docs Fix sphinx code-block types (syntax highlighting) in two docs
From the Python docs: "Changed in version 3.5: The use of venv is now recommended for creating virtual environments." -https://docs.python.org/3/library/venv.html
update links for virtualenv -> venv
venv has been installed with Python since 3.3. https://docs.python.org/3/library/venv.html
`venv` is already available in Python 3.4, my mistake
Doc update - recommend use venv instead of virtualenv
…-envs Add same environments to Azure, except py37-freeze
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
…logreport Logging: Make pytest_runtest_logreport() hook available for logging
pluggy now calls iter_entry_points with different arguments, and tests which mocked that call need to be updated accordingly.
blueyed
approved these changes
Feb 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To save time, opening a PR merging master into features, including #4816, to save time. 😅
For consistency we should merge #4816 first.