c5675d3efc
Remove merge-conflict marker merged by accident
...
Unfortunately rst-lint didn't catch that
2016-08-23 23:43:05 -03:00
6359894fe4
Merge pull request #1859 from nicoddemus/merge-master-into-features
...
Merge master into features
2016-08-23 23:39:01 -03:00
972a5fb5d5
Improve error message when passing non-string ids to pytest.mark.parametrize
...
Fix #1857
2016-08-23 23:31:45 -03:00
7704f73db9
Merge branch 'master' into merge-master-into-features
2016-08-23 21:36:42 -03:00
ea0febad28
Updates for new patch version 3.0.2
2016-08-23 21:33:57 -03:00
ecb20b96fc
Merge pull request #1856 from nicoddemus/release-3.0.1
...
Changes for 3.0.1 release
2016-08-23 21:21:24 -03:00
49fc4e5e4c
Changes for 3.0.1 release
2016-08-23 18:15:43 -04:00
3c866e7080
Merge pull request #1855 from nicoddemus/fix-empty-parametrize-ids
...
Fix internal error when parametrizing using and empty list of ids()
2016-08-23 23:38:27 +02:00
df200297e2
Fix internal error when parametrizing using and empty list of ids()
...
Fix #1849
2016-08-23 18:18:46 -03:00
7538680c98
Merge pull request #1847 from nicoddemus/parametrize-session-scopes
...
Fix code which guesses parametrized scope based on arguments
2016-08-23 18:03:52 +02:00
d3f4b3d14a
mend
2016-08-23 16:50:00 +01:00
a1597aca89
Added #1853 to changelog as requested on PR.
2016-08-23 16:48:24 +01:00
7d498fdc82
Added myself as AUTHOR as requested on PR.
2016-08-23 16:47:15 +01:00
2f11a85698
Import pkg_resources only when necessary.
2016-08-23 16:41:11 +01:00
847067fb02
Merge pull request #1851 from adamchainz/deprecated_setup.cfg
...
Delete unreferenced setup.cfg from docs
2016-08-23 12:35:48 -03:00
1673667232
Delete unreferenced setup.cfg from docs
...
Noticed it's not using the new `[tool:pytest]` header as changed in #567 , can't find any reference to it or `testfilepatterns`. It was added in b1e4301457
2016-08-23 16:08:24 +01:00
53a0e2b118
Fix code which guesses parametrized scope based on arguments
...
Fix #1832
2016-08-22 21:05:41 -03:00
d99ceb1218
Merge pull request #1844 from nicoddemus/importer-error
...
Importer loader error
2016-08-22 20:47:25 -03:00
b54ea74d4d
Update AUTHORS and CHANGELOG for #1837
2016-08-22 17:59:42 -03:00
6a8160b318
Add acceptance test for module loader
...
Related to #1837
2016-08-22 17:57:25 -03:00
c3148d1d6b
Merge pull request #1842 from Stranger6667/doc-fix
...
Fix documentation
2016-08-22 14:11:36 -03:00
b0ede044ac
Merge pull request #1835 from RonnyPfannschmidt/mark-extract-param
...
mark plugin: move the unclean marked parameter extraction
2016-08-22 14:11:11 -03:00
3fbf2e7a80
Fix documentation
2016-08-22 18:38:02 +02:00
af0ec120fe
Merge pull request #1836 from asvetlov/patch-1
...
Remove duplicated name
2016-08-21 22:09:58 +02:00
678750c8f8
Fix importer call
2016-08-21 22:07:18 +02:00
4e9c1fbe96
Remove duplicated name
2016-08-21 22:20:29 +03:00
406777d104
mark plugin: move the unclean marked parameter extraction
2016-08-21 20:44:37 +02:00
abe8f5e23f
Merge pull request #1824 from nicoddemus/update-howtorelease
...
Update HOWTORELEASE based on the 3.0.0 release
2016-08-20 23:03:59 +02:00
6a0e849067
Update HOWTORELEASE based on the 3.0.0 release
2016-08-20 15:47:34 -03:00
a20c3f9c44
Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a-
...
Fix spelling: s/outside a/outside of a/
2016-08-20 20:04:58 +02:00
783aff17dd
Merge pull request #1828 from blueyed/minor-s-no-pkg_resources-pkg_resources-
...
minor: s/no pkg_resources/pkg_resources/
2016-08-20 20:04:48 +02:00
86ec3f37af
minor: s/no pkg_resources/pkg_resources/
2016-08-20 18:47:42 +02:00
e306a53999
Fix spelling: s/outside a/outside of a/
2016-08-20 18:43:39 +02:00
90fb8cb08b
Merge pull request #1823 from nicoddemus/importorskip-regression
...
Fix regression when using importorskip at module level
2016-08-20 18:37:14 +02:00
5129c2f867
Merge pull request #1826 from blueyed/Remove-duplicate-entry-for-#717-in-CHANGELOG
...
Remove duplicate entry for #717 in CHANGELOG
2016-08-20 11:21:53 -03:00
87d2d1d838
Remove duplicate entry for #717 in CHANGELOG
2016-08-20 15:12:08 +02:00
9aec8d9a47
py.test team -> Pytest team :)
2016-08-19 18:59:13 -03:00
c8f53d6690
Fix typo in 3.0.0 release announcement
2016-08-19 18:58:14 -03:00
875bcd4224
Add 3.0.0 release announcement to index.rst
2016-08-19 18:30:11 -03:00
63dc71c57e
Fix regression when using importorskip at module level
...
Fix #1822
2016-08-19 18:21:25 -03:00
db922403cc
Bump version to 3.1.0.dev
2016-08-19 17:44:07 -03:00
3a200b75c9
Bump version to 3.0.1.dev
2016-08-19 17:41:45 -03:00
745c8c17f1
Merge remote-tracking branch 'upstream/master'
2016-08-19 17:38:21 -03:00
5ecf3d78f1
Merge pull request #1819 from matthiasha/patch-1
...
Documentation update for rootdir discovery
2016-08-19 17:36:44 -03:00
b85a3b0d71
Merge pull request #1820 from The-Compiler/changelog-duplicates
...
Remove duplicate CHANGELOG messages
2016-08-19 17:35:23 -03:00
8777f61e7b
Merge pull request #1818 from nicoddemus/release-3.0
...
Release 3.0
2016-08-19 17:33:15 -03:00
31ede2432c
Remove duplicate CHANGELOG messages
...
Those are both already mentioned in the breaking changes at the top.
2016-08-19 17:05:02 +02:00
c8fbf3ae34
remove dot in pytest
2016-08-19 14:02:25 +02:00
3455dfc804
add missing @matthiasha link
2016-08-19 14:01:07 +02:00
cd39cc1eec
Mention doc update in CHANGELOG
2016-08-19 09:08:11 +02:00
Bruno Oliveira
Florian Bruhin
Ronny Pfannschmidt
Raquel Alegre
Adam Chainz
Dmitry Dygalo
Marcin Bachry
Andrew Svetlov
Ronny Pfannschmidt
Daniel Hahler
Florian Bruhin
matthiasha