Commit Graph

8345 Commits

Author SHA1 Message Date
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 5226c7fac3
Merge pull request #3665 from nicoddemus/changelog-tweaks
Small tweaks to the changelog entries
2018-07-10 21:12:50 -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 803302e70c Fix end-of-line in 2220.bugfix.rst 2018-07-07 11:13:48 -03:00
Bruno Oliveira 05f1d0d3ef Update README for CHANGELOG about using multiple paragraphs 2018-07-07 11:07:13 -03:00
Bruno Oliveira 1cd62f8c38 Update CHANGELOG template to put issue links at the start of entries
This allows us to use the new multi-line entries available with
towncrier 18.6.0
2018-07-07 11:02:33 -03:00
Bruno Oliveira a522fc745a Small tweaks to the changelog entries 2018-07-07 10:43:37 -03:00
Bruno Oliveira 303133f013
Merge pull request #3647 from jeffreyrack/3610-add-trace-option
3610 add trace option
2018-07-07 10:05:34 -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
Ronny Pfannschmidt 1e94ac784f
Merge pull request #3389 from jonozzz/features
Add package scoped fixtures #2283
2018-07-06 11:42:36 +02:00
Bruno Oliveira 027d2336b8 Add minimal docs for package-scoped fixtures (experimental) 2018-07-05 21:56:31 -03:00
Bruno Oliveira 3c19370cec Merge remote-tracking branch 'upstream/features' into jonozzz/features 2018-07-05 18:15:17 -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
Bruno Oliveira 3f5e06ecc4
Merge pull request #3659 from nicoddemus/merge-master-into-features
Merge master into features
2018-07-04 21:11:28 -03:00
Anthony Sottile 50f030d233 Correct code blocks in docs 2018-07-04 15:16:34 -07:00
Bruno Oliveira 7696d5371a Merge remote-tracking branch 'upstream/master' into features 2018-07-04 18:49:35 -03: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
Jeffrey Rackauckas 067de257e1 Fix test_pdb.py with pexpect 2018-07-02 21:03:21 -07:00
Jeffrey Rackauckas 4a925ef5e9 Fixing bug in test. 2018-07-02 20:29:59 -07:00
Jeffrey Rackauckas 4afb8c428b Fix python 2 issues 2018-07-02 20:20:42 -07:00
Jeffrey Rackauckas 2f1a2cf07f Fixing --trace test. 2018-07-02 19:55:08 -07:00
Jeffrey Rackauckas 6cc4fe2412 Fixing bad indentation 2018-07-02 19:53:46 -07:00
Jeffrey Rackauckas 10a8691eca Add support for yielded functions. 2018-07-02 19:46:26 -07:00
Jeffrey Rackauckas b75320ba95 Fix --trace option with yield tests. 2018-07-02 19:08:41 -07:00