floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,655 Commits 32 Branches 205 Tags
fa65b71c98280b2f709d4e379a0fdcc3ea4ec24e
Commit Graph

9655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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) 4.3.0 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
Daniel Hahler
498b994eb4 Merge pull request #4787 from blueyed/travis-xdist 
Travis: use xdist for py?? envs, keeping py27/py37
 2019-02-15 18:35:21 +01:00
Daniel Hahler
40eef6da0c AppVeyor: use xdist for py?? envs, drop py27/py37 2019-02-15 17:55:01 +01:00
Daniel Hahler
71373b04b0 tox: add generic xdist factor 
Cherry-picked from features.

Conflicts:
	tox.ini
 2019-02-15 17:54:44 +01:00
Daniel Hahler
6fb7269979 terminal: write_fspath_result: work around py bug 2019-02-15 17:47:00 +01:00
Daniel Hahler
3460105def Travis: use xdist for py?? envs, keeping py27/py37 2019-02-15 17:46:58 +01:00
Andras Mitzki
e3824d23bc LoggingPlugin: Expose setting log_file_handler 
- This patch allows to set log_file (path) from hook

Signed-off-by: Thomas Hisch
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
 2019-02-15 16:05:10 +01:00
Grygorii Iermolenko
80ad448590 Fix code-block in Node docstring 2019-02-15 16:12:10 +02:00
Grygorii Iermolenko
59f69dd9e7 Add good talk by Andrew Svetlov 2019-02-15 15:37:18 +02:00
Grygorii Iermolenko
6e1ee0802f Fix sphinx code-block types for remaining rst docs 2019-02-15 15:10:37 +02:00
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 4.2.1 2019-02-12 20:17:06 +00:00