Merge code from releases via tarballs#8
Conversation
blueyed
commented
Apr 3, 2019
- imported them based on the last commit on bitbucket (https://bitbucket.org/pytest-dev/regendoc/commits/5552b72bd7b98a3a5164c979e3f121d420ab35e1)
- then merged master into it, resolving conflicts
Conflicts: regendoc/__init__.py regendoc/actions.py test_regendoc.py tox.ini
|
Awesome, thanks a lot! 👍 |
|
@nicoddemus Cannot merge myself, but probably @RonnyPfannschmidt should take a quick look at least. |
|
Also here again a clear disadvantage of not having coverage reports - I've only checked that tests are passing. And another sidenote: the formatting changes were really demotivating here also (unnecessary merge conflicts). |
|
thanks for wading trough this minefield, i believe the merge pain could have been avoided in part by using black and/or a more compatible merge |
It wasn't too bad in my second attempt, and mainly due to renaming variables also. Thanks for merging! |
Anthony Sottile (3):
blacken-docs more code samples in docs
pre-commit autoupdate
Produce a warning when unknown arguments are passed to pytest.param()
Bruno Oliveira (1):
Preparing release version 4.4.1
Daniel Hahler (12):
pytester: use monkeypatch with Testdir
doc: make regen: replace trailing spaces already
doc/en/Makefile: allow passing in REGENDOC_FILES
tox.ini: regen: clear pytest cache for stable outcome
doc/en/Makefile: stabilize output between regendoc versions
Update via pytest-dev/regendoc#8
pdb: try to import --pdbcls in pytest_configure only
Fix test_conftest when run via pytest-randomly
tests: harden test_immediate_initialiation_and_incremental_are_the_same
Add _sys_snapshot fixture and use it with more tests
docs: tbreportdemo: remove obsolete comment
monkeypatch.syspath_prepend: invalidate import cache