Merge master into features - #6201

Merged

asottile merged 24 commits into

pytest-dev:featuresfrom

asottile:mm

Nov 17, 2019

Commits on Oct 20, 2019

fix bug with nonskipped first test in package

Daniil Galiev
authored and
blueyed
committed
9275012
disable _ALLOW_MARKERS in module __init__.py

Daniil Galiev
authored and
blueyed
committed
b94eb4c
refactor disabling markers

Daniil Galiev
authored and
blueyed
committed
5cefcb2

Commits on Nov 6, 2019

fix bug with nonskipped first test in package (#5831)
nicoddemus
authored
85288b5

Commits on Nov 8, 2019

setup.cfg: fix check-manifest ignore [ci skip]
blueyed
committed
41604ee

Commits on Nov 12, 2019

Commits on Nov 13, 2019

Commits on Nov 14, 2019

Update text in PR template
hugovk
committed
350c27c
Make whole checklist a comment to avoid incomplete TODOs in PRs
hugovk
committed
48ec7d2
Preparing release version 5.2.3
Bruno Oliveira
committed
5e8c47f
Update advice about _called_from_test.
shields-fn
committed
bd68c2a
Update advice about _called_from_test. (#6168)
nicoddemus
authored
e2a0987
Update text in PR template (#6188)
blueyed
authored
d4e4ab5
Adjust CHANGELOG
nicoddemus
committed
dd9a27c
Preparing release version 5.2.3 (#6190)
nicoddemus
authored
e856638

Commits on Nov 15, 2019

Revert "fix bug with nonskipped first test in package (#5831)"
asottile
committed
176c777
Add regression tests for __init__.py breakage
asottile
committed
4e0f992
Merge pull request #6197 from asottile/fix_init_py_discovery
asottile
authored
19a15a9
Preparing release version 5.2.4
asottile
committed
c9a96cd
Merge pull request #6198 from asottile/release-5.2.4
asottile
authored
3a668ea
Merge remote-tracking branch 'origin/master' into mm
asottile
committed
cc78444