From bd04fa85a09f99d2caa15d70b3495b52ab475f6b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 23 Jul 2019 08:53:18 -0500 Subject: [PATCH 1/4] pytest-xdist? --- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 6f85c32b9a915..41159020df4bc 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -40,7 +40,7 @@ dependencies: - xlwt # universal - pytest>=4.0.2 - - pytest-xdist + - pytest-xdist>=1.29.0 - pytest-cov - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 0d9a760914dab..52664c30a98d9 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -35,7 +35,7 @@ dependencies: - xlwt # universal - pytest>=4.0.2 - - pytest-xdist + - pytest-xdist>=1.29.0 - pytest-mock - pip - pip: From 37cb98971b804a4cb7c8e0904c3da7f3769cb030 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 23 Jul 2019 11:02:01 -0500 Subject: [PATCH 2/4] pytest 4.x --- ci/deps/travis-36-cov.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 41159020df4bc..d05e59c170e08 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -39,8 +39,8 @@ dependencies: - xlsxwriter - xlwt # universal - - pytest>=4.0.2 - - pytest-xdist>=1.29.0 + - pytest>=4.0.2,<5.0.0 + - pytest-xdist==1.28.0 - pytest-cov - pytest-mock - hypothesis>=3.58.0 From 332f292bebf841ac6d19f6759cf10498bf8c9449 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 23 Jul 2019 10:36:28 -0700 Subject: [PATCH 3/4] Remove deprecated container base --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8335a6ee92bef..9be4291d10874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false language: python python: 3.5 From 7f3bb23de0407f9eccabe64c5ca294cd4f9bbea5 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 23 Jul 2019 13:11:21 -0500 Subject: [PATCH 4/4] remove matplotlib from travis workers --- ci/deps/azure-36-locale.yaml | 1 - ci/deps/travis-36-cov.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 8f8273f57c3fe..7e78e3bf6f373 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -7,7 +7,6 @@ dependencies: - bottleneck=1.2.* - cython=0.28.2 - lxml - - matplotlib=2.2.2 - numpy=1.14.* - openpyxl=2.4.8 - python-dateutil diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index d05e59c170e08..b0b2d6ae77db8 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -11,7 +11,6 @@ dependencies: - gcsfs - geopandas - html5lib - - matplotlib - moto - nomkl - numexpr