From eb4a09281ac83acf3e25fa58cbbbb3b30b3aa927 Mon Sep 17 00:00:00 2001
From: Matthieu Dartiailh <marul@laposte.net>
Date: Mon, 8 Mar 2021 10:19:45 +0100
Subject: [PATCH 1/2] cis: update azure configuration

---
 azure-pipelines.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 24d95fa7..b6b6ef66 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,15 +22,14 @@ pool:
 
 steps:
   - script: |
-      echo Activate conda
-      call $(CONDA_PATH)\activate.bat
+      export PATH="$HOME/miniconda3/bin:$PATH"
       echo Create environment
-      conda create -n test_ python=3.7 numpy --yes
+      conda create -n test_ python=3.9 numpy --yes
     displayName: "Create environment"
 
   - script: |
-      echo Activate conda
-      call $(CONDA_PATH)\activate.bat
+      export PATH="$HOME/miniconda3/bin:$PATH"
+      source $HOME/miniconda3/bin/activate
       echo Activate environment
       call conda activate test_
       echo Install project
@@ -39,8 +38,8 @@ steps:
     displayName: "Install dependencies"
 
   - script: |
-      echo Activate conda
-      call $(CONDA_PATH)\activate.bat
+      export PATH="$HOME/miniconda3/bin:$PATH"
+      source $HOME/miniconda3/bin/activate
       echo Activate environment
       call conda activate test_
       echo Install pytest and co
@@ -50,8 +49,8 @@ steps:
     displayName: "Run tests"
 
   - script: |
-      echo Activate conda
-      call $(CONDA_PATH)\activate.bat
+      export PATH="$HOME/miniconda3/bin:$PATH"
+      source $HOME/miniconda3/bin/activate
       echo Activate environment
       call conda activate test_
       echo Install codecov
@@ -61,7 +60,7 @@ steps:
     displayName: "Upload test coverage results"
 
   - script: |
-      call $(CONDA_PATH)\activate.bat
+      export PATH="$HOME/miniconda3/bin:$PATH"
       conda remove -n test_ --all --yes
     displayName: "Remove test environment"
     condition: always()

From fab1a44c7eecba5378bc9e85ba762111eedae1c8 Mon Sep 17 00:00:00 2001
From: Matthieu Dartiailh <marul@laposte.net>
Date: Mon, 8 Mar 2021 12:35:48 +0100
Subject: [PATCH 2/2] cis: update azure configuration

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b6b6ef66..b98d8ab2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,7 +17,7 @@ variables:
   PYVISA_KEYSIGHT_VIRTUAL_INSTR: 1
 
 pool:
-  name: default
+  name: Keysight-based
   demands: KEYSIGHT -equals TCPIP
 
 steps: