tox.ini - Issue 29857615: Issue 6867 - Fix pytest 3.7.1 mock regression

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: tox.ini

Issue 29857615: Issue 6867 - Fix pytest 3.7.1 mock regression (Closed) Base URL: https://hg.adblockplus.org/cms

Left Patch Set: Created Aug. 16, 2018, 7:38 p.m.

Right Patch Set: Address PS1 Comments Created Aug. 16, 2018, 9:11 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 [tox]	1 [tox]

2 envlist = py27	2 envlist = py27
rhowell 2018/08/16 21:07:55 Unrelated, but why is this only testing Python 2? Unrelated, but why is this only testing Python 2? Just curious.
3 skipsdist = true	3 skipsdist = true

4	4

5 [flake8]	5 [flake8]

6 ignore = D1,C815	6 ignore = D1,C815

7 per-file-ignores =	7 per-file-ignores =

8 /cms/bin/generate_static_pages.py : A107,A301,A302,E501	8 /cms/bin/generate_static_pages.py : A107,A301,A302,E501

9 /cms/bin/test_server.py : A101,A107,A302,E501,F401	9 /cms/bin/test_server.py : A101,A107,A302,E501,F401

10 /cms/bin/translate.py : A107,A301,A302,E501,F821	10 /cms/bin/translate.py : A107,A301,A302,E501,F821

11 /cms/converters.py : A206,A302,D400,N802	11 /cms/converters.py : A206,A302,D400,N802

12 /cms/sources.py : A104,A107,A108,A206,A302,E501	12 /cms/sources.py : A104,A107,A108,A206,A302,E501

13 /cms/utils.py : A107,A302,E501	13 /cms/utils.py : A107,A302,E501

14 /runserver.spec : E501,F821	14 /runserver.spec : E501,F821

15 /tests/test_additional_paths.py : D401	15 /tests/test_additional_paths.py : D401

16	16

17 [testenv]	17 [testenv]

18 setenv =	18 setenv =

19 PYTHONPATH = {toxinidir}	19 PYTHONPATH = {toxinidir}

20 deps = flask	20 deps =
rhowell 2018/08/16 21:07:55 Maybe leave this on two different lines? Looks lik Maybe leave this on two different lines? Looks like that's standard for most of the other tox.ini files. Jon Sonesen 2018/08/16 21:10:41 Acknowledged. Show quoted text On 2018/08/16 21:07:55, rhowell wrote: > Maybe leave this on two different lines? Looks like that's standard for most of > the other tox.ini files. Acknowledged.
	21 flask

21 jinja2	22 jinja2

22 urllib3	23 urllib3

23 markdown	24 markdown

24 pytest	25 pytest

25 pytest-cov	26 pytest-cov

26 mock	27 mock
	Vasily Kuznetsov 2018/08/17 11:56:24 You don't really need to replace this dependency. You don't really need to replace this dependency. OTOH we don't really use pytest-mock API (and didn't before) so we might as well get rid of it, I guess. Jon Sonesen 2018/08/17 17:27:51 My bad, I just pushed this :/ in the docs they men Show quoted text On 2018/08/17 11:56:24, Vasily Kuznetsov wrote: > You don't really need to replace this dependency. OTOH we don't really use > pytest-mock API (and didn't before) so we might as well get rid of it, I guess. My bad, I just pushed this :/ in the docs they mention using the pip package for more up to date versions of the mock library.
27 wsgi_intercept	28 wsgi_intercept

28 flake8	29 flake8

29 flake8-per-file-ignores>=0.4	30 flake8-per-file-ignores>=0.4

30 flake8-docstrings	31 flake8-docstrings

31 flake8-commas	32 flake8-commas

32 pep8-naming	33 pep8-naming

33 hg+https://hg.adblockplus.org/codingtools#egg=flake8-eyeo&subdirectory=flake 8-eyeo	34 hg+https://hg.adblockplus.org/codingtools#egg=flake8-eyeo&subdirectory=flake 8-eyeo

34	35

35 commands =	36 commands =

36 py.test --cov-report term --cov-report html --cov=cms tests	37 py.test --cov-report term --cov-report html --cov=cms tests

37 flake8 cms tests runserver.py runserver.spec	38 flake8 cms tests runserver.py runserver.spec

LEFT	RIGHT