From 59ce28710de1d136007b74f75a9ef02e589ae9b2 Mon Sep 17 00:00:00 2001
From: Anthony Scopatz <scopatz@gmail.com>
Date: Mon, 28 Jan 2019 17:50:59 -0500
Subject: [PATCH] more CI test fixes

---
 azure-pipelines.yml    | 9 ++++++++-
 requirements-tests.txt | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7b07560a7..39c7d5677 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,17 +21,24 @@ jobs:
 
   # Conda Environment
   # Create and activate a Conda environment.
+  - task: CondaEnvironment@1
+    inputs:
+      packageSpecs: 'python=$(python.version) pygments prompt_toolkit ply pytest pytest-timeout numpy psutil matplotlib flake8 coverage pyflakes pytest-cov pytest-flake8 codecov'
+      installOptions: '-c conda-forge/label/cf201901'
+      updateConda: false
+    condition: eq(variables['python.version'], '3.5')
   - task: CondaEnvironment@1
     inputs:
       packageSpecs: 'python=$(python.version) pygments prompt_toolkit ply pytest pytest-timeout numpy psutil matplotlib flake8 coverage pyflakes pytest-cov pytest-flake8 codecov'
       installOptions: '-c conda-forge'
       updateConda: false
+    condition: ne(variables['python.version'], '3.5')
   - script: |
       pip install .
       xonsh run-tests.xsh --timeout=10 --junitxml=junit/test-results.xml
     displayName: 'Tests'
 
-# Publish build results
+  # Publish build results
   - task: PublishTestResults@2
     inputs:
       testResultsFiles: '**/test-*.xml'
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 3ebc7b8b7..aab12194d 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -2,7 +2,7 @@ ply
 py
 pytest
 flake8
-pyflakes
+pyflakes<2.1.0,>=2.0.0
 pytest-flake8
 pytest-cov
 pytest-timeout