jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,925 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

8925 Commits

Author SHA1 Message Date
Bruno Oliveira 4a69104af3
Merge pull request #4232 from blueyed/fix-doc-caplog 
doc: fix caplog: s/methods/properties/
 2018-10-24 19:27:30 -03:00
Daniel Hahler 2cf4c67e45 doc: fix caplog: s/methods/properties/ 2018-10-24 23:57:11 +02:00
Daniel Hahler 15278aacb9
Merge pull request #4231 from blueyed/fix-master 
Fix flake8: os imported, but unused
 2018-10-24 23:47:46 +02:00
Daniel Hahler 57caa4e25e Fix flake8: os imported, but unused 
Likely due to b6fa4e24.
 2018-10-24 23:43:41 +02:00
Bruno Oliveira b6fa4e248f
Merge pull request #4028 from asottile/revert_breakpoint_code 
Revert patching of breakpointhook as it appears to do nothing
 2018-10-24 17:50:19 -03:00
Daniel Hahler 9df1b037d6
Merge pull request #4217 from nicoddemus/fix-macos-py37-travis 
Fix MacOS py37 on Travis
 2018-10-24 17:51:49 +02:00
Bruno Oliveira 28dbffdaf2 Attempt to fix macosx build setup 
This has been failing as of 2018-10-23 while installing gcc with
this message:

	==> Installing numpy dependency: gcc
	==> Downloading https://homebrew.bintray.com/bottles/gcc-8.2.0.high_sierra.bottl
	######################################################################## 100.0%
	==> Pouring gcc-8.2.0.high_sierra.bottle.1.tar.gz
	Error: The `brew link` step did not complete successfully
	The formula built, but is not symlinked into /usr/local
	Could not symlink include/c++
	Target /usr/local/include/c++
	already exists. You may want to remove it:
	  rm '/usr/local/include/c++'
	To force the link and overwrite all conflicting files:
	  brew link --overwrite gcc
	To list all files that would be deleted:
	  brew link --overwrite --dry-run gcc
	Possible conflicting files are:
	/usr/local/include/c++ -> /usr/local/Caskroom/oclint/0.13.1,17.4.0/oclint-0.13.1/include/c++
 2018-10-24 12:46:45 -03:00
Bruno Oliveira 8bced7415c
Merge pull request #4220 from anpr/doc_raise_on_empty_parameterset 
Add `empty_parameter_set_mark` ini option documentation to the parametrize doc
 2018-10-23 19:10:44 -03:00
Bruno Oliveira 72d98a7c52
Merge pull request #4214 from blueyed/fix-4174 
Fix "Plugin already registered" error with symlinks
 2018-10-23 17:10:15 -03:00
Andreas Profous 0dd85157ea Add reference to ``empty_parameter_set_mark`` parametrize doc 2018-10-23 22:03:05 +02:00
Daniel Hahler fadac0ffc0 Fix "Plugin already registered" error with symlinks 
Fixes https://github.com/pytest-dev/pytest/issues/4174.
 2018-10-23 10:15:23 +02:00
Anthony Sottile 799b72cf6f
Merge pull request #4213 from asottile/flake8_master_fixes 
Fixes for flake8 master
 2018-10-22 20:08:38 -07:00
Bruno Oliveira fc0f89ac14
Merge pull request #4215 from nicoddemus/release-3.9.2 
Release version 3.9.2
 2018-10-22 22:08:16 -03:00
Bruno Oliveira 771e860011 Preparing release version 3.9.2 2018-10-22 21:47:42 +00:00
Anthony Sottile cb39bd0651 Fixes for flake8 master 2018-10-22 08:50:00 -07:00
Anthony Sottile c94b2b227e
Merge pull request #4208 from nicoddemus/pytestskip-docs-4206 
Remove pytest.config example from skipping at module level docs
 2018-10-21 10:28:53 -07:00
Ankit Goel cd72e23f3f
Merge pull request #4207 from nicoddemus/recursive-dep-fixtures 
Improve error message when a recursive dependency between fixtures is detected
 2018-10-20 22:19:21 +05:30
Bruno Oliveira b9990f77ff
Merge pull request #4204 from vbarbaresi/3340_log_hooks 
Fix logging usage in hooks pytest_sessionstart/finish
 2018-10-20 11:36:06 -03:00
Bruno Oliveira 6b126997e1 Remove pytest.config example from skipping at module level docs 2018-10-20 11:28:39 -03:00
Bruno Oliveira 02ae7d8531 Improve error message when a recursive dependency between fixtures is detected 
Fix #2909
 2018-10-20 09:44:42 -03:00
Vincent Barbaresi db106d6085 Fix logging usage in hooks pytest_sessionstart/finish #3340 2018-10-20 09:55:10 +02:00
Bruno Oliveira b0eed7b56c
Merge pull request #4205 from vbarbaresi/fix_typo 
fix typo in tmpdir documentation (trivial)
 2018-10-19 17:49:32 -03:00
Vincent Barbaresi 51d358a7a9 fix typo in tmpdir documentation 2018-10-19 19:22:04 +02:00
Bruno Oliveira c54cdd05b8
Merge pull request #4201 from ykantor/patch-1 
Update tmpdir.rst - very trivial
 2018-10-19 12:13:35 -03:00
Bruno Oliveira dde147641e
Fix linting 2018-10-19 09:33:51 -03:00
Bruno Oliveira 2abd005cc9
Merge pull request #4195 from nicoddemus/issue-3691 
Use safe_str() to format warning message about unicode in Python 2
 2018-10-19 07:18:29 -03:00
Ronny Pfannschmidt 366b88388b
Merge pull request #4200 from asottile/upgrade_hooks 
Upgrade pre-commit/pre-commit-hooks to 2.0.0
 2018-10-19 08:33:03 +02:00
ykantor 0fc1801d0d
Update tmpdir.rst 2018-10-19 05:54:29 +02:00
Anthony Sottile 11ff14be1f Upgrade pre-commit/pre-commit-hooks to 2.0.0 2018-10-18 20:11:35 -07:00
Anthony Sottile dc0b4efffa
Merge pull request #4196 from nicoddemus/better-signature-error-msg-4026 
Improve error message when it is not possible to determine a function's signature
 2018-10-18 18:56:55 -07:00
Bruno Oliveira 864d7fef30 Add back some {posargs} placeholders for pytest invocations in tox.ini 
Those were removed by accident in a previous commits it seems
 2018-10-18 21:57:11 -03:00
Bruno Oliveira 18035211f5 Use safe_str() to format warning message about unicode in Python 2 
Fix #3691
 2018-10-18 21:56:17 -03:00
Anthony Sottile 61080da89d
Merge pull request #4192 from asottile/fix_recwarn_stacklevel 
Fix filename reported by `warnings.warn` when using `recwarn` under python2.
 2018-10-18 16:22:00 -07:00
Bruno Oliveira ac5704290f Improve error message when it is not possible to determine a function's signature 
Fix #4026
 2018-10-18 20:06:43 -03:00
Anthony Sottile cdd0e18ca8 Emulate resetting the warnings registry for python 2.x 2018-10-18 10:43:05 -07:00
Bruno Oliveira e4871f7722
Merge pull request #4183 from RonnyPfannschmidt/bump-setuptools 
fix #4177 - pin setuptools>=40.0
 2018-10-18 07:49:03 -03:00
Bruno Oliveira 517ee588c6
Merge pull request #4186 from nicoddemus/drop-coveralls 
No longer upload code coverage to coveralls
 2018-10-18 07:48:40 -03:00
Ankit Goel 1b51497936 [WIP] Update warning stacklevel when wrapping warnings.warn 2018-10-18 02:36:41 +00:00
Bruno Oliveira a83ee197c6 Merge remote-tracking branch 'upstream/master' into RonnyPfannschmidt/bump-setuptools 2018-10-17 19:05:52 -03:00
Bruno Oliveira 12f94b81c0 No longer upload code coverage to coveralls 
We have since moved to codecov and uploading to coveralls is breaking
OS-X builds for py37 [1], so we might as well take this opportunity to drop
it.

[1] https://travis-ci.org/pytest-dev/pytest/jobs/442858038
 2018-10-17 18:18:08 -03:00
Bruno Oliveira e6b01b45f1
Merge pull request #4185 from RonnyPfannschmidt/fix-fail 
fix test_cleanup_keep for expecting symlinks
 2018-10-17 18:15:37 -03:00
Ronny Pfannschmidt 56dd7bc551 TestNumberedDir: ignore that symlinks arent created on windows 2018-10-17 21:39:23 +02:00
Bruno Oliveira 8a768b0db0
Merge pull request #4182 from nicoddemus/fix-deprecations-hook-name 
Fix hook name in deprecations.rst
 2018-10-17 16:18:52 -03:00
Ronny Pfannschmidt 8dca8f3c9f fix test_cleanup_keep for expecting symlinks 2018-10-17 21:16:44 +02:00
Ronny Pfannschmidt cc335d44a0 fix #4179 - bring back the current testrun symlink 2018-10-17 20:43:27 +02:00
Ronny Pfannschmidt 4f4c91caf5 fix #4177 - pin setuptools>=40.0 2018-10-17 20:08:07 +02:00
Bruno Oliveira ba5a295544
Fix hook name in deprecations.rst 
As mentioned in https://github.com/pytest-dev/pytest/issues/4128#issuecomment-430690498
 2018-10-17 14:53:41 -03:00
Bruno Oliveira 93bdbf7572
Merge pull request #4173 from nicoddemus/warning-docs-update 
Update warnings docs
 2018-10-17 09:24:32 -03:00
Anthony Sottile ab8907f6f5 s/comparision/comparison/g [ci skip] 2018-10-16 17:23:29 -07:00
Bruno Oliveira 215a2ed3de Update warnings docs 
Some points on the document work different in 3.9, plus changed the order
of the sections a bit to make more sense for users reading it for the first time.
 2018-10-16 21:00:57 -03:00