From 7338d4088e884beb9a8ef5207c87318975c9b5f9 Mon Sep 17 00:00:00 2001 From: makbigc Date: Mon, 3 Jun 2019 00:45:00 +0800 Subject: [PATCH 1/2] Add pytest-azurepipelines to setup env --- ci/deps/azure-35-compat.yaml | 1 + ci/deps/azure-36-locale.yaml | 1 + ci/deps/azure-36-locale_slow.yaml | 1 + ci/deps/azure-37-locale.yaml | 1 + ci/deps/azure-37-numpydev.yaml | 1 + ci/deps/azure-macos-35.yaml | 1 + ci/deps/azure-windows-36.yaml | 2 ++ 7 files changed, 8 insertions(+) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index d0a48bd3f8b27..f60db48ec7e88 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -28,3 +28,4 @@ dependencies: # for python 3.5, pytest>=4.0.2 is not available in conda - pytest>=4.0.2 - html5lib==1.0b2 + - pytest-azurepipelines diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index f43ed0249985e..be4b0f03b9472 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -28,3 +28,4 @@ dependencies: - pip - pip: - html5lib==1.0b2 + - pytest-azurepipelines diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2a0404614dcfc..eecf30502c8e6 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -34,3 +34,4 @@ dependencies: - pip - pip: - hypothesis>=3.58.0 + - pytest-azurepipelines diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 649f5892f174d..48f0ca79b9189 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -33,3 +33,4 @@ dependencies: - pip: - hypothesis>=3.58.0 - moto # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed + - pytest-azurepipelines diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 6848b9990b46e..8ae409c8363e1 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -13,6 +13,7 @@ dependencies: - isort - pip - pip: + - pytest-azurepipelines - "git+git://github.com/dateutil/dateutil.git" - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" - "--pre" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 591266348a5f1..a02e175b791d6 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -29,3 +29,4 @@ dependencies: - pytest-xdist - pytest-mock - hypothesis>=3.58.0 + - pytest-azurepipelines diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 7b3ae259fb8dd..362934507c728 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -28,3 +28,5 @@ dependencies: - pytest-mock - hypothesis>=3.58.0 - isort + - pip: + - pytest-azurepipelines From 8d399f1335043cd5b803a3475b24c895ce42635a Mon Sep 17 00:00:00 2001 From: makbigc Date: Mon, 3 Jun 2019 10:18:02 +0800 Subject: [PATCH 2/2] Install pytest by conda directly --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/azure-windows-37.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index f60db48ec7e88..a188bb73ec8ea 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -10,6 +10,7 @@ dependencies: - numpy=1.13.3 - openpyxl=2.4.0 - pytables=3.4.2 + - pytest>=4.0.2 - python-dateutil=2.5.0 - python=3.5.* - pytz=2015.4 @@ -26,6 +27,5 @@ dependencies: - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda - - pytest>=4.0.2 - html5lib==1.0b2 - pytest-azurepipelines diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index a02e175b791d6..3b426a59504ea 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -15,6 +15,7 @@ dependencies: - openpyxl - pyarrow - pytables + - pytest>=4.0.2 - python=3.5.* - pytz - xarray @@ -25,7 +26,6 @@ dependencies: - pip: - python-dateutil==2.5.3 # universal - - pytest>=4.0.2 - pytest-xdist - pytest-mock - hypothesis>=3.58.0 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 5384e794d442a..0a753e9f81b5b 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -31,3 +31,5 @@ dependencies: - moto - hypothesis>=3.58.0 - isort + - pip: + - pytest-azurepipelines