662d755974
fix documentation gegeneration, kill Makefile
2015-09-22 14:22:37 +02:00
bf9b94595c
fix changelog
2015-09-22 11:18:19 +02:00
41d61ed221
Merge pull request #1023 from RonnyPfannschmidt/fix-877
...
Fix 877
2015-09-22 11:17:02 +02:00
e2f72ffed8
start bugfix changelog on master
2015-09-22 10:59:23 +02:00
79c2abf531
Merge pull request #1038 from hpk42/newbranching
...
adapt contributing to new versioning and to python3.5 as latest.
2015-09-22 10:55:30 +02:00
a5ff345f7b
fix another occurence of "macro" to "major"
2015-09-22 10:45:55 +02:00
f19ba6c2b1
fix naming
2015-09-22 10:29:12 +02:00
745cd26850
Merge branch 'master' into newbranching
2015-09-22 10:22:05 +02:00
71c5883d52
update according to discussion on pytest-dev and in PR
2015-09-22 10:21:01 +02:00
c30eafa254
Update changelog for merged PR.
2015-09-21 14:59:48 +01:00
7c3be72ac7
Merge pull request #1042 from Bjwebb/issue411
...
Add __eq__ method to assertion comparison example
2015-09-21 14:57:59 +01:00
622e64320a
Add __eq__ method to assertion comparison example
...
This makes the example make more sense, because now Foo(1) == Foo(1) is
true. Fixes #411
2015-09-21 14:23:26 +01:00
0efcfeed17
adapt contributing to new versioning and to python3.5 as latest.
2015-09-21 14:04:30 +02:00
65de43e67d
Mention fix for issue 766 in changelog
...
Fixes issue #766 .
2015-09-21 12:21:24 +01:00
cd4557cce8
Merge pull request #1036 from russel/rlw_766
...
Remove references to distutils as per Issue 766.
2015-09-21 12:19:14 +01:00
714a97e452
Remove references to distutils as per Issue 766.
2015-09-21 12:00:48 +01:00
80897f62a6
Merge pull request #974 from nicoddemus/addoption-conftest
...
Add warning about implementing pytest_addoption in conftest files
2015-09-21 11:28:31 +01:00
dfd83b59f8
Merge pull request #1033 from mbirtwell/changes_to_contributing_rst
...
contributing: Add instructions from PyCon
2015-09-21 11:13:14 +01:00
bb42e43ee7
contributing: Add instructions from PyCon
...
At PyCon we realised that the virtualenv created in the make file wasn't
used in the subsequent steps in CONTRIBUTING.rst. This change removes the
reference the make and suggesting installing tox directly.
Also changed the explanation that follows to make more sense with this
change
2015-09-21 10:56:05 +01:00
8fe5c704e3
Merge pull request #1024 from rouge8/tmpdir-uid-not-found
...
Make tmpdir resiliant to user ids that do not exist
2015-09-18 22:53:17 -03:00
b1c9b8b415
Make tmpdir resiliant to user ids that do not exist
...
Previously, the tmpdir fixture would fail if the current process's user
id does not correspond to a valid user (e.g. running pytest in a Docker
container with 'docker run -u').
2015-09-18 21:26:19 -04:00
7658f60146
#877 - reencoding causes typeerrors on python2
2015-09-19 00:30:01 +02:00
49c99a41ea
reencode non-ascii python2 assertion reprs, fixes #877
...
i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so
2015-09-19 00:30:01 +02:00
f02d9425f9
Bump version to 2.8.0
2015-09-18 19:04:20 -03:00
1aca998f3f
Merge pull request #1012 from lukas-bednar/junitxml_plugin
...
junitxml: align custom properties with junit format
2015-09-18 16:01:22 +02:00
2ba0fe2876
Merge pull request #1022 from nicoddemus/cxfreeze-tmpdir
...
Use temporary directory for cx_freeze testing
2015-09-18 09:28:33 +02:00
546093175e
White list rm for cxfreeze env
2015-09-17 23:34:09 -03:00
e4d5f88257
Fix install cx_freeze
2015-09-17 23:32:27 -03:00
3a8e375efe
Fix import
2015-09-17 14:52:51 -03:00
f5f3a2a928
Fix flaky failure about unused shutil
2015-09-17 12:54:02 -03:00
6bca5a1c25
Use temporary directory for cx_freeze testing
2015-09-17 11:54:44 -03:00
02a2272cfe
junitxml: move custom properties to properties element
...
<testsuite>
<testcase>
<properties>
<property name="ABC" value="XYZ" />
<property name="DEF" value="ZYX" />
</properties>
</testcase>
</testsuite>
2015-09-17 15:56:41 +02:00
fe8def98e4
Merge pull request #1020 from hpk42/pluggy031
...
re-vendor pluggy to 0.3.1 release and also fix the README
2015-09-17 14:41:32 +02:00
f4bfd571ee
re-vendor pluggy to 0.3.1 release and also fix the README
2015-09-17 13:54:23 +02:00
f32f3f1980
Merge pull request #1019 from mdboom/python3.5-docs
...
Various updates to the docs to mention support for Python 3.5
2015-09-17 13:45:35 +02:00
baf5b5d005
update changelog/author info, bump version number
2015-09-17 13:43:39 +02:00
3bcda48ba4
Merge pull request #1009 from mdboom/deprecation-warnings
...
avoid deprecation warnings, introduce helpers.
2015-09-17 13:37:26 +02:00
16f90ffc92
Various Python 3.5 documentation mentions
2015-09-17 07:32:52 -04:00
6520cf00e9
Merge pull request #1018 from hpk42/no_scm
...
revert setuptools_scm addition
2015-09-17 13:25:48 +02:00
7eb1211192
revert setuptools_scm addition introduced with f22d14b105
2015-09-17 12:58:04 +02:00
f978b545c5
Merge pull request #1016 from hpk42/importappend3
...
revert importing test module behaviour to prepend by default
2015-09-17 12:41:28 +02:00
6192e74f03
remove __init__.py as advised by ronny
2015-09-17 10:51:03 +02:00
7f71ce0ab2
Reorganize tests
2015-09-16 16:52:37 -04:00
a62d12634c
revert importing test module behaviour to prepend by default
2015-09-16 22:12:20 +02:00
886ac82c43
Merge pull request #1013 from nicoddemus/issue1010
...
Make tmpdir more resilient in case environment variables required by getpass are missing
2015-09-16 21:57:44 +02:00
2575053697
Merge pull request #1015 from hpk42/cache-integration
...
refined pytest-cache integration
2015-09-16 21:46:46 +02:00
130e6cf8a2
Use temproot as a fallback if the current user couldn't be obtained
2015-09-16 16:42:07 -03:00
3841e99720
avoid oldstyle funcarg usage
2015-09-16 21:06:44 +02:00
79d22bf334
some more doc refinements
2015-09-16 20:44:41 +02:00
45065e4e2e
refine command line option naming and docs
2015-09-16 20:41:22 +02:00
Ronny Pfannschmidt
holger krekel
holger krekel
Florian Bruhin
Floris Bruynooghe
Ben Webb
Russel Winder
Michael Birtwell
Bruno Oliveira
Andy Freeland
Lukas Bednar
Michael Droettboom