From d4a173e21de8c80a6fd4817c4b6cff58248db6cf Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sun, 2 Jun 2019 11:43:50 +0100 Subject: [PATCH 1/3] CI: dependencies for pytest and Python 3.5 --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index d0a48bd3f8b27..facb34c6c5b06 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -26,5 +26,5 @@ dependencies: - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda - - pytest>=4.0.2 + - pytest>=4.0.2,!=4.6.0 - html5lib==1.0b2 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 591266348a5f1..973107a759e1c 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -25,7 +25,7 @@ dependencies: - pip: - python-dateutil==2.5.3 # universal - - pytest>=4.0.2 + - pytest>=4.0.2,!=4.6.0 - pytest-xdist - pytest-mock - hypothesis>=3.58.0 From 0b4af135e1bba54989f7a547566f5c87f1ee442b Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sun, 2 Jun 2019 11:50:07 +0100 Subject: [PATCH 2/3] pin to 4.5.0 --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index facb34c6c5b06..dffcdcf16197c 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -26,5 +26,5 @@ dependencies: - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda - - pytest>=4.0.2,!=4.6.0 + - pytest=4.5.0 - html5lib==1.0b2 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 973107a759e1c..bd14489e030f5 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -25,7 +25,7 @@ dependencies: - pip: - python-dateutil==2.5.3 # universal - - pytest>=4.0.2,!=4.6.0 + - pytest=4.5.0 - pytest-xdist - pytest-mock - hypothesis>=3.58.0 From e2d838eda95f1579c12f27123b3ee3b795069222 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sun, 2 Jun 2019 11:56:40 +0100 Subject: [PATCH 3/3] double equal for pip section --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index dffcdcf16197c..e55a4fbdf3fa9 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -26,5 +26,5 @@ dependencies: - pip - pip: # for python 3.5, pytest>=4.0.2 is not available in conda - - pytest=4.5.0 + - pytest==4.5.0 - html5lib==1.0b2 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index bd14489e030f5..00c2051f29760 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -25,7 +25,7 @@ dependencies: - pip: - python-dateutil==2.5.3 # universal - - pytest=4.5.0 + - pytest==4.5.0 - pytest-xdist - pytest-mock - hypothesis>=3.58.0