Bruno Oliveira
0334e75c30
Use "pytest" instead of "py.test" on trial environments
2016-08-18 08:37:55 -03:00
Bruno Oliveira
463e6572c5
Merge branch 'master' into merge-master-into-features
...
Preparing for 3.0
2016-08-17 22:39:23 -03:00
Bruno Oliveira
92498109e4
Enable py35-trial testenv on Windows
2016-08-17 21:20:12 -03:00
Bruno Oliveira
802755ceed
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-08-06 17:58:17 -03:00
Bruno Oliveira
ed36d627e4
Use PyInstaller for freeze test env
...
cx_freeze doesn't seem to be very well supported in Python 3.5.
Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.
Fix #1769
2016-07-26 22:02:37 -03:00
Ronny Pfannschmidt
b9a91dc112
merge from master to features
2016-07-06 11:51:48 +02:00
Bruno Oliveira
10c5e6fd9c
Split AppVeyor test runs in multiple jobs to avoid timeout issues
...
Some of our builds have been timing out (over 1 hour),
on AppVeyor
2016-07-04 21:54:21 -03:00
Dave Hunt
ef9dd14963
Introduce pytest command as recommended entry point
...
Fixes #1629
2016-06-21 16:16:57 +02:00
Bruno Oliveira
92323895c9
Use same python which invoked tox for "doctesting" env
...
This will work for Travis and AppVeyor because both start tox using Python 3
2016-06-08 21:06:19 -03:00
Bruno Oliveira
2c4b76b754
Use same python which invoked tox for "doctesting" env
...
This will work for Travis and AppVeyor because both start tox using Python 3
2016-06-01 20:30:26 -03:00
Ronny Pfannschmidt
b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
Ronny Pfannschmidt
978bb190a1
add release announcement
2016-05-31 19:06:29 +02:00
Ronny Pfannschmidt
d3dcc2b8f1
bump regendoc python version to 3.5
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
26b526967e
merge from master again
2016-05-23 22:33:00 +02:00
Bruno Oliveira
561a5fb558
Move comment in tox.ini due to recent bug in pip
...
As discussed in #1554
* https://bitbucket.org/hpk42/tox/issues/332/
* https://github.com/pypa/pip/issues/3667
2016-05-18 16:15:29 -03:00
Ceridwen
23a8e2b469
Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6
2016-04-02 11:47:37 -04:00
Ceridwen
08671fcf4a
Fix the changelog and dependencies for tox
2016-04-02 10:52:28 -04:00
Ceridwen
491b30c5d9
Add Hypothesis test for _idval and fix bug it found
2016-04-01 22:45:44 -04:00
Bruno Oliveira
89c75b2c91
Fix tox doc task
2016-02-13 02:09:25 -02:00
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