From 5e9f1e97a579c0d188216266f1302b3171dde832 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 08:38:45 -0400 Subject: [PATCH 1/2] fix pytest --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index 73e45be556..92e72fd59d 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,3 @@ [pytest] +addopts = -n auto norecursedirs = vendor patched From fcbda182e4c4c1a4932caa94b343afe856db19a4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 08:39:07 -0400 Subject: [PATCH 2/2] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1c3b812b4b..2cee54557f 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ venv.bak/ # End of https://www.gitignore.io/api/python,macos # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option) +.vs/slnx.sqlite