Commit Graph

9226 Commits

Author SHA1 Message Date
Anthony Sottile 664257c7a3 Color the setup ERROR red 2018-11-22 00:20:13 -08:00
Anthony Sottile b3700f61ba Fix formatting of print() calls 2018-11-22 00:15:14 -08:00
Bruno Oliveira 3eaa6d8835
Merge pull request #4433 from 3lnc/doc_explicit_multimarker
Adds note on multiple module marker usage
2018-11-21 20:51:29 -02:00
Bruno Oliveira f1fe9e41ac Mention PR# in the comment for future reference 2018-11-21 20:49:17 -02:00
Bruno Oliveira 4f5c153d29 Fix call to os.path.abspath: the argument might already be a Path instance
There's Path.absolute(), but it is not public, see https://bugs.python.org/issue25012.
2018-11-21 20:46:08 -02:00
Slam ee4f8c98a9 Adds note on multiple module marker usage 2018-11-21 14:37:28 +02:00
Bruno Oliveira f180ab3e69 Use os.path.abspath to get absolute path instead of Path.resolve()
Unfortunately it seems there is a difference in resolve() behavior depending
on the platform
2018-11-20 20:08:01 -02:00
Ronny Pfannschmidt fc61bdd907 fix 4425: resolve --basetemp to absolute paths 2018-11-20 16:14:50 +01:00
Ronny Pfannschmidt 45c33c4e05
Merge pull request #4379 from hoylemd/improve_minversion_again
Use packaging/pkg_resources to check minversion
2018-11-19 21:38:45 +01:00
Michael D. Hoyle 1568e38997 Use pkg_resources.parse_version in minver check
Use pkg_resources.parse_version in minver check

Add meself to AUTHORS & changelog

Format CHANGELOG
2018-11-19 11:25:27 -05:00
Anthony Sottile a281d6620b
Merge pull request #4417 from blueyed/tox-mock
tox.ini: remove additionally missed mock deps
2018-11-18 12:06:59 -08:00
Daniel Hahler c56cc93cbd tox.ini: remove additionally missed mock deps
Ref: https://github.com/pytest-dev/pytest/pull/4415#discussion_r234452144
2018-11-18 19:37:04 +01:00
Daniel Hahler cdbe2299ec
Merge pull request #4409 from blueyed/str
Add Testdir.__str__ to return str(self.tmpdir)
2018-11-18 12:52:31 +01:00
Ronny Pfannschmidt 5c24430555
Merge pull request #4415 from blueyed/extras-testing
setup.py: add "testing" extra requirement
2018-11-18 12:16:06 +01:00
Daniel Hahler e46f995cc7 setup.py: add "testing" extra requirement
Use this in tox to stream-line base testing requirements.

Closes https://github.com/pytest-dev/pytest/issues/4410.
2018-11-18 08:55:17 +01:00
Anthony Sottile 10cdae8e38
Merge pull request #4414 from asottile/starred_with_side_effect
Fix assertion rewriting involving Starred + side-effects
2018-11-17 16:17:24 -08:00
Daniel Hahler 5fab0ca312
Merge pull request #4403 from RonnyPfannschmidt/fix-4400
Fix #4400 - rearrange the handling of yield test warnings/errors
2018-11-18 00:57:44 +01:00
Daniel Hahler 7f990e2b9a
Merge pull request #4408 from blueyed/default-invalid-escape-sequence
tox.ini: do not cause SyntaxWarning with py37  [ci skip]
2018-11-17 20:08:37 +01:00
Anthony Sottile 690a63b921 Fix assertion rewriting involving Starred + side-effects 2018-11-17 10:42:51 -08:00
Daniel Hahler 4c9cde74ab
Merge pull request #4411 from blueyed/fix-testpaths-with-pyargs
Fix collection of testpaths with `--pyargs`.
2018-11-17 17:20:29 +01:00
Ronny Pfannschmidt 94e5bdd4e0
Merge pull request #4413 from blueyed/tox-posargs
tox: fix/improve posargs with pexpect factor(s)  [ci skip]
2018-11-17 17:18:31 +01:00
Daniel Hahler cb1d4044e6 tox: fix/improve posargs with pexpect factor(s) [ci skip] 2018-11-17 15:35:40 +01:00
Daniel Hahler a252e81ced Fix collection of testpaths with `--pyargs`
Fixes https://github.com/pytest-dev/pytest/issues/4405.
2018-11-17 13:28:10 +01:00
Daniel Hahler 3acfa3abdc Add Testdir.__str__ to return str(self.tmpdir)
I just expected this with `monkeypatch.setenv("PYTHONPATH", str(testdir))`,
wondering why it was not picked up correctly.
`
2018-11-17 13:18:54 +01:00
Daniel Hahler 084c36d538 tox.ini: do not cause SyntaxWarning with py37 [ci skip]
Do not cause a SyntaxError for something like:

> DeprecationWarning: invalid escape sequence \w

This was happening via pdb++ when it imported pygments (and that had no
compiled .pyc file).
2018-11-17 11:53:15 +01:00
Ronny Pfannschmidt 950d30e6e0 fix #4400 - rearrange the handling of yield test warnings/errors 2018-11-16 13:49:46 +01:00
Daniel Hahler 0385c27343 cacheprovider: do not write README/.gitignore to existing dir
Fixes https://github.com/pytest-dev/pytest/issues/4393.
2018-11-14 22:09:09 +01:00
Bruno Oliveira 9dec146edf
Merge pull request #4388 from nicoddemus/release-4.0.0
Release 4.0.0
2018-11-14 15:11:09 -02:00
Bruno Oliveira c2d6b3524c Preparing release version 4.0.0 2018-11-13 21:01:51 +00:00
Bruno Oliveira e025974cbd Merge remote-tracking branch 'upstream/master' into release-4.0.0 2018-11-13 20:58:24 +00:00
Bruno Oliveira fea09cda6c
Merge pull request #4383 from nicoddemus/merge-master-into-features
Merge master into features (about to prepare 4.0)
2018-11-13 18:57:41 -02:00
Daniel Hahler b7863a5f48
Merge pull request #4381 from blueyed/callinfo-repr
Fix CallInfo.__repr__ for unfinished call
2018-11-13 18:13:58 +01:00
Daniel Hahler a72eff5a08
Merge pull request #4382 from blueyed/pytester-pop-TOX_ENV_DIR
pytester: pop TOX_ENV_DIR from os.environ
2018-11-13 12:42:51 +01:00
Daniel Hahler 46c8363e12
Merge pull request #4380 from blueyed/improve-ci
Travis: move faster builds to baseline
2018-11-13 12:40:26 +01:00
Bruno Oliveira 557cb6cffe Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-13 09:01:37 -02:00
Bruno Oliveira 8198e7cd33
Merge pull request #4349 from nicoddemus/pytest4-warnings-as-errors
Change RemovedInPytest4Warnings to errors by default
2018-11-13 08:31:47 -02:00
Daniel Hahler a6a96469ca pytester: pop TOX_ENV_DIR from os.environ
Closes: https://github.com/pytest-dev/pytest/pull/4378
Fixes: https://github.com/pytest-dev/pytest/issues/4366
2018-11-13 09:02:52 +01:00
Daniel Hahler 27dab4e05f Fix CallInfo.__repr__ for unfinished call
Fixes https://github.com/pytest-dev/pytest/issues/3554
Ref: https://github.com/pytest-dev/pytest/pull/3560
Ref: https://github.com/pytest-dev/pytest/pull/3562
2018-11-13 08:51:43 +01:00
Daniel Hahler 3e05848ab9 AppVeyor: run py{27,37}-xdist first 2018-11-13 01:33:05 +01:00
Daniel Hahler 5902e5a2ce Travis: move faster builds to baseline
- use py27-pexpect,py27-trial,py27-numpy and py37-xdist in baseline,
  using pexpect there catches errors with pdb tests early, and
  py37-xdist is much faster than py37.
- move py34 and py36 out of baseline.
2018-11-13 01:26:22 +01:00
Bruno Oliveira 243d898b38
Merge pull request #4373 from blueyed/py37-by-default
CI: use py37 instead of py36 by default
2018-11-12 20:56:10 -02:00
Bruno Oliveira f8f22d29ee Use a custom cache directory for test_stepwise tests
Otherwise the tests will use tox's env cache which makes them flaky
2018-11-12 16:57:39 -02:00
Bruno Oliveira dc20dedbc7 Change RemovedInPytest4Warnings to errors by default
To keep existing tests which emit RemovedInPytest4Warnings running, decided
to go with a command line option because:

* Is harder to integrate an ini option with tests which already use an ini file
* It also marks tests which need to be removed/updated in 4.1, when
  RemovedInPytest4Warning and related functionality are removed.

Fix #3737
2018-11-12 16:10:57 -02:00
Bruno Oliveira 3cec1482eb
Merge branch 'master' into py37-by-default 2018-11-12 14:03:59 -02:00
Bruno Oliveira 0df5ce4082 Fix basepython for linting testenv in tox.ini 2018-11-12 14:03:04 -02:00
Bruno Oliveira 93a9836962
Merge pull request #4374 from blueyed/doctesting
CI: doctesting uses coverage, fiy py37 on AppVeyor
2018-11-12 13:57:58 -02:00
Daniel Hahler 935b106213 CI: use py37 instead of py36 by default
Closes https://github.com/pytest-dev/pytest/issues/4370.
2018-11-12 03:16:52 +01:00
Daniel Hahler 74366426b9 Travis: use last TOXENV for PATH 2018-11-11 22:08:45 +01:00
Daniel Hahler 9628242423 CI: doctesting uses coverage, fiy py37 on AppVeyor 2018-11-11 21:49:59 +01:00
Bruno Oliveira 9af613bef2
Merge pull request #4372 from nicoddemus/release-3.10.1
Release version 3.10.1
2018-11-11 15:35:21 -02:00