Commit Graph

8069 Commits

Author SHA1 Message Date
Bruno Oliveira 317cd41215 Preparing release version 3.6.4 2018-07-28 12:59:04 +00:00
Bruno Oliveira 7f27512a48 Pin pluggy to <0.8 2018-07-28 09:46:35 -03:00
Bruno Oliveira fe06be8590
Merge pull request #3723 from pytest-dev/nicoddemus-patch-1
Use "pytest" on the CHANGELOG
2018-07-27 10:23:11 -03:00
Bruno Oliveira 79b4ca92d8
Use "pytest" on the CHANGELOG 2018-07-27 09:21:18 -03:00
Bruno Oliveira b7419bd9bb
Merge pull request #3710 from bmwiedemann/date
Do not claim copyright for future years
2018-07-23 11:14:39 -03:00
Bernhard M. Wiedemann 2e344d4d63 Do not claim copyright for future years
When building today's python-pytest-doc openSUSE package
in the year 2033, the documentation .html files state
Copyright 2015-2033 , holger krekel and pytest-dev team.

That cannot be correct, because nobody did anything copyright-worthy
for this file in 2033.

See also https://stackoverflow.com/questions/2390230/do-copyright-dates-need-to-be-updated

Additionally, this change makes the package build reproducible.
See https://reproducible-builds.org/ for why this is good.
2018-07-23 15:02:59 +02:00
Anthony Sottile f76142508f
Merge pull request #3694 from drewrisinger/patch-2
Fix mark.rst typos & grammar
2018-07-22 09:15:33 -07:00
Anthony Sottile be2afb950a
Merge pull request #3706 from ehershey/patch-1
typo - $PYTEST_ADDOTPS -> $PYTEST_ADDOPTS
2018-07-22 09:03:23 -07:00
E Hershey 19de1b7f29
typo - PYTEST_ADDOTPS -> PYTEST_ADDOPTS 2018-07-22 11:39:32 -04:00
Anthony Sottile 9720c3301a
Merge pull request #3690 from drewrisinger/patch-1
Fix fixture.rst typos & grammar
2018-07-17 18:13:41 -07:00
Drew 254689ff83
Fix mark.rst typos & grammar
Fix minor typos
2018-07-17 11:19:40 -04:00
Drew 21f5222784
Fix fixture.rst spelling & grammar
Fix a few typos.
2018-07-17 10:53:57 -04:00
Bruno Oliveira 771d3e8f4f
Merge pull request #3684 from Vlad-Shcherbina/type_comments
Replace broken type annotations with type comments
2018-07-15 11:52:12 -03:00
Bruno Oliveira 82a11e6207
Merge pull request #3680 from nicoddemus/labels
Manage GH labels using the new 'labels' tool
2018-07-15 11:34:20 -03:00
Bruno Oliveira a1c3df1889
Merge pull request #3683 from caramelomartins/master
[#3402] CITATION
2018-07-15 11:33:06 -03:00
Bruno Oliveira a821af6b1c
Merge pull request #3682 from nicoddemus/tox-release
Revamp the release script: drop invoke and use tox directly
2018-07-15 11:32:20 -03:00
Vlad Shcherbina 58e77f58bd Replace broken type annotations with type comments
Fixes #3635.
2018-07-15 16:58:39 +03:00
Hugo Martins 6a4fa4f485 Fix more linting issues 2018-07-14 16:44:47 +01:00
Hugo Martins 5be03bff61 Add changelog information 2018-07-14 16:37:55 +01:00
Hugo Martins e9fd038aae Fix linting issues 2018-07-14 16:35:33 +01:00
Hugo Martins a8464a95ce Add CITATION
Relates to #3402
2018-07-14 16:32:29 +01:00
Bruno Oliveira a0b0c37feb Revamp the release script: drop invoke and use tox directly
Following the lead from tox, use a simple Python script instead of depending
on ``invoke``.

Other changes:

* Some colors using ``colorama``.
* Run ``pre-commit`` before the final commit to ensure everything is neatly
  formatted.
* Drop generating local tag: legacy from the time we used ``devpi`` as staging
  area, currently we no longer use it, and we should push a
  tag from the last HEAD of the PR always to ensure it is correct.
2018-07-14 11:35:37 -03:00
Bruno Oliveira 35ffd29404 Manage GH labels using the new 'labels' tool 2018-07-14 10:12:52 -03:00
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