36eb5b36d1
Merge pull request #2096 from nicoddemus/merge-master-into-features
...
Merge master into features
2016-11-27 20:50:08 +01:00
b30a6d22c5
Merge branch 'master' into merge-master-into-features
2016-11-27 17:30:40 -02:00
0735d4549d
Merge pull request #2088 from nmundar/issue-2034
...
Issue 2034
2016-11-27 16:12:31 -02:00
f25ba4dd0b
Merge pull request #2095 from nicoddemus/readme-example
...
Use "inc" instead of "func" in the snipped on README
2016-11-27 19:11:35 +01:00
788e394c93
Use "inc" instead of "func" in the snipped on README and doc index
...
"inc" reads better, also fixed the line separators so
they have the same size
2016-11-27 15:49:39 -02:00
2d7197926a
Improve CHANGELOG entry for #2034
2016-11-27 14:26:30 -02:00
0a30f072e6
Show name argment in compatproperty deprecation message
2016-11-27 14:24:55 -02:00
0e6ad8e59f
update CHANGELOG and AUTHORS
2016-11-27 14:24:55 -02:00
b38fad4b82
Add compatproperty deprecation warning.
2016-11-27 14:24:55 -02:00
483754216f
Merge pull request #2094 from nicoddemus/remove-setuptools-pin
...
Remove setuptools pin now that upstream has been fixed
2016-11-27 14:15:47 -02:00
1e97ea60f7
Merge pull request #2091 from lwm/move-595-along
...
Add test case for #595 .
2016-11-27 14:13:15 -02:00
58f28bf049
Merge pull request #2093 from lwm/add-docs-notes
...
Add documentation building note.
2016-11-27 10:13:28 +01:00
5566b3ccb6
Remove setuptools pin now that upstream has been fixed
...
Related to pypa/setuptools#861
2016-11-27 03:30:23 -02:00
8138d88da2
Merge pull request #2087 from lwm/ref-recwarns
...
Add `:ref:` targets to `recwarn.rst`.
2016-11-26 18:06:17 -02:00
0aa891543d
Add documentation building note.
2016-11-26 18:57:51 +01:00
6c5475660a
Add test case for #595 .
...
This new test proves that reports do not capture stdout
by default when skipped.
2016-11-26 18:49:24 +01:00
1aa5bfea11
Add `:ref:` targets to `recwarn.rst`.
2016-11-26 18:41:38 +01:00
a6084ed797
Merge pull request #2090 from avojnovicDk/issue-1808
...
Clarify test discovery docs.
2016-11-26 15:28:06 -02:00
d05d19da78
Merge pull request #2085 from DuncanBetts/master
...
Add hint of Issue #478 to error text
2016-11-26 15:25:54 -02:00
fa4d5da4ca
Merge pull request #2092 from nicoddemus/pin-setuptools
...
Pin setuptools to < 29 because of AppVeyor failures
2016-11-26 15:25:43 -02:00
6120570198
Pin setuptools to < 29 because of AppVeyor failures
...
Related to pypa/setuptools#861
Remove the pin when we have a new setuptools release
2016-11-26 14:49:31 -02:00
2e6a58ab69
Clarify test discovery docs.
2016-11-26 15:21:39 +01:00
c1b83cdeea
Add hint of Issue #478 to error text
2016-11-26 10:47:15 +00:00
33796c8a13
Merge pull request #2084 from nicoddemus/fix-coveralls-appveyor
...
Only execute "coveralls" toxenv once on AppVeyor
2016-11-24 19:43:52 -02:00
8763590eef
Only execute "coveralls" toxenv on master once
...
Just noticed that the "coveralls" env was being execute after each env.
This was introduced by mistake in #2056
2016-11-24 19:27:27 -02:00
b3efd9aa59
Merge pull request #2083 from nicoddemus/approx-check-float
...
Fix error in approx's repr with complex numbers
2016-11-24 19:40:29 +01:00
33c0b06fdf
Fix error in approx's repr with complex numbers
...
Fix #2082
2016-11-24 15:33:12 -02:00
38f7562c7c
Merge pull request #2080 from nicoddemus/confcutdir-check
...
Show an error if --confcutdir is not a valid directory
2016-11-23 10:23:01 -02:00
629d8e9fd6
Show an error if --confcutdir is not a valid directory
...
Fixes #2078
2016-11-23 09:49:11 -02:00
a5b5090c72
Merge pull request #2070 from nedbat/bug2038
...
Don't fail if imp can't find the source for a .pyc file. #2038
2016-11-22 17:45:29 +01:00
5ce551e469
Merge pull request #2075 from pytest-dev/master
...
Merge master into features after fixing flake8 errors
2016-11-22 14:10:31 -02:00
a3319ffe80
Merge pull request #2071 from nicoddemus/fix-flake8
...
Fix flake8 E305 and E306 errors
2016-11-22 13:22:11 +01:00
1e2b2af296
Merge pull request #2074 from nedbat/fix-double-spaces
...
Remove an accidental double space
2016-11-21 14:19:56 -02:00
632c4d5daf
Remove an accidental double space
2016-11-21 10:17:23 -05:00
984d4ce5ec
Fix test_excinfo_getstatement that broke because of whitespace changes
2016-11-20 19:12:42 -02:00
1eb5a690d4
Fix flake8 E305 and E306 errors
...
These errors started to appear with flake8-3.1.1, while they don't appear with
version 3.1.0 (weird).
2016-11-20 18:59:15 -02:00
06bb61bbe3
Don't fail if imp can't find the source for a .pyc file. #2038
2016-11-20 13:09:32 -05:00
cbf261c74e
Merge pull request #2065 from sebastinas/spelling2
...
Fix spelling mistakes
2016-11-15 22:51:49 -02:00
0ba930a11d
Fix spelling mistakes
...
Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
2016-11-15 23:05:58 +01:00
75740337d1
Merge pull request #2060 from pytest-dev/master
...
Merge master into features due to recent CI updates
2016-11-13 18:18:38 -08:00
6876ba9ba6
Merge pull request #1995 from mattduck/feat/restructure-assert-truncation
...
Restructure truncation of assertion messages
2016-11-13 19:07:35 -02:00
73d481552d
Merge pull request #2058 from idlesign/patch-1
...
Docs: Added pytest promotional talk in Russian
2016-11-13 11:06:35 -02:00
50328f47db
Docs: Added pytest promotional talk in Russian
2016-11-13 18:04:39 +07:00
f0e0250cd5
Merge pull request #2056 from nicoddemus/appveyor-list
...
Use one job for each tox env on AppVeyor
2016-11-12 22:15:41 -02:00
ec69514eb2
Only install pypy on AppVeyor for "pypy" tox-env
2016-11-12 20:20:59 -02:00
c169c883d3
Use one job for each tox env on AppVeyor
...
Some time ago when we first added support for testing pytest on AppVeyor,
jobs in a build would not start immediately one after the other, as if AppVeyor
would schedule jobs from other builds (projects) in its VMs. So it made sense
at the time to reduce the number of jobs.
I have noticed in other projects that this behavior has changed, and jobs
in a build now start one after the other. Having a separate list then improves
visibility when the build fails, because we can see at a glance the failing(s)
tox environment(s).
2016-11-12 12:49:12 -02:00
5185f2a6ae
Merge pull request #2053 from nicoddemus/check-manifest-script
...
Use a wrapper script to bypass check-manifest if not under git
2016-11-12 12:12:54 -02:00
351395b7ea
Use a wrapper script to bypass check-manifest if not under git
...
Related to comment in #2051
2016-11-12 11:39:41 -02:00
0fab78ee8f
Merge pull request #2054 from nicoddemus/merge-master-features
...
Merge master into features after 3.0.4 release
2016-11-11 22:39:13 +01:00
71b68334e2
Merge pull request #2055 from nicoddemus/error-matrix-for-failing-jobs
...
Allow problematic jobs to fail instead of commenting them out
2016-11-11 22:38:33 +01:00
Ronny Pfannschmidt
Bruno Oliveira
nmundar
Luke Murphy
Ana Vojnovic
Duncan Betts
Ned Batchelder
Sebastian Ramacher
Floris Bruynooghe
Igor Starikov