4d6fef36f4
Merge branch 'pytest-2.7'
2015-06-17 13:42:41 +02:00
0431b8bb74
Merge pull request #784 from pytest-dev/create-dirs-xml-log
...
Automatically create directories for junit-xml and resultlog
2015-06-17 13:28:07 +02:00
2653024409
Use os.path.isdir instead of os.path.exists
...
As suggested during review
2015-06-17 08:08:03 -03:00
923174718e
Allow failure of py27-subprocess tox-env while on pytest-2.7
...
"inprocess by default" was introduced in 2.8, and the current travis
configuration was backported from master so this specific
tox-env will remain disabled while pytest-2.7 maintenance branch
lasts.
2015-06-17 00:53:38 -03:00
73f37d0989
split travis jobs
...
Conflicts:
README.rst
2015-06-17 00:22:34 -03:00
0722b95e53
use travis containers
2015-06-17 00:21:32 -03:00
ae89436d97
Remove duplicated author from AUTHORS
2015-06-17 00:05:56 -03:00
af77a23501
Add docs for new tests
2015-06-17 00:04:25 -03:00
2a1424e563
Merge branch 'pytest-2.7' of github.com:curzona/pytest into pytest-2.7
...
Conflicts:
AUTHORS
CHANGELOG
2015-06-17 00:02:26 -03:00
1871d526ac
Update CHANGELOG and AUTHORS
2015-06-16 19:33:26 -07:00
9346e18d8c
Test creating directory for junit-xml and resultlog
2015-06-16 19:30:43 -07:00
1db5c95414
Automatically create directory for results
2015-06-16 19:30:19 -07:00
0c05b906d4
backport fix for #713
2015-06-16 21:27:22 -03:00
f04e01f55f
Sort AUTHORS names
2015-06-16 21:20:43 -03:00
a0da7b9774
Mention issue 713 in the test's docstring
2015-06-16 20:42:49 -03:00
0b0406fa85
Handle reports that don't have a reprcrash
...
Closes #713 (which happens because ReprFailDoctest
doesn't have a reprcrash)
2015-06-16 18:53:20 -04:00
f1245b094f
Merge pull request #779 from pytest-dev/coveralls-shields-badge
...
Use shields.io badge for coveralls
2015-06-16 04:09:49 +02:00
c840e5c06e
Use shields.io badge for coveralls
...
All badges have a similar look
2015-06-15 23:08:17 -03:00
c7573a92b2
Merge pull request #778 from pytest-dev/pypi-badge
...
Use pypi version badge from shields.io
2015-06-16 04:05:30 +02:00
84a476af87
Use pypi version badge from shields.io
...
The old one from pypip.in seems to always be broken as of late
2015-06-15 23:03:53 -03:00
e890d60459
appveyor badge
2015-06-16 03:28:12 +02:00
5dbe565b6d
Merge branch 'master' of github.com:pytest-dev/pytest
2015-06-16 03:25:39 +02:00
8f09904c06
appveyor scripts
2015-06-16 03:25:28 +02:00
c0db143d4a
Merge pull request #777 from bubenkoff/appveyor-integration
...
appveyor integration
2015-06-16 03:05:14 +02:00
534dbacc80
appveyor integration
2015-06-16 02:58:07 +02:00
af439e7d74
Merge pull request #775 from bubenkoff/pass-coveralls-env
...
pass coveralls env
2015-06-16 02:39:17 +02:00
b38cadbecd
pass coveralls env
2015-06-16 02:38:52 +02:00
edfadf3a7c
pass coveralls env
2015-06-16 01:12:24 +02:00
ae66683998
Merge pull request #773 from pytest-dev/remove-hg-files
...
Remove hgignore and hgtags files
2015-06-16 01:06:47 +02:00
4a8a4cb21b
Merge pull request #770 from bubenkoff/add-travis-badge
...
add travis badge
2015-06-15 20:04:32 -03:00
ccebf8e1d6
add travis badge
2015-06-16 01:03:38 +02:00
8663be34b4
Remove hgignore and hgtags files
2015-06-15 20:02:41 -03:00
502a372405
Merge pull request #771 from pytest-dev/use-travis-containers
...
use travis containers
2015-06-15 19:56:34 -03:00
088ead2477
Merge pull request #772 from bubenkoff/split-travis-jobs
...
split travis jobs
2015-06-15 19:56:20 -03:00
f2494ecb3d
split travis jobs
2015-06-16 00:49:55 +02:00
e9e01f2c9c
use travis containers
2015-06-16 00:22:16 +02:00
d4e77faea7
Update sidebar links from Bitbucket to GitHub
2015-06-15 19:18:03 -03:00
ff58ae66c0
Update CONTRIBUTING documentation with GitHub instructions
2015-06-15 18:54:44 -03:00
b40f760cc3
Change links from bitbucket to GitHub
2015-06-15 18:28:31 -03:00
42e7456780
Merged in RonnyPfannschmidt/pytest/regendoc-upgrade (pull request #303 )
...
use regendoc normalization and regenerate docs
2015-06-10 10:44:38 +01:00
43d27ec7ed
use regendoc normalization and regenerate docs
...
--HG--
branch : regendoc-upgrade
2015-06-06 23:30:49 +02:00
645ddc917f
make regendoc a direct requirement
2015-06-06 14:15:23 +02:00
33a7f03ccc
sort AUTHORS and add Janne
2015-06-06 13:38:25 +02:00
8b53a72dde
add Janne`s changes to CHANGELOG
2015-06-06 11:53:34 +02:00
8ee73e028f
Merged in jpvanhal/pytest/include-setup-teardown-duration-in-junitxml (pull request #287 )
...
Include setup and teardown in junitxml test durations
2015-06-06 11:50:37 +02:00
ca44e88e54
backport fixed issue735
...
--HG--
branch : pytest-2.7
2015-06-04 07:52:25 +02:00
304fc4f222
Merged in issue735 (pull request #302 )
...
use NameConstant node when it exists (fixes #735 )
2015-06-04 07:48:53 +02:00
09edb813bc
Close branch issue735
...
--HG--
branch : issue735
2015-06-04 07:48:53 +02:00
f3ad2e4ad2
use NameConstant node when it exists ( fixes #735 )
...
--HG--
branch : issue735
2015-06-03 18:07:10 -05:00
a2bb2ff164
port typo fix
2015-06-03 23:43:12 +02:00
Anatoly Bubenkov
Bruno Oliveira
curzona
Punyashloka Biswal
Floris Bruynooghe
Ronny Pfannschmidt
holger krekel
Benjamin Peterson