Skip to content

Merge master into features (with regen)#5042

Merged
nicoddemus merged 11 commits into
pytest-dev:featuresfrom
blueyed:merge-regen-master-into-features
Apr 4, 2019
Merged

Merge master into features (with regen)#5042
nicoddemus merged 11 commits into
pytest-dev:featuresfrom
blueyed:merge-regen-master-into-features

Conversation

@blueyed

@blueyed blueyed commented Apr 3, 2019

Copy link
Copy Markdown
Contributor

Includes #5037.

nicoddemus and others added 11 commits March 29, 2019 20:49
@nicoddemus
Preparing release version 4.4.0
8881b20
@blueyed @nicoddemus
Update CHANGELOG.rst
4621638 
Co-Authored-By: nicoddemus <nicoddemus@gmail.com>
@nicoddemus
Merge pull request pytest-dev#5014 from nicoddemus/release-4.4.0
49d690d 
Release 4.4.0
@blueyed
pytester: use monkeypatch with Testdir
d915275
@nicoddemus
Merge pull request pytest-dev#5031 from blueyed/pytester-addopts
46df1d5 
pytester: use monkeypatch with Testdir
@blueyed
doc: make regen: replace trailing spaces already
266bf2c
@blueyed
doc/en/Makefile: allow passing in REGENDOC_FILES
cec2dd6 
This allows for:

> make -C doc/en regen REGENDOC_FILES=example/parametrize.rst
@blueyed
tox.ini: regen: clear pytest cache for stable outcome
e8eaebe
@blueyed
doc/en/Makefile: stabilize output between regendoc versions
5935fba
@blueyed
Update via pytest-dev/regendoc#8
befc8a3
@blueyed
Merge master into features (with regen branch)
8907fed
@blueyed blueyed mentioned this pull request Apr 3, 2019
Merged
@codecov

codecov Bot commented Apr 3, 2019 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #5042 into features will increase coverage by 0.98%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #5042      +/-   ##
============================================
+ Coverage      94.9%   95.89%   +0.98%     
============================================
  Files           114      114              
  Lines         25770    26449     +679     
  Branches       2552     2693     +141     
============================================
+ Hits          24458    25364     +906     
+ Misses          991      774     -217     
+ Partials        321      311      -10
Impacted Files Coverage Δ
testing/test_pytester.py 88.29% <100%> (+0.26%) ⬆️
src/_pytest/pytester.py 91.17% <100%> (+5.52%) ⬆️
src/_pytest/debugging.py 82.25% <0%> (-6.33%) ⬇️
testing/test_pdb.py 91.33% <0%> (-4.64%) ⬇️
testing/python/fixtures.py 99.08% <0%> (+0.11%) ⬆️
src/_pytest/python.py 93.3% <0%> (+0.24%) ⬆️
src/_pytest/config/__init__.py 94.43% <0%> (+0.31%) ⬆️
testing/test_config.py 99.48% <0%> (+0.51%) ⬆️
src/_pytest/assertion/rewrite.py 95.47% <0%> (+0.96%) ⬆️
src/_pytest/nodes.py 95.58% <0%> (+0.98%) ⬆️
... and 23 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 0d4636b...8907fed. Read the comment docs.

@blueyed blueyed requested a review from nicoddemus April 3, 2019 21:51
nicoddemus
nicoddemus requested changes Apr 3, 2019
View reviewed changes

@nicoddemus nicoddemus left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right, a lot of commits from features are targeting master.

Shouldn't we fix regen on master, then simply merge master into features as usual?

@blueyed

blueyed commented Apr 3, 2019

Copy link
Copy Markdown
Contributor Author

@nicoddemus
You are right: we should merge #5037 also (re-opened).
It is included here already.

@nicoddemus

nicoddemus commented Apr 3, 2019

Copy link
Copy Markdown
Member

Should we close this then?

@blueyed

blueyed commented Apr 4, 2019

Copy link
Copy Markdown
Contributor Author

No, we can merge it now also.

@blueyed blueyed requested a review from nicoddemus April 4, 2019 11:37
@blueyed blueyed changed the base branch from master to features April 4, 2019 11:38
@blueyed

blueyed commented Apr 4, 2019

Copy link
Copy Markdown
Contributor Author

Oh, I got the base branch wrong.. :)

@blueyed

blueyed commented Apr 4, 2019

Copy link
Copy Markdown
Contributor Author

The version issue is not so minor anymore.. ;)

pluggy.manager.PluginValidationError: Plugin 'xdist' could not be loaded: (pytest 4.3.2.dev225+gebe8169 (/home/travis/build/pytest-dev/pytest/.tox/py36-xdist/lib/python3.6/site-packages), Requirement.parse('pytest>=4.4.0'))!

(from another PR against features)

@nicoddemus nicoddemus merged commit e04936f into pytest-dev:features Apr 4, 2019
@nicoddemus

nicoddemus commented Apr 4, 2019

Copy link
Copy Markdown
Member

The version issue is not so minor anymore.. ;)

Indeed. Should be fixed now though. 👍

@blueyed blueyed deleted the merge-regen-master-into-features branch April 4, 2019 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nicoddemus nicoddemus nicoddemus approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@blueyed @nicoddemus