Commit Graph

8088 Commits

Author SHA1 Message Date
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 3f5e06ecc4
Merge pull request #3659 from nicoddemus/merge-master-into-features
Merge master into features
2018-07-04 21:11:28 -03: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 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
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
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 8680dfc939
Merge pull request #3629 from egnartsms/issue-2220-param-breaks-dep
Make test parametrization override indirect fixtures
2018-06-28 21:43:21 -03:00
Serhii Mozghovyi 76ac670f7d Add changelog description 2018-06-28 23:42:18 +03:00
Bruno Oliveira 7b47dfb744
Merge pull request #3634 from RonnyPfannschmidt/merge-from-master
Merge from master
2018-06-28 14:05:18 -03:00
Ronny Pfannschmidt 3c73d6298a merge from master to features 2018-06-28 17:32:41 +02:00
Serhii Mozghovyi c220fb235a Minor fix (code improvement) 2018-06-28 14:53:06 +03:00
Serhii Mozghovyi 1dc5e97ac2 Make test parametrization override indirect fixtures 2018-06-28 14:32:29 +03:00
Bruno Oliveira e9371a58a0
Merge pull request #3622 from RonnyPfannschmidt/builtin-serialize
move report classes to own file to prepare for serialisazion
2018-06-27 15:17:09 -03: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
Bruno Oliveira ea379ba10f
Merge pull request #3623 from RonnyPfannschmidt/pytester-runexamples
Pytester runexamples
2018-06-27 09:13:29 -03:00
Bruno Oliveira 9a56bb05be Skip AppVeyor builds on tag pushes
We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
might as well save resources
2018-06-27 08:28:34 -03:00
Ronny Pfannschmidt 17e01993d9 regendoc and invocation fixes 2018-06-27 08:28:21 +02:00
Ronny Pfannschmidt 8a6345515b regendoc 2018-06-27 06:52:54 +02:00
Ronny Pfannschmidt 581d49635e add docs and changelog 2018-06-27 06:52:36 +02:00
Bruno Oliveira ef1b91ba87
Merge pull request #3606 from RonnyPfannschmidt/fix-3605
Fix 3605
2018-06-26 22:14:28 -03:00
Ronny Pfannschmidt e860ff7299 port some acceptance tests over to copy_example 2018-06-26 22:59:40 +02:00
Ronny Pfannschmidt 0672bc633f enable pytester to run examples copied from the cwd 2018-06-26 22:48:33 +02:00
Ronny Pfannschmidt 2dfb52f7e0 fix rebase artifacts 2018-06-26 22:10:26 +02:00
Ronny Pfannschmidt cc6eb9f83c move test reports to own file 2018-06-26 22:09:15 +02:00
Ronny Pfannschmidt 643e5a9c44 fix docs 2018-06-26 21:57:31 +02:00
Ronny Pfannschmidt b8486037d3 fix #3605 - unpack markdecorators from parameterization 2018-06-26 21:57:31 +02:00
Ronny Pfannschmidt 78a82c05ef consistent failure on all python versions for test_markers_from_parametrize 2018-06-26 21:57:31 +02:00
Ronny Pfannschmidt 853975d93b add failing test for #3605 2018-06-26 21:57:31 +02:00
Ronny Pfannschmidt 6b239263da
Merge pull request #3620 from RonnyPfannschmidt/merge-from-master
Merge from master
2018-06-26 21:56:09 +02:00
Ronny Pfannschmidt 89e0a3ec27 merge from master to features 2018-06-26 17:01:05 +02:00
Ronny Pfannschmidt f93995e15c
Merge pull request #3614 from asottile/upgrade_hooks
Upgrade hooks
2018-06-26 16:30:56 +02:00
Anthony Sottile f940967e23 Fix test offset after black moved code 2018-06-26 06:35:48 -07:00
Anthony Sottile cbaa7dd56a Upgrade pre-commit hooks except pyupgrade 2018-06-26 06:35:27 -07:00