Skip to content

Merge master into features #5876

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.

Sign up for GitHub

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

Closed
wants to merge 9 commits into from
Closed

Merge master into features #5876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fcf21a
Fix logging doc: change x.level to x.levelno
jamescooke Sep 20, 2019
1b4ad77
Fix logging doc: change x.level to x.levelno (#5866)
nicoddemus Sep 21, 2019
de8fdab
Change report-coverage.sh in attempt to fix Azure
nicoddemus Sep 21, 2019
ea0c7e4
Remove unneeded codecov options (implied with "-f")
blueyed Sep 23, 2019
04c01fb
test_argcomplete do not call python directly #5872
Sep 23, 2019
018edf2
Change report-coverage.sh in attempt to fix Azure (#5869)
nicoddemus Sep 23, 2019
d3d9f9f
Merge remote-tracking branch 'upstream/master' into mm
nicoddemus Sep 23, 2019
7c64d5d
Do not call python directly but use sys.executable. Fixes #5872 (#5873)
nicoddemus Sep 23, 2019
c28b631
Merge master into features (#5874)
nicoddemus Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/en/logging.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
yield window
for when in ("setup", "call"):
messages = [
x.message for x in caplog.get_records(when) if x.level == logging.WARNING
x.message for x in caplog.get_records(when) if x.levelno == logging.WARNING
]
if messages:
pytest.fail(
Expand Down
3 changes: 2 additions & 1 deletion scripts/report-coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ fi
python -m coverage combine
python -m coverage xml
python -m coverage report -m
bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml
curl -S -L --retry 3 -s https://codecov.io/bash -o codecov-upload.sh
bash codecov-upload.sh -Z -X fix -f coverage.xml
6 changes: 5 additions & 1 deletion testing/test_parseopt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,11 @@ def test_argcomplete(testdir, monkeypatch):
# redirect output from argcomplete to stdin and stderr is not trivial
# http://stackoverflow.com/q/12589419/1307905
# so we use bash
fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2')
fp.write(
'COMP_WORDBREAKS="$COMP_WORDBREAKS" {} -m pytest 8>&1 9>&2'.format(
sys.executable
)
)
# alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
# to handle a keyword argument env that replaces os.environ in popen or
# extends the copy, advantage: could not forget to restore
Expand Down