Skip to content

Merge master into features (about to prepare 4.0) #4383

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 22 commits into from
Nov 13, 2018

Conversation

nicoddemus
Copy link
Member

No description provided.

blueyed and others added 22 commits November 9, 2018 13:16
Ref: pytest-dev#4321 (comment)

Hardens some of the not many tests affected by this:

1. `testing/test_session.py::test_rootdir_option_arg` displayed:

> root/test_rootdir_option_arg2/test_rootdir_option_arg.py

2. `test_cmdline_python_namespace_package` displayed "hello/" prefix for:

> hello/test_hello.py::test_hello
> hello/test_hello.py::test_other
…or_relpath

Fix nodes._check_initialpaths_for_relpath for dirs
tests: fix equal_with_bash to handle appearing .coverage files
Fix collection of symlinked files
Travis: use Xenial by default  [skip appveyor]
Travis: use coverage from existing tox env  [skip appveyor]
CI: doctesting uses coverage, fiy py37 on AppVeyor
CI: use py37 instead of py36 by default
@nicoddemus
Copy link
Member Author

Another build interrupted on AppVeyor due to a codecov connection failure... rebuilding.

@RonnyPfannschmidt
Copy link
Member

do we have a command retry tool to make it try more than once?

@blueyed
Copy link
Contributor

blueyed commented Nov 13, 2018

On Travis I've switched to codecov-bash, which retries automatically.
No Idea for Windows.. could be just a simple loop + sleep?!

It is unfortunate that you have to rebuild everything on AppVeyor.

@blueyed
Copy link
Contributor

blueyed commented Nov 13, 2018

Heh.. you got my 👍 into here automatically.. :D

@nicoddemus
Copy link
Member Author

nicoddemus commented Nov 13, 2018

Follow up for the retry script idea: #4387

@nicoddemus nicoddemus merged commit fea09cd into pytest-dev:features Nov 13, 2018
@nicoddemus nicoddemus deleted the merge-master-into-features branch November 13, 2018 20:57
@codecov
Copy link

codecov bot commented Nov 13, 2018

Codecov Report

Merging #4383 into features will increase coverage by 0.35%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #4383      +/-   ##
============================================
+ Coverage     95.63%   95.99%   +0.35%     
============================================
  Files           111      111              
  Lines         24954    25358     +404     
  Branches       2440     2496      +56     
============================================
+ Hits          23865    24342     +477     
+ Misses          775      726      -49     
+ Partials        314      290      -24
Flag Coverage Δ
#docs 29.82% <7.5%> (?)
#doctesting 29.82% <7.5%> (?)
#linting 29.82% <7.5%> (?)
#linux 95.74% <100%> (+0.1%) ⬆️
#nobyte 92.47% <100%> (+1.24%) ⬆️
#numpy 93.27% <47.5%> (+51.67%) ⬆️
#pexpect 41.78% <7.5%> (+0.18%) ⬆️
#py27 94.14% <100%> (+0.23%) ⬆️
#py34 92.28% <100%> (+0.3%) ⬆️
#py35 92.29% <100%> (+0.3%) ⬆️
#py36 92.31% <100%> (-1.44%) ⬇️
#py37 94.2% <100%> (+2.24%) ⬆️
#trial 93.27% <47.5%> (+51.67%) ⬆️
#windows 94.2% <47.5%> (?)
#xdist 94.05% <100%> (+0.47%) ⬆️
Impacted Files Coverage Δ
testing/acceptance_test.py 98.28% <ø> (+1.07%) ⬆️
testing/test_session.py 96.5% <ø> (ø) ⬆️
src/_pytest/main.py 96.96% <100%> (-0.01%) ⬇️
testing/test_argcomplete.py 68.11% <100%> (+1.44%) ⬆️
testing/test_nodes.py 100% <100%> (ø) ⬆️
src/_pytest/nodes.py 94.69% <100%> (+0.81%) ⬆️
testing/test_collection.py 99.79% <100%> (ø) ⬆️
src/_pytest/python.py 95.27% <0%> (-0.25%) ⬇️
testing/test_cacheprovider.py 99.28% <0%> (-0.15%) ⬇️
src/_pytest/fixtures.py 97.39% <0%> (+0.26%) ⬆️
... and 10 more

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 8198e7c...557cb6c. Read the comment docs.

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