Merge master into features #4100

nicoddemus · 2018-10-09T22:34:38Z

No description provided.

Add pytest.freeze_includes() to reference

…re-docs Update documentation to indicate a fixture can be invoked more than once in it's scope.

Fixes pytest-dev#4064 by correcting the documentation for unit-tests

Fix pytest-dev#3057

Fix pytest-dev#2535

Fix source reindenting by using `textwrap.dedent` directly.

Fix request.fixturenames to return fixtures created dynamically

…ture-msg Improve error message when TestCase functions use a parametrized fixture

…-name-victor-maryama Renamed Victor to full name.

Improve performance of ~3 of the slowest tests

Upgrade pre-commit hooks

…patch-1 Temporarily disable `linting` env in appveyor

Fix formatting for plugin loading in conftest

…sottile-patch-1" This reverts commit c55d641, reversing changes made to 8393fdd.

…ndows re-enable linting tox env on windows

…-features

coveralls · 2018-10-09T23:22:06Z

Coverage increased (+0.02%) to 93.804% when pulling 9a3836a on nicoddemus:merge-master-into-features into b895816 on pytest-dev:features.

codecov · 2018-10-10T00:06:03Z

Codecov Report

Merging #4100 into features will increase coverage by 0.05%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##           features    #4100      +/-   ##
============================================
+ Coverage      94.5%   94.56%   +0.05%     
============================================
  Files           109      109              
  Lines         23967    23940      -27     
  Branches       2375     2363      -12     
============================================
- Hits          22651    22639      -12     
+ Misses         1003      995       -8     
+ Partials        313      306       -7

Flag	Coverage Δ
#doctesting	`29.18% <50%> (ø)`	⬆️
#linux	`94.41% <100%> (+0.05%)`	⬆️
#nobyte	`0% <0%> (ø)`	⬆️
#numpy	`28.08% <54.16%> (-0.01%)`	⬇️
#pexpect	`0% <0%> (ø)`	⬆️
#py27	`92.68% <100%> (+0.05%)`	⬆️
#py34	`92.11% <96%> (+0.04%)`	⬆️
#py35	`92.12% <96%> (+0.04%)`	⬆️
#py36	`92.69% <100%> (+0.05%)`	⬆️
#py37	`92.33% <96%> (+0.04%)`	⬆️
#trial	`31.31% <81.81%> (+0.2%)`	⬆️
#windows	`93.87% <100%> (+0.01%)`	⬆️
#xdist	`18.7% <18.18%> (+0.04%)`	⬆️

Impacted Files	Coverage Δ
src/_pytest/_argcomplete.py	`73.52% <ø> (-0.76%)`	⬇️
testing/test_unittest.py	`99.07% <100%> (+0.01%)`	⬆️
testing/code/test_excinfo.py	`96.74% <100%> (+0.1%)`	⬆️
testing/python/fixture.py	`99.23% <100%> (ø)`	⬆️
testing/logging/test_fixture.py	`100% <100%> (ø)`	⬆️
testing/python/approx.py	`99.61% <100%> (ø)`	⬆️
testing/code/test_source.py	`97.02% <100%> (+0.22%)`	⬆️
src/_pytest/logging.py	`95.76% <100%> (ø)`	⬆️
src/_pytest/fixtures.py	`97.3% <100%> (+0.02%)`	⬆️
testing/test_pytester.py	`87.19% <100%> (ø)`	⬆️
... and 4 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 b895816...9a3836a. Read the comment docs.

beneyal and others added 30 commits October 2, 2018 17:39

Add pytest.freeze_includes to reference

5010e02

Add anchor for "Freezing pytest"

a5269b2

Merge pull request pytest-dev#4067 from beneyal/master

20f93ae

Add pytest.freeze_includes() to reference

Fix source reindenting by using textwrap.dedent directly.

f102ccc

Update documentation on fixture being invoked more than once in a scope.

642847c

Fix wording in fixtures doc.

c5dec60

Merge pull request pytest-dev#4070 from jeffreyrack/4058-update-fixtu…

3f03625

…re-docs Update documentation to indicate a fixture can be invoked more than once in it's scope.

Fixes pytest-dev#4064 by correcting the documentation for unit-tests

f9ac608

Merge pull request pytest-dev#4072 from pecey/tmp/issue-4064

e712adc

Fixes pytest-dev#4064 by correcting the documentation for unit-tests

Remove duplicate test (tested above)

b8b9e8d

Remove (unused) offset= parameter from deindent()

e5ab62b

Fix request.fixturenames to return fixtures created dynamically

70c7273

Fix pytest-dev#3057

Improve error message when TestCase functions use a parametrized fixture

212937e

Fix pytest-dev#2535

Merge pull request pytest-dev#4069 from asottile/deindent_4066

b098292

Fix source reindenting by using `textwrap.dedent` directly.

Merge pull request pytest-dev#4075 from nicoddemus/dynamic-fixturenames

a1208f5

Fix request.fixturenames to return fixtures created dynamically

Merge pull request pytest-dev#4076 from nicoddemus/unittest-param-fix…

6660966

…ture-msg Improve error message when TestCase functions use a parametrized fixture

Renamed Victor to full name.

55871c6

Upgrade pre-commit hooks

1caf6d5

Manual fixups of black formatting

65545d8

Merge pull request pytest-dev#4088 from Sup3rGeo/bugfix/announcements…

689b856

…-name-victor-maryama Renamed Victor to full name.

Improve performance of ~3 of the slowest tests

3901569

Use RuntimeError for py27 + py34 compat

4f63144

Increase recursion limit (broke xdist tests)

a860356

Merge pull request pytest-dev#4090 from asottile/faster_tests

e8c10d4

Improve performance of ~3 of the slowest tests

Merge pull request pytest-dev#4089 from asottile/upgrade_hooks

8393fdd

Upgrade pre-commit hooks

Temporarily disable linting env in appveyor

4ec85f9

Merge pull request pytest-dev#4094 from pytest-dev/asottile/asottile-…

c55d641

…patch-1 Temporarily disable `linting` env in appveyor

Fix formatting for plugin loading in conftest

aaaae0b

Merge pull request pytest-dev#4097 from asottile/improve_doc_plugin_load

b8c30aa

Fix formatting for plugin loading in conftest

Revert "Merge pull request pytest-dev#4094 from pytest-dev/asottile/a…

28a3f0f

…sottile-patch-1" This reverts commit c55d641, reversing changes made to 8393fdd.

asottile and others added 3 commits October 9, 2018 13:01

re-enable linting tox env on windows

11a0721

Merge pull request pytest-dev#4099 from asottile/re-enable_linting_wi…

4b164d9

…ndows re-enable linting tox env on windows

Merge remote-tracking branch 'upstream/master' into merge-master-into…

9a3836a

…-features

asottile approved these changes Oct 10, 2018

View reviewed changes

asottile merged commit 943bbdd into pytest-dev:features Oct 10, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Merge master into features #4100

Merge master into features #4100

Uh oh!

nicoddemus commented Oct 9, 2018

Uh oh!

coveralls commented Oct 9, 2018

Uh oh!

codecov bot commented Oct 10, 2018 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Merge master into features #4100

Merge master into features #4100

Uh oh!

Conversation

nicoddemus commented Oct 9, 2018

Uh oh!

coveralls commented Oct 9, 2018

Uh oh!

codecov bot commented Oct 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Oct 10, 2018 •

edited

Loading