Commit Graph

9779 Commits

Author SHA1 Message Date
Grygorii Iermolenko 5cf58a9ae9 Revert '$' changes to not trigger regendoc 2019-02-15 14:09:37 +02:00
Daniel Hahler 2106515f6d
Merge pull request #4796 from cclauss/patch-1
Travis CI: The 'sudo' tag is now deprecated
2019-02-14 18:06:40 +01:00
Anthony Sottile 66b4709830
Merge pull request #4798 from nicoddemus/remove-message-docs
Remove 'message' parameter docs from assert.rst
2019-02-14 09:37:22 -05:00
Daniel Hahler 0b1f813c38
Merge pull request #4784 from blueyed/fix-4782
collect: python: fix `AssertionError` with broken symlinks
2019-02-14 15:10:14 +01:00
Bruno Oliveira 0b6960446e
Merge pull request #4795 from ramatevish/update-attr-kwarg
Update kwarg for attr.ib to use 'converter' as 'convert' is due to be deprecated.
2019-02-14 08:37:34 -02:00
Bruno Oliveira 4bc2f96c93 Remove 'message' parameter docs from assert.rst
As per:

	https://github.com/pytest-dev/pytest/issues/3974#issuecomment-463462732

Also made the 'match' parameter more prominent
2019-02-14 08:32:49 -02:00
cclauss 0e4750d837
Travis CI: The 'sudo' tag is now deprecated
[Travis are now recommending removing the __sudo__ tag](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration).
2019-02-14 09:40:00 +01:00
R. Alex Matevish 40cec637d7 Update kwarg for attr.ib to use 'converter' as 'convert' is due to be deprecated 2019-02-14 00:03:41 -08:00
Daniel Hahler 407d4a0cf0 collect: python: fix `AssertionError` with broken symlinks
Fixes https://github.com/pytest-dev/pytest/issues/4782.
2019-02-14 00:18:14 +01:00
Daniel Hahler c84ae0bb7a
Merge pull request #4789 from blueyed/travis-pluggymaster-cron
Travis: add cron_only stage for py38-dev
2019-02-13 22:03:41 +01:00
Daniel Hahler 1dbf440194
Merge pull request #4785 from blueyed/merge-master-into-features
Merge master into features
2019-02-13 20:23:24 +01:00
Daniel Hahler afaaa7e411 Travis: test py38-dev only with cron builds
The master and features branches are tested daily.
2019-02-13 19:02:02 +01:00
Daniel Hahler 7b91952645 Merge master into features
Conflicts:
	tox.ini
2019-02-13 17:58:16 +01:00
Grygorii Iermolenko 799bcccd1b Fix sphinx code-block types (syntax highlighting) in two docs 2019-02-13 17:08:49 +02:00
Bruno Oliveira 8726be27a6
Merge pull request #4779 from pytest-dev/azure-pipelines
Set up CI with Azure Pipelines [skip travis] [skip appveyor]
2019-02-13 08:39:32 -02:00
Bruno Oliveira e26c5bda6e
Merge pull request #4776 from nicoddemus/release-4.2.1
Preparing release version 4.2.1
2019-02-13 08:39:24 -02:00
Anthony Sottile f672b7e39e
Merge pull request #4773 from nicoddemus/remove-py27-py34-deprecation-warning
Remove py27 py34 deprecation warning
2019-02-12 21:42:07 -05:00
Anthony Sottile f0e6bf7604
Merge pull request #4775 from asottile/stdlib
Replace flatten() with chain.from_iterable
2019-02-12 21:37:05 -05:00
Bruno Oliveira f729d5d4ee Remove --color=yes from PYTEST_ADDOPTS [skip travis] [skip appveyor]
Does not work on Azure Pipelines at all unfortunately
2019-02-12 20:34:51 -02:00
Bruno Oliveira 04a941c818 Pass PYTEST_ADDOPTS to tox envs [skip travis] [skip appveyor] 2019-02-12 20:31:29 -02:00
Bruno Oliveira 215d537624 Set junitxml and colors using PYTEST_ADDOPTS [skip travis] [skip appveyor] 2019-02-12 20:24:32 -02:00
Bruno Oliveira f63fbf8114
Merge pull request #4767 from blueyed/appveyor-xdist
AppVeyor: use xdist for py?? envs, drop py27/py37
2019-02-12 20:04:45 -02:00
Bruno Oliveira b595587031 Set up CI with Azure Pipelines [skip travis] [skip appveyor]
Just a few environments for now to see how it will behave for a few days
2019-02-12 20:01:13 -02:00
Bruno Oliveira 82cc3d8cc2 Preparing release version 4.2.1 2019-02-12 20:17:06 +00:00
Bruno Oliveira e20e376881
Merge pull request #4347 from blueyed/pdb-recursive-capture
pdbpp: fix capturing with recursive debugging
2019-02-12 16:53:14 -02:00
Bruno Oliveira 8052d01a37
Merge pull request #4774 from sambrightman/pin-more_itertools
Constrain more_itertools for Python 2.7 compatibility
2019-02-12 16:48:51 -02:00
Bruno Oliveira d03444db4a
Merge pull request #4651 from blueyed/help-with-argumenterror
Display --help/--version with ArgumentErrors
2019-02-12 16:01:49 -02:00
Anthony Sottile f9c1329dab Replace flatten() with chain.from_iterable
flatten is an alias in more-itertools anyway
2019-02-12 06:30:00 -08:00
Sam Brightman a8003286b5 Add CHANGELOG entry for #4770 2019-02-12 13:32:06 +00:00
Daniel Hahler 747a8ae3a6 AppVeyor: use xdist for py?? envs, drop py27/py37 2019-02-12 14:26:57 +01:00
Bruno Oliveira b759ebdb93 Add CHANGELOG entry for #4698 2019-02-12 10:39:58 -02:00
Bruno Oliveira b41632e9a8 Revert "Show deprecation message when running under Python 2.7 and 3.4"
This reverts commit eb92e57509.
2019-02-12 10:39:25 -02:00
Sam Brightman b4be228330 Constrain more_itertools for Python 2.7 compatibility
Fixes #4772, #4770.
2019-02-12 11:53:23 +00:00
Daniel Hahler 31c948184a
Merge pull request #4753 from blueyed/tox-xdist
tox: add generic xdist factor
2019-02-11 23:36:59 +01:00
Bruno Oliveira 67dd10de26
Merge pull request #4763 from blueyed/lsof
--lsof: suppress stderr
2019-02-11 13:18:40 -02:00
Daniel Hahler f13935da53 Display --help/--version with ArgumentErrors 2019-02-11 15:49:48 +01:00
Daniel Hahler dc8af18a0e
Merge pull request #4745 from blueyed/test_collect_pkg_init_and_file_in_args
Fix handling of pkg init and test file via args
2019-02-11 15:11:40 +01:00
Daniel Hahler 7bee359459 tox: add generic xdist factor 2019-02-11 15:09:07 +01:00
Daniel Hahler 61b9246afe Fix/improve handling of pkg init and test file via args
Ref: https://github.com/pytest-dev/pytest/issues/4344#issuecomment-441095934
2019-02-11 15:04:24 +01:00
Daniel Hahler 9feb4941f4 pdb: fix capturing with recursive debugging and pdb++
While I think that pdb++ should be fixed in this regard (by using
`pdb.Pdb`, and not `self.__class__` maybe), this ensures that custom
debuggers like this are working.
2019-02-11 14:52:20 +01:00
Daniel Hahler 237f690f8b --lsof: suppress stderr
This can spam a lot of warnings (per invocation), e.g.:

> lsof: WARNING: can't stat() nsfs file system /run/docker/netns/default
        Output information may be incomplete.

Or from Travis/MacOS:

> lsof: WARNING: can't stat() vmhgfs file system /Volumes/VMware Shared Folders
>       Output information may be incomplete.
>       assuming "dev=31000003" from mount table
2019-02-11 14:08:44 +01:00
Ronny Pfannschmidt 386e801a5a
Merge pull request #4762 from blueyed/pluggymaster
tox: use deps for pluggymaster testenvs
2019-02-11 05:30:30 +01:00
Bruno Oliveira 5cf05ce149
Merge pull request #4764 from kevinjfoley/doc-assert-clarify
Clarify pytest_assertrepr_compare docs per #4759
2019-02-10 17:26:50 -02:00
Kevin J. Foley aee67bb1a7 Clarify pytest_assertrepr_compare docs per #4759 2019-02-10 08:34:35 -05:00
Daniel Hahler 5e2d740829 tox: cleanup/revisit deps 2019-02-10 14:02:56 +01:00
Daniel Hahler 82b8ec37fc Bump tox minversion
For c611a16afe
2019-02-10 13:57:49 +01:00
Daniel Hahler f73fa47b1f Use coverage with pluggymaster 2019-02-10 13:54:58 +01:00
Daniel Hahler fd1684e70b tox: use deps for pluggymaster testenvs
https://github.com/tox-dev/tox/issues/706 has been fixed.
2019-02-10 13:53:49 +01:00
Anthony Sottile 19501028ca
Merge pull request #4743 from nicoddemus/junit-ref
Document junit_family option in the reference docs
2019-02-09 08:02:55 -08:00
Daniel Hahler ed01dc6567
Merge pull request #4652 from blueyed/RunResult-repr
Add __repr__ for RunResult
2019-02-09 01:26:24 +01:00