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
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
b5fd3cfb84
fix typo
...
--HG--
branch : pytest-2.7
2015-06-03 23:42:38 +02:00
c037f52878
fix issue741: make running output from testdir.run copy/pasteable
2015-06-03 23:40:42 +02:00
584cccf7ec
Merged in nicoddemus/pytest/issue-741-pytester-output (pull request #293 )
...
Make "running" output from testdir.run copy/pastable
2015-06-03 23:40:08 +02:00
c92467df2f
add changelog for latest merge
2015-06-03 23:39:00 +02:00
ad08bf79e7
Merged in The-Compiler/pytest (pull request #298 )
...
Fix monkeypatch.setenv with string and raising=False.
2015-06-03 23:37:26 +02:00
dc727832a0
Close branch pytest-2.7
...
--HG--
branch : pytest-2.7
2015-06-03 23:34:38 +02:00
22c62dbd90
Merged in flub/pytest (pull request #299 )
...
Ignore emacs' .dir-locals.el file
2015-06-03 23:34:13 +02:00
d220be8468
Use platform.python_version() to show Python version number
...
This results in something like "3.5.0b2" for non-final releases
while still being "3.5.0" for final releases.
2015-05-31 20:31:31 +01:00
b09be4e3ef
Merged in flub/pytest (pull request #297 )
...
Merge 2.7.1 release changes into default
2015-05-31 20:27:13 +01:00
efce2ababa
add in missing finalizer to doc example
2015-05-21 19:15:52 -07:00
773b8b69dd
Ignore emacs' .dir-locals.el file
...
This can be used to e.g. automatically set a specific syntax
checker or virtualenv to activate.
2015-05-20 10:33:13 +01:00
ff8d787cd5
Fix monkeypatch.setenv with string and raising=False.
...
Fixes #746 .
2015-05-19 22:59:49 +02:00
d299f0d99f
Merge changes from 2.7.1 release
...
This is mostly doc examples regeneration, other changes are:
- Add 2.7.1 tag to .hgtags
- Update changelog to use real versions
- Update HOWTORELEASE.rst
- Fix rst in doc/en/adopt.txt
- Fix CHANGELOG and release-2.7.0 rst formatting
2015-05-19 21:43:50 +01:00
bf837164b4
Add how to upload a wheel and tag the release
...
--HG--
branch : pytest-2.7
2015-05-19 09:32:21 +01:00
f6d589caa1
Added tag 2.7.1 for changeset edc1d080bab5
...
--HG--
branch : pytest-2.7
2015-05-19 09:26:59 +01:00
738c8762df
Regenerate docs using 2.7.1
...
--HG--
branch : pytest-2.7
2015-05-19 01:54:24 +01:00
3d990a6237
Fix rest formatting and set final version number
...
--HG--
branch : pytest-2.7
2015-05-19 01:53:06 +01:00
b024dbe794
Remove unused link
...
--HG--
branch : pytest-2.7
2015-05-19 01:52:33 +01:00
83a93e5e9a
More updates/fixes to release process
...
Some of this is temporary, but this is how I got things to work.
--HG--
branch : pytest-2.7
2015-05-19 01:52:06 +01:00
504b6b72a9
Set 2.7.1 version number
...
--HG--
branch : pytest-2.7
2015-05-19 01:50:32 +01:00
3401049dea
remove adopt pytest note
2015-05-12 13:36:43 +02:00
45851644c1
remove adopt message
...
--HG--
branch : pytest-2.7
2015-05-12 13:34:32 +02:00
a7f880fa1f
Make "running" output from testdir.run copy/pastable
...
fix 741
--HG--
branch : issue-741-pytester-output
2015-05-09 10:24:33 -03:00
c4bd3c672b
another try at ignoring cx_freeze during other tox envs
2015-05-07 12:19:35 +02:00
52354b9ab5
try to ignore cx_freeze from regular pytest runs and see if travis is happy
2015-05-07 12:02:14 +02:00
3c187c844e
make default depend on just published py/pluggy releases
2015-05-07 11:50:08 +02:00
45ed4c726e
Merged in hpk42/pytest-patches/plug30 (pull request #291 )
...
use new pluggy api (now at 0.3.0) for adding hookcall monitoring
2015-05-07 11:24:39 +02:00
d9a44098ce
use new pluggy api (now at 0.3.0) for adding hookcall monitoring
...
and reraise real keyboard interrupts during inline pytest runs
to allow for better stopping of the pytest tests.
--HG--
branch : plug30
2015-05-07 11:02:55 +02:00
b93abfb3d1
Merged in hpk42/pytest-patches/pluggy1 (pull request #290 )
...
integrate pluggy as external plugin manager
2015-05-06 15:02:05 +02:00
bb8141e27c
- make sure sub pytest runs use the same basetemp
...
- depend on pluggy < 0.3
--HG--
branch : pluggy1
2015-05-06 14:58:46 +02:00
bddc88f09e
adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts
...
--HG--
branch : pluggy1
2015-05-06 10:08:08 +02:00
5ea7f0342b
Merged default into pluggy1
...
--HG--
branch : pluggy1
2015-05-05 22:29:53 +02:00
13db045fc4
merge
2015-05-05 21:55:39 +02:00
23538bcd31
- some more adaptation to most recent pluggy API
...
- avoid using pluggin underscore api
- show pluggy version in header
--HG--
branch : pluggy1
2015-05-05 21:53:04 +02:00
a4f2236b36
merge default
...
--HG--
branch : pluggy1
2015-05-05 14:52:16 +02:00
88538f13ba
adapt for current API changes of pluggy
...
--HG--
branch : pluggy1
2015-05-04 15:08:41 +02:00
920b5afe45
now that we are going to have wheels, py source code might be not be installed
...
and the resulting genscript is useless
--HG--
branch : pluggy1
2015-05-04 14:42:01 +02:00
e4b9603fa8
Merged in famousgarkin/pytest/famousgarkin/monkeypatchchdir-docstring-punctuation-1430453576841 (pull request #288 )
...
monkeypatch.chdir docstring punctuation
2015-05-04 14:28:32 +02:00
ef7f627573
merging pytest-2.7
2015-05-04 14:27:09 +02:00
5a06330f61
Doc typo
...
--HG--
branch : pytest-2.7
2015-05-01 11:18:17 -04:00
93628fc0eb
Include setup and teardown in junitxml test durations
...
--HG--
branch : include-setup-teardown-duration-in-junitxml
2015-05-01 14:55:52 +03:00
47936643c9
monkeypatch.chdir docstring punctuation
...
--HG--
branch : famousgarkin/monkeypatchchdir-docstring-punctuation-1430453576841
2015-05-01 04:13:06 +00:00
Ronny Pfannschmidt
holger krekel
Benjamin Peterson
Floris Bruynooghe
Darren Yin
Florian Bruhin
Bruno Oliveira
Eric Siegerman
Janne Vanhala
famousgarkin