Ronny Pfannschmidt
7b2956e10b
merge latest master into features as well
2016-02-05 00:13:48 +01:00
Ronny Pfannschmidt
de1a9f574c
merge from master
2016-02-05 00:10:28 +01:00
Bruno Oliveira
30e61f2777
Test with pypy and enable coveralls in AppVeyor
...
* Install pypy using chocolatey
* Enable coveralls test environment in AppVeyor
* Suggest maintaining build matrix in .travis.yml by using "tox --listenvs"
Fix #1254
2016-02-01 17:40:30 -02:00
Ronny Pfannschmidt
56c5db6e12
add requests dependency to tox.ini to ensure all monkeypatch tests run
2016-01-24 12:30:38 +01:00
Bruno Oliveira
199fcf93d4
Merge branch 'master' into 'features'
2016-01-22 18:32:45 -02:00
Bruno Oliveira
7b13c4bec0
Fix flakes
2016-01-14 21:01:57 -02:00
Bruno Oliveira
3daa0756eb
Add CHANGELOG.rst to MANIFEST and small format fix
2016-01-05 20:01:41 -02:00
Bruno Oliveira
3e34db50fb
Rename "flakes" testenv to "linting" as requested in review
2016-01-05 18:18:29 -02:00
Bruno Oliveira
02dd6df6e6
Changelog now in rst format (2.9.0 and onward) and add rst-lint check
...
Fix #1274
2016-01-03 23:09:24 -02:00
Bruno Oliveira
031a20699c
Use py35 as preferred py3 interpreter for special test environments
2015-09-26 03:37:21 -03:00
Ronny Pfannschmidt
c3588b545f
generate docs on python3.4
2015-09-22 16:52:35 +02:00
Ronny Pfannschmidt
89badfec0c
update regendoc, substitutes PYTHON_PREFIX
2015-09-22 14:48:04 +02:00
Ronny Pfannschmidt
662d755974
fix documentation gegeneration, kill Makefile
2015-09-22 14:22:37 +02:00
Bruno Oliveira
546093175e
White list rm for cxfreeze env
2015-09-17 23:34:09 -03:00
Ronny Pfannschmidt
1de38a25fc
use flake8 in the flakes testenv
...
and extend the ignored errors list so pytest is clean
we def have to trim down that one
2015-09-13 19:55:44 +02:00
Bruno Oliveira
359f248729
Force to use xdist >= 1.13
2015-08-18 07:35:03 -03:00
Bruno Oliveira
df29120abe
Merge branch 'pytest-2.7'
...
Conflicts:
_pytest/config.py
_pytest/genscript.py
_pytest/mark.py
tox.ini
2015-07-23 22:35:51 -03:00
Bruno Oliveira
5a17e797c7
Fix basepython for tox envs "doctesting" and "coveralls"
...
Because we are currently using "nighly" python for travis, which
uses python 3.6 as the default interpreter. This breaks the environments
listed above because "inspect.getargspec" has been removed in py36.
2015-07-23 21:15:45 -03:00
Anatoly Bubenkov
045274e647
remove merge artifact
2015-07-19 15:49:43 +02:00
Anatoly Bubenkov
6af7172204
Merge branch 'pytest-2.7'
2015-07-19 15:25:04 +02:00
Thomas Kluyver
15497dcd77
OK, try running flakes with 2.7
2015-07-18 13:16:47 -03:00
Thomas Kluyver
8a0867c580
Try running flakes tests with Python 3.4
2015-07-18 13:16:47 -03:00
Matthias Bussonnier
195afa0733
try isntall 35 on tox
2015-07-18 13:16:08 -03:00
Bruno Oliveira
330de0a93d
Use a subdirectory in the TEMP directory to speed up tmpdir creation
...
Fix #105
2015-07-16 19:50:49 -03:00
Thomas Kluyver
4e98d2b7f1
OK, try running flakes with 2.7
2015-07-15 15:52:28 -07:00
Thomas Kluyver
d73c8e6a5e
Try running flakes tests with Python 3.4
2015-07-15 15:49:15 -07:00
Matthias Bussonnier
71a00c3223
try isntall 35 on tox
2015-07-15 13:49:40 -07:00
Bruno Oliveira
7a71b69a87
Pinning mock module to < 1.1 fo py26
...
It has been announced that mock>=1.1 will be
supported for python 2.7 only.
Conflicts:
tox.ini
2015-07-13 13:43:03 -03:00
Bruno Oliveira
65c56d4c00
Pinning mock module to < 1.1 fo py26
...
It has been announced that mock>=1.1 will be
supported for python 2.7 only.
2015-07-10 19:57:48 -03:00
holger krekel
01f5913826
try to fix coveralls env
2015-06-23 23:25:19 +02:00
holger krekel
ee40ea5f6d
Merge branch 'pytest-2.7'
...
Conflicts:
AUTHORS
_pytest/__init__.py
setup.py
testing/conftest.py
tox.ini
2015-06-23 16:49:05 +02:00
holger krekel
e84c00efae
finish pytest-2.7.2 release
2015-06-23 16:31:24 +02:00
Anatoly Bubenkov
73f37d0989
split travis jobs
...
Conflicts:
README.rst
2015-06-17 00:22:34 -03:00
Anatoly Bubenkov
b38cadbecd
pass coveralls env
2015-06-16 02:38:52 +02:00
Anatoly Bubenkov
edfadf3a7c
pass coveralls env
2015-06-16 01:12:24 +02:00
Anatoly Bubenkov
f2494ecb3d
split travis jobs
2015-06-16 00:49:55 +02:00
holger krekel
c4bd3c672b
another try at ignoring cx_freeze during other tox envs
2015-05-07 12:19:35 +02:00
holger krekel
52354b9ab5
try to ignore cx_freeze from regular pytest runs and see if travis is happy
2015-05-07 12:02:14 +02:00
holger krekel
db5649ec6a
streamline pytester API majorly:
...
- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor
2015-04-28 11:54:53 +02:00
holger krekel
424e5d1394
make test suite more tolerable against xdist causing warnings itself (which it does
...
currently)
--HG--
branch : plugtestfix
2015-04-27 15:06:47 +02:00
Bruno Oliveira
6fe5493c3c
Fix py27-cxfreeze tox environment
...
Use a custom script to install a patched version of cx_freeze,
as required in Ubuntu 14.04 systems
--HG--
branch : cx_freeze_ubuntu
2015-04-22 19:46:06 -03:00
holger krekel
d2a8866bce
bump verrsion to python2.7, fix a too precise test for windows, regen docs
2015-03-26 09:34:10 +01:00
Anatoly Bubenkov
c69978fbb0
revert verbosity
2015-03-24 13:41:49 +01:00
Anatoly Bubenkov
c1eaa72883
correct config
2015-03-24 11:56:59 +01:00
Anatoly Bubenkov
55f3ffd2ba
add verbosity to the tests
2015-03-24 10:51:45 +00:00
holger krekel
25a4d7d882
remove default-verbose running
2015-03-17 13:19:26 +01:00
Anatoly Bubenkov
33c2a3a3e5
make loop more readable
...
--HG--
branch : parametrized-fixture-override
2015-03-02 08:55:57 +01:00
Bruno Oliveira
37631dbfa0
added plugins_index page generation to tox
...
Also minor improvements in the page:
- Removed version from plugin name
- Using "home" instead of "repo", seems more appropriate
- Reduced default verbosity
2014-09-27 12:28:29 -03:00
Bruno Oliveira
5873ca5146
Merging with default
...
--HG--
branch : cx_freeze-support
2014-08-11 20:07:11 -03:00
holger krekel
e5eaf02e19
finalize pytest-2.6.1 release, regen docs
2014-08-07 21:41:51 +02:00