From 75594ae214e3420d0c1f5a8b63490bc1dd1ba84e Mon Sep 17 00:00:00 2001 From: makbigc Date: Sun, 2 Jun 2019 19:25:06 +0800 Subject: [PATCH 1/6] Add pytest-azurepipelines in posix.yml and windows.yml --- ci/azure/posix.yml | 1 + ci/azure/windows.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index f53e284c221c6..717a5545ed72d 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -52,6 +52,7 @@ jobs: if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi echo "Creating Environment" ci/setup_env.sh + pip install pytest-azurepipelines displayName: 'Setup environment and build pandas' - script: | export PATH=$HOME/miniconda3/bin:$PATH diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index eeb03a0b28130..4d6c0cb71dcc8 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -25,6 +25,7 @@ jobs: displayName: Create anaconda environment - script: | call activate pandas-dev + call pip install pytest-azurepipelines call conda list ci\\incremental\\build.cmd displayName: 'Build' From f89b52132e11eea9d5c86ebd3d7b269e0dabe5c7 Mon Sep 17 00:00:00 2001 From: makbigc Date: Sun, 2 Jun 2019 20:57:20 +0800 Subject: [PATCH 2/6] Update pip version --- ci/azure/posix.yml | 1 + ci/azure/windows.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 717a5545ed72d..5da33a2e87a76 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -52,6 +52,7 @@ jobs: if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi echo "Creating Environment" ci/setup_env.sh + python -m pip install --update pip pip install pytest-azurepipelines displayName: 'Setup environment and build pandas' - script: | diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 4d6c0cb71dcc8..962a862c36e63 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -25,6 +25,7 @@ jobs: displayName: Create anaconda environment - script: | call activate pandas-dev + call python -m pip install --update pip call pip install pytest-azurepipelines call conda list ci\\incremental\\build.cmd From 76b4d5e889b7f69779d132693b9c661f384150a7 Mon Sep 17 00:00:00 2001 From: makbigc Date: Sun, 2 Jun 2019 22:57:47 +0800 Subject: [PATCH 3/6] Update pip by conda --- ci/azure/posix.yml | 2 +- ci/azure/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 5da33a2e87a76..3d56c3223ef66 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -52,7 +52,7 @@ jobs: if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi echo "Creating Environment" ci/setup_env.sh - python -m pip install --update pip + conda update pip pip install pytest-azurepipelines displayName: 'Setup environment and build pandas' - script: | diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 962a862c36e63..830962a277dcf 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -25,7 +25,7 @@ jobs: displayName: Create anaconda environment - script: | call activate pandas-dev - call python -m pip install --update pip + call conda update pip call pip install pytest-azurepipelines call conda list ci\\incremental\\build.cmd From 441eb5af3f5fc3cb7ac39708ec3d1d3ecff25cfb Mon Sep 17 00:00:00 2001 From: makbigc Date: Mon, 3 Jun 2019 21:23:44 +0800 Subject: [PATCH 4/6] Install pytest-azurepipelines together with pandas-dev --- ci/azure/posix.yml | 2 -- ci/azure/windows.yml | 2 -- 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 | 1 + ci/deps/azure-windows-37.yaml | 1 + 10 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 3d56c3223ef66..f53e284c221c6 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -52,8 +52,6 @@ jobs: if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi echo "Creating Environment" ci/setup_env.sh - conda update pip - pip install pytest-azurepipelines displayName: 'Setup environment and build pandas' - script: | export PATH=$HOME/miniconda3/bin:$PATH diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 830962a277dcf..eeb03a0b28130 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -25,8 +25,6 @@ jobs: displayName: Create anaconda environment - script: | call activate pandas-dev - call conda update pip - call pip install pytest-azurepipelines call conda list ci\\incremental\\build.cmd displayName: 'Build' diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index e55a4fbdf3fa9..1190e40283e08 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.5.0 - 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..18e6db9d57bac 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -18,3 +18,4 @@ dependencies: - "--pre" - "numpy" - "scipy" + - "pytest-azurepipelines" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 00c2051f29760..e60a60aac41e5 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..1a1ab0d486a9f 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -26,5 +26,6 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock + - pytest-azurepipelines - hypothesis>=3.58.0 - isort diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 5384e794d442a..2c90f5a5e6c13 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -28,6 +28,7 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock + - pytest-azurepipelines - moto - hypothesis>=3.58.0 - isort From 1041e9e3f93d7476e58718af22e283e0f35a2369 Mon Sep 17 00:00:00 2001 From: makbigc Date: Mon, 3 Jun 2019 21:46:21 +0800 Subject: [PATCH 5/6] Remove quote about pytest-azurepipelines --- ci/deps/azure-37-numpydev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 18e6db9d57bac..4e62ae329f171 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -18,4 +18,4 @@ dependencies: - "--pre" - "numpy" - "scipy" - - "pytest-azurepipelines" + - pytest-azurepipelines From 0d8bda6716f6b3feacb28753815664cbcf5dd7a0 Mon Sep 17 00:00:00 2001 From: makbigc Date: Sat, 8 Jun 2019 14:39:17 +0800 Subject: [PATCH 6/6] Install pytest-azurepipelines from conda-forge --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 1190e40283e08..4996b57462959 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -22,10 +22,10 @@ dependencies: - hypothesis>=3.58.0 - pytest-xdist - pytest-mock + - pytest-azurepipelines - isort - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda - pytest==4.5.0 - html5lib==1.0b2 - - pytest-azurepipelines diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index be4b0f03b9472..0393de9d4d978 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -23,9 +23,9 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock + - pytest-azurepipelines - hypothesis>=3.58.0 - isort - 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 eecf30502c8e6..1cdbea4b70c8d 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -29,9 +29,9 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock + - pytest-azurepipelines - moto - isort - 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 48f0ca79b9189..af5fe024e5a3d 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -28,9 +28,9 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock + - pytest-azurepipelines - isort - pip - 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