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

9839 Commits

Author SHA1 Message Date
Daniel Hahler 29112d7e0b Merge master into features 2019-02-26 11:48:10 +01:00
Bruno Oliveira 3fd2f43fb6
Merge pull request #4828 from Zac-HD/mark-docs 
Clarify docs on --strict marks
 2019-02-25 10:07:40 -03:00
Bruno Oliveira 2cf1de3f2d
Merge pull request #4727 from nicoddemus/early-load-4718 
Change -p so it is possible to early load setuptools plugins
 2019-02-25 10:05:51 -03:00
Zac-HD d9bdf5cfca Clarify docs on --strict marks 2019-02-25 22:30:49 +11:00
Anthony Sottile f494eefcae
Merge pull request #4823 from nicoddemus/unittest2env 
Add unittest2 testing to trial environment
 2019-02-24 10:33:26 -08:00
Anthony Sottile c9e69438b1
Merge pull request #4822 from nicoddemus/funcsigs 
Require funcsigs>=1.0 on Python 2.7
 2019-02-24 09:14:09 -08:00
Bruno Oliveira 2e89812fad Add unittest2 testing to trial environment 
Just noticed that `test_usefixtures_marker_on_unittest` is parametrized
for unittest2, but no environment ever installed that library.
 2019-02-24 13:21:00 -03:00
Bruno Oliveira a0207274f4 -p option now can be used to early-load plugins by entry-point name 
Fixes #4718
 2019-02-24 13:20:17 -03:00
Bruno Oliveira 759d7fde5d
Merge pull request #4786 from blueyed/av 
AppVeyor: use xdist with pypy, drop pluggymaster
 2019-02-24 12:17:59 -03:00
Bruno Oliveira a0f5c4c8f5
Merge pull request #4799 from blueyed/codecov 
codecov: use only linux/windows/osx flags
 2019-02-24 12:16:51 -03:00
Bruno Oliveira 2e210acd00
Merge pull request #4819 from Handsome2734/doc-fix 
add notice to use [tool:pytest] in setup.cfg
 2019-02-24 12:16:30 -03:00
Bruno Oliveira ede6387caa Require funcsigs>=1.0 on Python 2.7 
Fix #4815
 2019-02-24 12:11:08 -03:00
Anthony Sottile ff25b52110
Merge pull request #4820 from nicoddemus/fix-test-prefix 
Fix docs about pytest conventions for test functions
 2019-02-23 12:02:04 -08:00
Daniel Hahler dc8c27037a AppVeyor: drop pluggymaster 2019-02-23 20:15:11 +01:00
Bruno Oliveira 3e11bd0d6e
Update wording about [tool:pytest] in setup.cfg files 2019-02-23 15:32:42 -03:00
Bruno Oliveira 6a4c7063fd Fix docs about pytest conventions for test functions 
Fix #4818
 2019-02-23 15:22:27 -03:00
songbowen 15fe60aa25 add notice to use [tool:pytest] in setup.cfg 2019-02-24 00:24:56 +08:00
Daniel Hahler 1ec7f60484 codecov: use only linux/windows flags 
Using many flags are a reason for timeouts on Codecov's backend.
 2019-02-23 08:28:08 +01:00
Daniel Hahler 63e7f8e340
Merge pull request #4817 from nicoddemus/merge-master-into-features 
Merge master into features (including fix from 4816)
 2019-02-23 08:24:21 +01:00
Bruno Oliveira 1cf9c2e76f
Merge pull request #4816 from nicoddemus/fix-new-pluggy 
Fix test failures after pluggy 1.8 release
 2019-02-22 22:42:40 -03:00
Bruno Oliveira 0ca1f6e0f4 Merge branch 'fix-new-pluggy' into merge-master-into-features 2019-02-22 18:59:51 -03:00
Bruno Oliveira a68f4fd2b9 Fix test failures after pluggy 1.8 release 
pluggy now calls iter_entry_points with different arguments, and tests
which mocked that call need to be updated accordingly.
 2019-02-22 18:58:54 -03:00
Bruno Oliveira 5b35241470
Merge pull request #4812 from mitzkia/logging_from_runtest_logreport 
Logging: Make pytest_runtest_logreport() hook available for logging
 2019-02-22 18:47:06 -03:00
Andras Mitzki b26b731498 Logging: Make pytest_runtest_logreport() available for logging 
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
 2019-02-22 05:14:44 +01:00
Anthony Sottile da305966d2
Merge pull request #4793 from nicoddemus/azure-include-more-envs 
Add same environments to Azure, except py37-freeze
 2019-02-21 09:15:44 -08:00
Bruno Oliveira 4ee10d2266
Merge pull request #4813 from discdiver/patch-1 
Doc update - recommend use venv instead of virtualenv
 2019-02-21 14:06:36 -03:00
Bruno Oliveira e1aeb6915e Fix linting 2019-02-21 13:27:12 -03:00
Bruno Oliveira e75915bb73
Revert recommending virtualenv for Python 3.4 
`venv` is already available in Python 3.4, my mistake
 2019-02-21 13:03:19 -03:00
Bruno Oliveira ba2a43266a
Mention that virtualenv should be used for Python 3.4 as well 2019-02-21 12:52:09 -03:00
Jeff Hale cfaa8bbee8
recommend venv or virtualenv, depending on python version 
venv has been installed with Python since 3.3.  https://docs.python.org/3/library/venv.html
 2019-02-21 10:50:49 -05:00
Jeff Hale 6b661795cf
update links.inc to include both venv and virtualenv 2019-02-21 10:41:59 -05:00
Jeff Hale fa65b71c98
Merge pull request #1 from discdiver/discdiver-patch-1 
update links for virtualenv -> venv
 2019-02-20 15:41:39 -05:00
Jeff Hale da5dec83f6
update links for virtualenv -> venv 2019-02-20 15:36:34 -05:00
Jeff Hale 2ef3cb2510
Recommend use venv instead of virtualenv 
From the Python docs:
"Changed in version 3.5: The use of venv is now recommended for creating virtual environments."
-https://docs.python.org/3/library/venv.html
 2019-02-20 15:33:48 -05:00
Zac Hatfield-Dodds c8a87e48ab
Merge pull request #4783 from gyermolenko/fix_syntax_highlighting_for_two_rst_docs 
Fix sphinx code-block types (syntax highlighting) in two docs
 2019-02-20 06:31:10 +11:00
Bruno Oliveira b9561e29ff
Merge pull request #4808 from nicoddemus/merge-master-into-features 
Merge master into features
 2019-02-19 08:08:06 -03:00
Bruno Oliveira bf6dcd64dc
Merge pull request #4757 from blueyed/pypy 
Travis: use pypy from Xenial, add pypy3
 2019-02-18 19:55:43 -03:00
Daniel Hahler 214c331236 Travis: use pypy from Xenial, add pypy3 2019-02-18 22:32:31 +01:00
Bruno Oliveira 9cb504ca9a Add same environments to Azure as have in AppVeyor, except py37-freeze 
py37-freeze will be tackled in https://github.com/pytest-dev/pytest/issues/4807
 2019-02-18 17:23:39 -03:00
Bruno Oliveira f0a9f9042f
Merge pull request #4805 from nicoddemus/release-4.3.0 
Release 4.3.0
 2019-02-18 17:18:50 -03:00
Daniel Hahler ff015f6308 Fix docs (tox -e regen, plus pre-commit) 2019-02-18 18:46:03 +01:00
Bruno Oliveira eeac28f4ab
Merge pull request #4804 from asottile/fix_py38 
Fix python3.8 / pypy failures
 2019-02-18 12:59:21 -03:00
Anthony Sottile 5505826db9 Fix python3.8 / pypy failures 2019-02-16 11:23:23 -08:00
Bruno Oliveira 31c869b4c4 Preparing release version 4.3.0 2019-02-16 14:11:58 +00:00
Bruno Oliveira 0395996756 Merge remote-tracking branch 'upstream/master' into release-4.3.0 2019-02-16 14:06:51 +00:00
Bruno Oliveira 986dd84375
LoggingPlugin: Support to customize log_file from hook (#4752) 
LoggingPlugin: Support to customize log_file from hook
 2019-02-16 12:01:21 -02:00
Bruno Oliveira a36e986920
Merge pull request #4803 from blueyed/travis-cron 
Travis: remove cron_only stage, use conditional job
 2019-02-16 11:29:51 -02:00
Anthony Sottile 68dc433bf5
Merge pull request #4802 from gyermolenko/fix_code_block_in_Node_docstring 
Fix code-block in Node docstring
 2019-02-15 20:09:32 -05:00
Daniel Hahler e59fc730f8
Merge pull request #4801 from gyermolenko/add_talk 
Add good talk by Andrew Svetlov
 2019-02-16 01:42:39 +01:00
Daniel Hahler 4f9e835472 Travis: remove cron_only stage, use conditional job 
Ref: https://github.com/pytest-dev/pytest/pull/4789#issuecomment-464135675
 2019-02-15 18:53:43 +01:00