d28801d794
Make parametrize example deterministic
2016-08-03 16:48:11 -04:00
72df32f1fd
Fix missing print()
2016-08-03 17:34:55 -03:00
701d5fc727
Regendoc after more fixes on features branch
2016-08-03 16:31:44 -04:00
6e3105dc8f
Merge pull request #1787 from nicoddemus/fix-rewrite-conftest
...
Rewrite asserts in test-modules loaded very early in the startup
2016-08-03 16:10:55 -03:00
6711b1d6ab
Rewrite asserts in test-modules loaded very early in the startup
...
Also now match modules which start with any of the names registered
using register_assert_rewrite as discussed in #1787
Fix #1784
2016-08-03 12:49:48 -03:00
d5be6cba13
Merge pull request #1788 from nicoddemus/available-fixtures-sorted
...
Sort fixture names when a fixture lookup error occurs
2016-08-03 07:31:28 +02:00
277b6d3974
Sort fixture names when a fixture lookup error occurs
2016-08-02 19:45:31 -03:00
ea6191a0cd
Merge pull request #1779 from RonnyPfannschmidt/deselect-no-reason
...
terminal: dont pretend to know the deselection reason
2016-08-02 08:38:17 -03:00
9540106fe7
Merge pull request #1780 from nicoddemus/regen-pytest30
...
Run regen-docs for pytest 3.0
2016-08-02 12:07:16 +01:00
1c8fe962f3
add changelog entry
2016-08-02 10:51:10 +02:00
48f4e18280
fix deselect tests to match reason removal
2016-08-02 10:43:25 +02:00
21a90c8c50
Run regendoc again
2016-08-01 20:12:00 -04:00
eed21e06db
Sort yml items to get same results for regendoc runs
2016-08-01 20:09:35 -04:00
a6b2732507
Pass list of params to pytest.main() in docs
2016-08-01 20:09:35 -04:00
946466abf4
Run regen-docs for pytest 3.0
2016-08-01 20:09:35 -04:00
3cd2e37c55
Merge pull request #1783 from nicoddemus/inv-scoped-fixture-msg
...
Strip invocation-scope suffix when displaying fixture lookup error
2016-08-02 01:08:25 +01:00
553dc2600f
Strip invocation-scope suffix when displaying fixture lookup error
2016-08-01 20:34:56 -03:00
226f2795ba
Merge pull request #1782 from nicoddemus/invocation-fixtures-help
...
invocation-scoped fixtures show up once with --fixtures
2016-08-01 23:21:28 +01:00
b380eb5b34
Merge pull request #1781 from nicoddemus/highlight-file-loc
...
Highlight the path of file location in error report
2016-08-01 19:18:52 -03:00
44ecf2ab2f
invocation-scoped fixtures show up once with --fixtures
2016-08-01 18:48:29 -03:00
31c5194562
Fix broken test in py3k
2016-08-01 18:35:42 -03:00
3c8222f1db
Highlight the path of file location in error report
...
So that it's more obvious when we need to copy the file path.
2016-08-01 17:42:20 -03:00
ac215e9cff
terminal: dont pretend to know the deselection reason
...
this addresses #1372 - we pretend we know the deselection reason from internal plugins and ignore 3rd party/local reasons
2016-08-01 13:50:59 +02:00
aa145fa83e
Add 'invocation' scope option to fixture docstring
2016-07-29 12:47:30 -03:00
76fbc6379f
Fix deprecated directive in docstring
2016-07-29 12:39:48 -03:00
80508203b0
Merge pull request #1776 from nicoddemus/pytest-30-version
...
Set version to 3.0.0.dev1
2016-07-28 21:57:13 -03:00
eaf8d9ce19
Set version to 3.0.0.dev1
...
For a long time now we've considering the next version to be 3.0.0
2016-07-28 21:30:16 -03:00
510a6083ba
Merge pull request #1758 from nicoddemus/deprecated-module
...
Add deprecation module to centralize deprecation messages and bits of…
2016-07-28 22:36:55 +01:00
ffb583ae91
Merge pull request #1773 from nicoddemus/fix-freeze
...
Use PyInstaller for freeze test env
2016-07-27 15:06:54 +02:00
ae9d3bf886
Freeze docs: PyInstaller hook and wording
...
As discussed during the review, suggest in general
to use PyInstaller and just mention pytest.freeze_includes()
in less detail on how to actually use it, because it varies
from tool to tool.
2016-07-27 09:15:40 -03:00
7b1520687e
Merge pull request #1771 from nicoddemus/sort-links-changelog
...
Sort link refs in CHANGELOG
2016-07-27 06:26:45 +02:00
fd765f854c
Merge pull request #1772 from nicoddemus/pdf-link
...
Fix pdf links in docs and point to docs.pytest.org in README
2016-07-27 06:25:41 +02:00
ed36d627e4
Use PyInstaller for freeze test env
...
cx_freeze doesn't seem to be very well supported in Python 3.5.
Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.
Fix #1769
2016-07-26 22:02:37 -03:00
9a68681719
Point doc links in README to docs.pytest.org
2016-07-26 20:25:55 -03:00
0b8a91b858
Fix pdf links in the documentation
...
Fix #1436
2016-07-26 20:20:22 -03:00
5565c1f4ae
Sort link refs in CHANGELOG
2016-07-26 20:11:49 -03:00
c40dcb3c18
Merge pull request #1768 from ioggstream/1609-fix-description
...
fix keep-duplicates help line.
2016-07-26 11:34:06 +02:00
05728d1317
fix keep-duplicates help line.
2016-07-26 09:53:12 +02:00
b4ad4cc46e
Merge pull request #1767 from nicoddemus/merge-master
...
Merge master into features
2016-07-26 08:44:11 +02:00
c2864aba3d
Merge branch 'master' into merge-master
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/monkeypatch.py
# _pytest/python.py
2016-07-25 19:06:29 -03:00
9cf09cda7b
Remove some comments and improved changelog
2016-07-25 18:41:03 -03:00
eb5b163698
Merge branch '1609-features' of https://github.com/ioggstream/pytest into features
2016-07-25 18:37:55 -03:00
d911bfcb8a
Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest
...
# Conflicts:
# CHANGELOG.rst
2016-07-25 18:26:50 -03:00
8f29ce26e9
Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest
2016-07-25 18:20:17 -03:00
6c8b0a28e1
Add deprecation module to centralize deprecation messages and bits of code
2016-07-25 18:14:39 -03:00
d72afe7e08
Fixed scope override inside metafunc.parametrize. Fixes #634
2016-07-25 12:42:50 +02:00
ab6aef1d1f
feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.
2016-07-25 12:41:58 +02:00
a2b04d02c2
Merge pull request #1759 from Stranger6667/issue1579-invalid-class
...
Fixed collection of classes with custom ``__new__`` method. Fixes #1579 .
2016-07-25 12:27:51 +02:00
f7ad173fee
Fixed collection of classes with custom ``__new__`` method
2016-07-25 11:33:37 +02:00
d37af20527
Merge pull request #1765 from The-Compiler/1763-cleanup
...
Cleanups for #1763
2016-07-25 10:31:06 +02:00
Bruno Oliveira
Florian Bruhin
Floris Bruynooghe
Ronny Pfannschmidt
Raphael Pierzina
satoru
Roberto Polli
Dmitry Dygalo
Ronny Pfannschmidt