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

8046 Commits

Author SHA1 Message Date
Bruno Oliveira 0565a7a4e1
Merge pull request #3679 from nicoddemus/parametrized-internal-refactor 
Refactor parametrize() code for readability
 2018-07-12 21:31:06 -03:00
Bruno Oliveira 6c3713226c
Merge pull request #3642 from caramelomartins/master 
Fixes # 3592 - Clarify Fixtures' Documentation
 2018-07-11 23:31:51 -03:00
Bruno Oliveira 3e599dc149 Check that param sets match number of args during _for_parametrize 
It makes sense to validate them during creation of the parameter set
 2018-07-11 22:57:53 -03:00
Bruno Oliveira 54fbc6f6e1 Refactor parametrize() code for readability 
Extract the parametrize() block of code into methods for better
readability
 2018-07-11 21:29:21 -03:00
Bruno Oliveira aa47b64e2a
Improve CHANGELOG entry 2018-07-11 21:07:21 -03:00
Bruno Oliveira 251adbf644 Merge with upstream/master 2018-07-11 20:46:14 -03:00
Bruno Oliveira 2c4759ce57 Run regendocs 2018-07-11 20:37:50 -03:00
Bruno Oliveira 4dfe2eee94 Fix finalize call 2018-07-11 20:24:39 -03:00
Bruno Oliveira 593b451373
Merge pull request #3670 from asottile/remove_unused_fix_lint 
Remove unused fix-lint tox environment
 2018-07-10 19:08:31 -03:00
Anthony Sottile 898544e147
Merge pull request #3669 from asottile/yesqa 
Remove some extraneous `# noqa` comments
 2018-07-10 14:53:08 -07:00
Anthony Sottile 61301d934e Remove some extraneous `# noqa` comments 
This was partially automated with https://github.com/asottile/yesqa

_with a few caveats_:
- it was run under python2 (chosen arbitrarily, when run under python3 other
  things were changed)
- I used `git checkout -p` to revert the removal of `noqa` comments from
  `cmp()` lines.
 2018-07-08 17:05:52 -07:00
Anthony Sottile af0059079c Remove unused fix-lint tox environment 2018-07-08 17:05:01 -07:00
Bruno Oliveira 9ef7878cbc
Merge pull request #3668 from asottile/remove_obsolete_future_imports 
Remove obsolete __future__ imports
 2018-07-08 13:41:59 -03:00
Anthony Sottile 4ae93a7a07 Remove obsolete __future__ imports 2018-07-08 08:37:02 -07:00
Bruno Oliveira d4faa4056b
Merge pull request #3667 from asottile/avoid_sys_path_pollution_742 
Use -mpytest when invoking pytest in pytester
 2018-07-08 11:51:16 -03:00
Anthony Sottile 42bbb4fa8a Use -mpytest when invoking pytest in pytester 2018-07-07 17:18:44 -07:00
Bruno Oliveira 12c5b6104c
Merge pull request #3666 from nicoddemus/deploy-on-tags 
Skip deploy stage entirely unless we have a tag
 2018-07-07 20:40:14 -03:00
Bruno Oliveira aa9d1ad2eb
Merge pull request #3663 from nicoddemus/usefixtures-reference 
Add reference docs for pytest.mark.usefixtures
 2018-07-07 12:12:31 -03:00
Bruno Oliveira 49e82a4be8 Skip deploy stage entirely unless we have a tag 
Borrowed from https://github.com/tox-dev/tox/pull/877
 2018-07-07 12:12:07 -03:00
Bruno Oliveira d26a596072 Add a warning about usefixtures mark not working in fixtures 
Fix #1014
 2018-07-07 10:01:10 -03:00
Bruno Oliveira f359b50fe5 Adjust copyright in README 2018-07-06 21:03:27 -03:00
Bruno Oliveira 18b2fc11ad Dummy change 2018-07-06 20:57:30 -03:00
Bruno Oliveira d7b722e2ae Add reference docs for pytest.mark.usefixtures 2018-07-06 20:55:42 -03:00
Bruno Oliveira 7e8f7bfa16
Merge pull request #3660 from asottile/code_highlight_fix 
Correct code blocks in docs
 2018-07-05 07:17:03 -03:00
Anthony Sottile 50f030d233 Correct code blocks in docs 2018-07-04 15:16:34 -07:00
Bruno Oliveira b64c26674d
Merge pull request #3656 from nicoddemus/release-3.6.3 
Release 3.6.3
 2018-07-04 18:45:45 -03:00
Bruno Oliveira 63b25304c3 Run pre-commit fixers 2018-07-03 22:20:29 -03:00
Bruno Oliveira 73d787df3a HOWTORELEASE: create branch first and run pre-commit after generate-release task 
This makes more sense because we need to install from
tasks/requirements.txt
 2018-07-03 22:15:23 -03:00
Bruno Oliveira fa3161011a Improve CHANGELOG for 3.6.3 2018-07-03 22:07:51 -03:00
Bruno Oliveira 2921ca6e64 Run pre-commit on all doc files 2018-07-03 21:58:18 -03:00
Bruno Oliveira 43c0346d68 Preparing release version 3.6.3 2018-07-04 00:51:21 +00:00
Bruno Oliveira 3ed8e28ef3
Merge pull request #3654 from LeastAuthority/3653.deprecated-convert 
Switch to new API
 2018-07-03 21:46:26 -03:00
Bruno Oliveira b84a646389
Add note to the changelog 2018-07-03 21:08:27 -03:00
Hugo Martins 8232fd1a2d Fix remaining "smtp" references 2018-07-03 23:24:59 +01:00
Hugo Martins f52a5d3be2 Merge remote-tracking branch 'upstream/master' 2018-07-03 23:11:35 +01:00
Jean-Paul Calderone b815f67e65 add changelog 2018-07-03 13:40:04 -04:00
Jean-Paul Calderone 55ebf261ce Switch to new API 2018-07-03 13:37:03 -04:00
Bruno Oliveira b50911285a
Merge pull request #3648 from eelstork/patch-1 
Fix monkeypatch doc
 2018-07-02 10:34:05 -03:00
T.E.A de Souza a43205b4bc
Fix monkeypatch doc 
`delenv` is incorrectly documented.
 2018-07-02 21:01:41 +08:00
Bruno Oliveira 2b75a311a7
Merge pull request #3637 from RonnyPfannschmidt/fix-3631 
fix #3631 - don't store legacy markinfo when its impossible
 2018-06-30 17:48:46 -03:00
Bruno Oliveira 26e1784e52
Merge pull request #3641 from Sup3rGeo/bugfix/logfile-unicode 
Fixes #3630
 2018-06-30 17:47:24 -03:00
victor dad3e77319 Improve test readability. 2018-06-30 18:57:24 +02:00
Victor 3a1c15316b Updated test for python 2.7 2018-06-30 16:11:20 +02:00
Hugo Martins f7c929c932 Fix linting errors in docs/fixtures.rst 2018-06-30 14:34:19 +01:00
Hugo Martins b48f1d378b Clarify examples in fixtures' documentation 2018-06-30 02:01:49 +01:00
Victor a6636fddcd Fixed open function with encoding in python 2.7 2018-06-29 17:04:30 +02:00
Victor 738933938a Added changelog. 2018-06-29 16:18:16 +02:00
Victor 342f2cdc17 Fixes #3630 2018-06-29 16:09:39 +02:00
Ronny Pfannschmidt 5bd5b8c68a fix #3631 - don't store legacy markinfo when its impossible 2018-06-29 14:01:20 +02:00
Bruno Oliveira a48c47b53b
Merge pull request #3624 from nicoddemus/skip-appveyor-tags 
Skip AppVeyor builds on tag pushes
 2018-06-27 12:12:21 -03:00