From 2f2477c4976b829824b0414ebb5a94bfa61e2ad2 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Tue, 29 Sep 2015 13:05:32 +0200 Subject: [PATCH 1/4] try no parallel run --- .travis/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/run.sh b/.travis/run.sh index a2618340996..9a8d5993431 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -58,4 +58,4 @@ tox -- -m unit $TOXARGS # the generated .pyc files and we'll get very strange errors. However as # long as we continue to run the unit tests first and in a seperate step # then this should work fine. -tox -- -m integration -n 8 $TOXARGS +tox -- -m integration $TOXARGS From 7a6f34b081655b4c708a6bf71ac235446aa4ca1e Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Tue, 29 Sep 2015 13:38:01 +0200 Subject: [PATCH 2/4] try pinning py.test now --- .travis/run.sh | 2 +- dev-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/run.sh b/.travis/run.sh index 9a8d5993431..a2618340996 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -58,4 +58,4 @@ tox -- -m unit $TOXARGS # the generated .pyc files and we'll get very strange errors. However as # long as we continue to run the unit tests first and in a seperate step # then this should work fine. -tox -- -m integration $TOXARGS +tox -- -m integration -n 8 $TOXARGS diff --git a/dev-requirements.txt b/dev-requirements.txt index a1eda389413..9fc1b430b04 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun pretend -pytest +pytest==2.7.3 pytest-capturelog pytest-timeout pytest-xdist From da37da61674250d5e43d1c6076b7c32a649ad052 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Tue, 29 Sep 2015 13:44:41 +0200 Subject: [PATCH 3/4] try pinning pytest to 2.7.2 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 9fc1b430b04..43576b1d153 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun pretend -pytest==2.7.3 +pytest==2.7.2 pytest-capturelog pytest-timeout pytest-xdist From d4d77db536b56618cef91df635dbaed2f9ebba74 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Tue, 5 Jan 2016 13:17:03 +0100 Subject: [PATCH 4/4] Try pinning back to 2.7.3 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 43576b1d153..9fc1b430b04 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ https://github.com/spulec/freezegun/archive/master.zip#egg=freezegun pretend -pytest==2.7.2 +pytest==2.7.3 pytest-capturelog pytest-timeout pytest-xdist