jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,950 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

5950 Commits

Author SHA1 Message Date
Bruno Oliveira d99ceb1218 Merge pull request #1844 from nicoddemus/importer-error 
Importer loader error
 2016-08-22 20:47:25 -03:00
Bruno Oliveira b54ea74d4d Update AUTHORS and CHANGELOG for #1837 2016-08-22 17:59:42 -03:00
Bruno Oliveira 6a8160b318 Add acceptance test for module loader 
Related to #1837
 2016-08-22 17:57:25 -03:00
Bruno Oliveira c3148d1d6b Merge pull request #1842 from Stranger6667/doc-fix 
Fix documentation
 2016-08-22 14:11:36 -03:00
Bruno Oliveira 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
Dmitry Dygalo 3fbf2e7a80 Fix documentation 2016-08-22 18:38:02 +02:00
Florian Bruhin af0ec120fe Merge pull request #1836 from asvetlov/patch-1 
Remove duplicated name
 2016-08-21 22:09:58 +02:00
Marcin Bachry 678750c8f8 Fix importer call 2016-08-21 22:07:18 +02:00
Andrew Svetlov 4e9c1fbe96 Remove duplicated name 2016-08-21 22:20:29 +03:00
Ronny Pfannschmidt 406777d104 mark plugin: move the unclean marked parameter extraction 2016-08-21 20:44:37 +02:00
Florian Bruhin 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
Bruno Oliveira 6a0e849067 Update HOWTORELEASE based on the 3.0.0 release 2016-08-20 15:47:34 -03:00
Florian Bruhin 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
Florian Bruhin 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
Daniel Hahler 86ec3f37af minor: s/no pkg_resources/pkg_resources/ 2016-08-20 18:47:42 +02:00
Daniel Hahler e306a53999 Fix spelling: s/outside a/outside of a/ 2016-08-20 18:43:39 +02:00
Florian Bruhin 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
Bruno Oliveira 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
Daniel Hahler 87d2d1d838 Remove duplicate entry for #717 in CHANGELOG 2016-08-20 15:12:08 +02:00
Bruno Oliveira 9aec8d9a47 py.test team -> Pytest team :) 2016-08-19 18:59:13 -03:00
Bruno Oliveira c8f53d6690 Fix typo in 3.0.0 release announcement 2016-08-19 18:58:14 -03:00
Bruno Oliveira 875bcd4224 Add 3.0.0 release announcement to index.rst 2016-08-19 18:30:11 -03:00
Bruno Oliveira 63dc71c57e Fix regression when using importorskip at module level 
Fix #1822
 2016-08-19 18:21:25 -03:00
Bruno Oliveira db922403cc Bump version to 3.1.0.dev 2016-08-19 17:44:07 -03:00
Bruno Oliveira 3a200b75c9 Bump version to 3.0.1.dev 2016-08-19 17:41:45 -03:00
Bruno Oliveira 745c8c17f1 Merge remote-tracking branch 'upstream/master' 2016-08-19 17:38:21 -03:00
Bruno Oliveira 5ecf3d78f1 Merge pull request #1819 from matthiasha/patch-1 
Documentation update for rootdir discovery
 2016-08-19 17:36:44 -03:00
Bruno Oliveira b85a3b0d71 Merge pull request #1820 from The-Compiler/changelog-duplicates 
Remove duplicate CHANGELOG messages
 2016-08-19 17:35:23 -03:00
Bruno Oliveira 8777f61e7b Merge pull request #1818 from nicoddemus/release-3.0 
Release 3.0
 2016-08-19 17:33:15 -03:00
Florian Bruhin 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
matthiasha c8fbf3ae34 remove dot in pytest 2016-08-19 14:02:25 +02:00
matthiasha 3455dfc804 add missing @matthiasha link 2016-08-19 14:01:07 +02:00
matthiasha cd39cc1eec Mention doc update in CHANGELOG 2016-08-19 09:08:11 +02:00
matthiasha ccfa8d15bf Update AUTHORS 2016-08-19 09:04:19 +02:00
matthiasha 799dab9dba Documentation update for rootdir discovery 
This covers issue https://github.com/pytest-dev/pytest/issues/1435.
 2016-08-19 09:01:12 +02:00
Bruno Oliveira c74ce371ab Add release announcement 2016-08-18 12:02:01 -04:00
Bruno Oliveira 7f18367582 Finalize CHANGELOG 2016-08-18 11:43:21 -04:00
Bruno Oliveira a3e6c14da3 Bump version to 3.0.0 2016-08-18 11:41:10 -04:00
Florian Bruhin be9356aeba Merge pull request #1817 from nicoddemus/regendoc-run 
Run regendoc for 3.0 release
 2016-08-18 15:31:03 +02:00
Bruno Oliveira 9ce30e0085 Run regendoc for 3.0 release 2016-08-18 08:27:16 -04:00
Bruno Oliveira 3748112a94 Merge pull request #1816 from nicoddemus/merge-master-into-features 
Merge master into features
 2016-08-18 08:48:01 -03:00
Bruno Oliveira 0334e75c30 Use "pytest" instead of "py.test" on trial environments 2016-08-18 08:37:55 -03:00
Bruno Oliveira 56df9fcc72 Tweak CHANGELOG: move "change" entry to the proper place 2016-08-17 23:08:13 -03:00
Bruno Oliveira 66673c0dd3 Remove obsolete docstring 2016-08-17 22:59:18 -03:00
Bruno Oliveira 030c42203d Fix conflicts in CHANGELOG 2016-08-17 22:58:12 -03:00
Bruno Oliveira 3ba475c0f2 Move internal _is_unittest_unexpected_success_a_failure to "compat" module 
Fix #1815
 2016-08-17 22:50:10 -03:00
Bruno Oliveira 463e6572c5 Merge branch 'master' into merge-master-into-features 
Preparing for 3.0
 2016-08-17 22:39:23 -03:00
Bruno Oliveira 3e685d6a8d Merge pull request #1795 from hackebrot/fix-report-outcome-for-xpass 
WIP Change outcome to 'passed' for xfail unless it's strict
 2016-08-17 22:18:06 -03:00
Bruno Oliveira 68ebf552a1 Merge remote-tracking branch 'upstream/master' into fix-report-outcome-for-xpass 2016-08-17 21:55:10 -03:00
Bruno Oliveira a01cbce662 Merge pull request #1814 from nicoddemus/py35-trial-windows 
Enable py35-trial testenv on Windows
 2016-08-17 21:54:47 -03:00