Commit Graph

10479 Commits

Author SHA1 Message Date
Bruno Oliveira 0f4905a259 Simplify 'obj' property definition in PyobjMixin
This uses modern property definition syntax, declaring both getter
and setter as obj() functions
2019-03-07 08:15:04 -03:00
Bruno Oliveira 936f725b81
Merge pull request #4890 from blueyed/dead
pytester: remove unused anypython fixture
2019-03-06 14:35:23 -03:00
Daniel Hahler c86d2daf81 pytester: remove unused anypython fixture
This became unused after ab9f6a75 (in 2009).
2019-03-06 17:42:21 +01:00
Daniel Hahler a70c1ca100 ci: Travis: disable cache by default, only for pre-commit
For pip the usual http caching should be good enough.
This keeps the cache for pre-commit with the linting env for now.

Ref: https://github.com/pytest-dev/pytest/issues/3502
2019-03-05 23:12:11 +01:00
Daniel Hahler 4668ee03f6
Merge pull request #4887 from blueyed/merge-master-into-features
Merge master into features
2019-03-05 23:05:55 +01:00
Daniel Hahler 236bada755
Merge pull request #4768 from horta/avoid-pkg_resources
Avoid pkg_resources import at the top-level.
2019-03-05 23:02:02 +01:00
Daniel Hahler 76687030f0 Merge branch 'master' into merge-master-into-features
Conflicts:
	appveyor.yml
	setup.py
2019-03-05 19:07:36 +01:00
Daniel Hahler 2b3d69da2b
Merge pull request #4865 from blueyed/revisit-cov-new
ci: revisit coverage reporting
2019-03-05 19:05:36 +01:00
Daniel Hahler 8481e438bd ci: revisit coverage reporting
This brings coverage back that got missing with 9dcd6f2.

Continuation of #4839 / #4846.
2019-03-05 13:34:46 +01:00
Daniel Hahler bd2c9bedcf
Merge pull request #4885 from blueyed/fix-master
Fix master: ci: Azure: remove pypy3
2019-03-04 19:32:38 +01:00
Daniel Hahler 2fe922608f
Merge pull request #4883 from blueyed/fix-coverage-includes
.coveragerc: fix include for pypy
2019-03-04 19:31:14 +01:00
Daniel Hahler 07fa69335c ci: Azure: remove pypy3
It was enabled accidentally.
2019-03-04 18:16:20 +01:00
Daniel Hahler ddb16a1ab1
Merge pull request #4874 from blueyed/pypy3-azure
ci: azure: fix coverage reporting with PyPy (not used currently)
2019-03-04 17:58:28 +01:00
Daniel Hahler 2e871f35f3 ci: Azure: clarify name for coverage job 2019-03-04 17:51:25 +01:00
Daniel Hahler fa94e3c1b2 ci: Azure: fix coverage generation with PyPy
While this is not used currently, it is still good for having it covered
(it failed when running coverage with all jobs unconditionally).
2019-03-04 17:46:01 +01:00
Daniel Hahler c6eb3413f3 .coveragerc: fix include for pypy
PyPy uses "site-packages" directly.
2019-03-04 17:40:05 +01:00
Daniel Hahler 54c70bc02c
Merge pull request #4878 from blueyed/fix-test_crash_on_closing_tmpfile_py27
tests: make test_crash_on_closing_tmpfile_py27 more reliable
2019-03-04 16:22:14 +01:00
Daniel Hahler 83558a0ba3 tests: make test_crash_on_closing_tmpfile_py27 more reliable
It fails reliable for me now without the fix from 9517c3a2a.

Ref: #2370
2019-03-04 15:04:55 +01:00
Bruno Oliveira 23ea04f910
Merge pull request #4860 from nicoddemus/getfixturevalue-cleanup-1895
getfixturevalue does not correctly declare dependency with the calling fixture
2019-03-03 15:56:45 -03:00
Daniel Hahler c334adc78f
Apply suggestions from code review
Co-Authored-By: nicoddemus <nicoddemus@gmail.com>
2019-03-03 11:20:00 -03:00
Bruno Oliveira f3f6cb2093
Merge pull request #4877 from blueyed/pluggymaster
tox: generic pluggymaster factor, remove env hack
2019-03-03 09:52:54 -03:00
Daniel Hahler c4aa57bc4c tox/setup.py: remove _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 hack 2019-03-03 13:15:13 +01:00
Daniel Hahler 2970c1df24 tox: generic pluggymaster factor 2019-03-03 13:12:44 +01:00
Bruno Oliveira 35c85f0db9
Merge pull request #4876 from nicoddemus/show-testpaths-in-header-4875
Show testpaths option in the header if it has been used for collection
2019-03-02 13:01:50 -03:00
Bruno Oliveira 0deb7b1696 Do not show "inifile:" string if there's no configuration file 2019-03-02 11:45:08 -03:00
Bruno Oliveira 53b8aa065c Show testpaths option in the header if it has been used for collection
Fix #4875
2019-03-02 11:35:32 -03:00
Bruno Oliveira 6a2d122a50 Remove code debugging leftovers 2019-03-02 09:56:15 -03:00
Bruno Oliveira d97473e551 Add test and CHANGELOG for #1895 2019-03-02 09:39:30 -03:00
Bruno Oliveira 525639eaa0 Rename fixtures testing file to be consistent with the module name 2019-03-02 09:37:30 -03:00
Bruno Oliveira 7dceabfcb2 Ensure fixtures obtained with getfixturevalue() are finalized in the correct order
Fix #1895
2019-03-02 09:36:16 -03:00
Daniel Hahler e1f97e41e3
Merge pull request #4872 from blueyed/_ensure_supporting_files
cacheprovider: _ensure_supporting_files: remove unused branches
2019-03-02 02:35:07 +01:00
Daniel Hahler 2d2f6cd4fd cacheprovider: _ensure_supporting_files: remove unused branches
It is only called with empty/new dirs since 0385c273.
2019-03-01 22:51:45 +01:00
Bruno Oliveira 44c940765b
Merge pull request #4868 from blueyed/pytester-unset-PYTEST_ADDOPTS
pytester: unset PYTEST_ADDOPTS
2019-03-01 18:48:36 -03:00
Daniel Hahler ed68fcf665
Merge pull request #4867 from blueyed/fix-cov
.coveragerc: use globs with includes
2019-03-01 21:35:20 +01:00
Bruno Oliveira 907e9495a2
Merge pull request #4869 from nicoddemus/tmppath-docs
Add missing ref docs to tmp_path and tmp_path_factory
2019-03-01 17:22:14 -03:00
Bruno Oliveira dac164cc99 Add missing ref docs to tmp_path and tmp_path_factory 2019-03-01 17:09:07 -03:00
Daniel Hahler 4290cacb86
Merge pull request #4864 from blueyed/isort-cfg
Add config for isort
2019-03-01 18:44:56 +01:00
Daniel Hahler db5cc35b44 pytester: unset PYTEST_ADDOPTS 2019-03-01 18:43:17 +01:00
Daniel Hahler 90031edde8
Merge pull request #4847 from blueyed/tox-posargs-lsof
tox: split default posargs, use --lsof with single job only
2019-03-01 18:41:29 +01:00
Daniel Hahler a96907a9db .coveragerc: use globs with includes
Apparently this caused missing coverage with pdb/pexpect tests.
2019-03-01 18:26:30 +01:00
Daniel Hahler f8160f7bc5 ci: Travis: run py37-lsof-numpy-xdist with coverage 2019-03-01 16:59:56 +01:00
Daniel Hahler f0d7773ffa tox: split default posargs in multiple env vars
This is required for combining.

Use it for new lsof facor also.
2019-03-01 16:49:51 +01:00
Bruno Oliveira 84555c89de
Merge pull request #4855 from blueyed/pdbcls-attr
--pdbcls: improve validation, and allow for "mod:attr.class"
2019-03-01 12:20:29 -03:00
Daniel Hahler f7a3e001f7 pdb: allow for --pdbclass=mod:attr.class 2019-03-01 15:20:04 +01:00
Daniel Hahler 42561db1ae
Merge pull request #4863 from blueyed/remove-import
Move import of  _format_explanation in _pytest.assertion.rewrite
2019-03-01 15:13:26 +01:00
Daniel Hahler 0d31e852b1 Run isort 2019-03-01 14:24:18 +01:00
Daniel Hahler 75e1fde668 tox.ini: add config for isort 2019-03-01 14:24:18 +01:00
Daniel Hahler 9cb71af9e5 _pytest.assertion.rewrite: move _format_explanation import 2019-03-01 14:13:28 +01:00
Bruno Oliveira 0dd4cb0f8f
Merge pull request #4862 from blueyed/encodedfile-write-typerror
Validate type with writing to captured output like without
2019-03-01 10:12:58 -03:00
Bruno Oliveira 33db5e081d
Tweak changelog 2019-03-01 10:09:29 -03:00