From 20f3116e5845322a63a1f6b1a8c899f666cf208d Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 11 Jul 2018 09:40:26 -0700 Subject: [PATCH] Revert "Parallelize unit tests in CI with pytest-xdist" conda tests don't like it, and I'm not going to try to debug them right now. This reverts commit 9479f3c6b9da15aa7eb55a25543946357dbc4119. --- .circleci/config.yml | 2 +- dev-requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 550eb8c..07908dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - run: name: run unit tests command: | - py.test -n 4 tests/ + py.test tests/ # Run full installer test - setup_remote_docker diff --git a/dev-requirements.txt b/dev-requirements.txt index 9cda381..e079f8a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,2 +1 @@ pytest -pytest-xdist