From 8884e69559f556c95e5c0fefffdda774486412e6 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 11:09:07 -0500
Subject: [PATCH 01/22] adding azure-pipelines

---
 azure-pipelines.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cfe1e301e14..a51dadab04c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,14 +13,9 @@ jobs:
     vmImage: 'Ubuntu-16.04'
   strategy:
     matrix:
-      Python27:
-        python.version: '2.7'
-      Python35:
-        python.version: '3.5'
       Python36:
         python.version: '3.6'
-      Python37:
-        python.version: '3.7'
+
     maxParallel: 4
 
   steps:
@@ -29,13 +24,12 @@ jobs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
 
-  - script: python -m pip install --upgrade pip && pip install -r requirements.txt
-    displayName: 'Install dependencies'
 
-  - script: |
-      pip install pytest
-      pytest tests --doctest-modules --junitxml=junit/test-results.xml
-    displayName: 'pytest'
+  - script: source ci-helpers/install_tardis_env.sh
+    displayName: 'Install TARDIS env'
+
+  - script: python setup.py $SETUP_CMD
+    displayName: 'TARDIS test'
 
   - task: PublishTestResults@2
     inputs:

From a352b2626f0994dda81103689c80af5fc28105ef Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 11:18:32 -0500
Subject: [PATCH 02/22] cd into tardis

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a51dadab04c..0621e473613 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,7 @@ jobs:
       architecture: 'x64'
 
 
-  - script: source ci-helpers/install_tardis_env.sh
+  - script: cd tardis && source ci-helpers/install_tardis_env.sh
     displayName: 'Install TARDIS env'
 
   - script: python setup.py $SETUP_CMD

From e56a8afa4235a5365dfbec7180e4b41de96e244e Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 14:37:17 -0500
Subject: [PATCH 03/22] fix up travis

---
 .travis.yml                        | 20 ++------------------
 ci-helpers/fetch_reference_data.sh | 16 ++++++++++------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ea2f7281f8..a03fe049c0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,24 +38,8 @@ cache:
 before_install:
     # We do this to make sure we get the dependencies so pip works below
     - source ci-helpers/install_miniconda.sh
-    - source ci-helpers/install_tardis_env.sh
-    #- if [[ $TEST_MODE == 'spectrum' ]]; then conda install -c conda-forge git-lfs=2.2.1 -y; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs install --skip-smudge; fi
-    - echo git clone $REF_DATA_GITHUBURL $REF_DATA_HOME
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git clone $REF_DATA_GITHUBURL $REF_DATA_HOME; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then cd $REF_DATA_HOME; fi
-# Use the following to get the ref-data from the master;
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git checkout origin/master; fi
-    # Use the following to get the ref-data from a specific pull request; 
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git fetch origin pull/17/head:update-ref; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git checkout update-ref; fi
-
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="atom_data/chianti_He.h5" origin; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then git lfs pull --include="unit_test_data.h5" origin; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then echo MD5 `md5sum unit_test_data.h5`; fi
-    - if [[ $TEST_MODE == 'spectrum' ]]; then cd $TRAVIS_BUILD_DIR; fi
+    - if [[ $TEST_MODE == 'spectrum' ]]; then source ci-helpers/fetch_reference_data.sh; fi
+    -
 
 #- source ci-helpers/fetch_reference_data.sh
 
diff --git a/ci-helpers/fetch_reference_data.sh b/ci-helpers/fetch_reference_data.sh
index 9002286ca2b..f97830fedeb 100644
--- a/ci-helpers/fetch_reference_data.sh
+++ b/ci-helpers/fetch_reference_data.sh
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
-git lfs install
+git lfs install --skip-smudge
+
 if test -e $REF_DATA_HOME; then
     echo "Ref data available"
 else
-    git clone https://github.com/tardis-sn/tardis-refdata.git $REF_DATA_HOME
+    echo git clone $REF_DATA_GITHUBURL $REF_DATA_HOME
+    git clone $REF_DATA_GITHUBURL $REF_DATA_HOME
+
 cd $REF_DATA_HOME
 # Use the following to get the ref-data from the master;
 git fetch origin
 git checkout origin/master
 # Use the following to get the ref-data from a specific pull request
 #git fetch origin pull/11/head:thomson-ref
-git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin/master
-git lfs pull --include="atom_data/chianti_He.h5" origin/master
-git lfs pull --include="plasma_reference/" origin/master
-git lfs pull --include="unit_test_data.h5" origin/master
+git lfs pull --include="atom_data/kurucz_cd23_chianti_H_He.h5" origin
+git lfs pull --include="atom_data/chianti_He.h5" origin
+git lfs pull --include="plasma_reference/" origin
+git lfs pull --include="unit_test_data.h5" origin
+echo MD5 `md5sum unit_test_data.h5`; fi
 cd $TRAVIS_BUILD_DIR

From b8c102604233475e3146833788c0a442072c9723 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 14:38:41 -0500
Subject: [PATCH 04/22] look at azure build environment

---
 azure-pipelines.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0621e473613..f1c60356560 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,10 @@ jobs:
       architecture: 'x64'
 
 
-  - script: cd tardis && source ci-helpers/install_tardis_env.sh
+  - script: |
+        pwd
+        ls ci-helpers
+        bash ./ci-helpers/install_tardis_env.sh
     displayName: 'Install TARDIS env'
 
   - script: python setup.py $SETUP_CMD

From 7d72ce04faf74775ec7072b96b74cc7a677d9533 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 14:48:56 -0500
Subject: [PATCH 05/22] switch to conda activte

---
 ci-helpers/install_tardis_env.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-helpers/install_tardis_env.sh b/ci-helpers/install_tardis_env.sh
index a2132ef17b1..244c588c42c 100644
--- a/ci-helpers/install_tardis_env.sh
+++ b/ci-helpers/install_tardis_env.sh
@@ -7,7 +7,7 @@ else
    conda env create -f tardis_env3.yml
    #trouble with building due to segfault at cython (https://github.com/cython/cython/issues/2199)
    #remove if we can get normal cython through conda
-   source activate tardis3
+   conda activate tardis3
 fi
 
-source activate tardis3
+conda activate tardis3

From edc042b9ae2fc655f2101e1446d93677906cfff5 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 14:54:47 -0500
Subject: [PATCH 06/22] enable conda activate

---
 azure-pipelines.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f1c60356560..3ec3c80e412 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,7 +24,9 @@ jobs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
 
-
+  - script: |
+        conda update -y conda
+        bash /usr/share/miniconda/etc/profile.d/conda.sh
   - script: |
         pwd
         ls ci-helpers
@@ -38,18 +40,4 @@ jobs:
     inputs:
       testResultsFiles: '**/test-results.xml'
       testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
-
-- job: 'Publish'
-  dependsOn: 'Test'
-  pool:
-    vmImage: 'Ubuntu-16.04'
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.x'
-      architecture: 'x64'
-
-  - script: python setup.py sdist
-    displayName: 'Build sdist'
+    condition: succeededOrFailed()
\ No newline at end of file

From 97e71fc4c0b1f33ac1fcb2fbe7e391f38cc4f941 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 14:58:58 -0500
Subject: [PATCH 07/22] enable conda activate

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3ec3c80e412..337c162eb50 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,7 @@ jobs:
       architecture: 'x64'
 
   - script: |
-        conda update -y conda
+        # conda update -y conda
         bash /usr/share/miniconda/etc/profile.d/conda.sh
   - script: |
         pwd

From fe35952c14fb9904a2784571dd8a38821744b3ad Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 20:41:49 -0500
Subject: [PATCH 08/22] enable conda

---
 azure-pipelines.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 337c162eb50..e53815eb6f7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,6 +11,8 @@ jobs:
 - job: 'Test'
   pool:
     vmImage: 'Ubuntu-16.04'
+    - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
+      displayName: Add conda to PATH
   strategy:
     matrix:
       Python36:
@@ -23,7 +25,8 @@ jobs:
     inputs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
-
+  - script: - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
+                displayName: Add conda to PATH
   - script: |
         # conda update -y conda
         bash /usr/share/miniconda/etc/profile.d/conda.sh

From a032a12235e1f118011cfb0350fec136f976014c Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 20:46:55 -0500
Subject: [PATCH 09/22] enable conda

---
 azure-pipelines.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e53815eb6f7..be47dd6674d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,8 +11,6 @@ jobs:
 - job: 'Test'
   pool:
     vmImage: 'Ubuntu-16.04'
-    - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
-      displayName: Add conda to PATH
   strategy:
     matrix:
       Python36:
@@ -25,11 +23,15 @@ jobs:
     inputs:
       versionSpec: '$(python.version)'
       architecture: 'x64'
-  - script: - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"
-                displayName: Add conda to PATH
+  - bash: |
+          echo "##vso[task.prependpath]/usr/share/miniconda/bin"
+
+    displayName: Add conda to PATH
   - script: |
-        # conda update -y conda
-        bash /usr/share/miniconda/etc/profile.d/conda.sh
+      sudo chown -R $USER /usr/share/miniconda
+      conda update -y conda
+      . /usr/share/miniconda/etc/profile.d/conda.sh
+
   - script: |
         pwd
         ls ci-helpers

From 928ee0b387909538340a925045f6fbd0d3288a05 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:07:26 -0500
Subject: [PATCH 10/22] enable conda

---
 azure-pipelines.yml              | 4 ++--
 ci-helpers/install_tardis_env.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index be47dd6674d..2374477b9d8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -33,8 +33,8 @@ jobs:
       . /usr/share/miniconda/etc/profile.d/conda.sh
 
   - script: |
-        pwd
-        ls ci-helpers
+        conda env create -f tardis_env3.yml
+        conda activate tardis3
         bash ./ci-helpers/install_tardis_env.sh
     displayName: 'Install TARDIS env'
 
diff --git a/ci-helpers/install_tardis_env.sh b/ci-helpers/install_tardis_env.sh
index 244c588c42c..41f8761d461 100644
--- a/ci-helpers/install_tardis_env.sh
+++ b/ci-helpers/install_tardis_env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 cd $TRAVIS_BUILD_DIR
-if test -e $HOME/miniconda/envs/tardis; then
+if test -e  $HOME/miniconda/envs/tardis; then
     echo "TARDIS env already installed.";
     # Also check for tardis_env3.yml change
 else

From 11db40105d1bbdd3f9d461e5b9a91e1060a21e62 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:24:07 -0500
Subject: [PATCH 11/22] enable conda

---
 azure-pipelines.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2374477b9d8..7ba5da167a8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,6 +3,10 @@
 # Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/python
 
+variables:
+  - SETUP_CMD=true
+  - System.debug=true
+
 trigger:
 - master
 
@@ -35,10 +39,9 @@ jobs:
   - script: |
         conda env create -f tardis_env3.yml
         conda activate tardis3
-        bash ./ci-helpers/install_tardis_env.sh
     displayName: 'Install TARDIS env'
 
-  - script: python setup.py $SETUP_CMD
+  - script: python setup.py test
     displayName: 'TARDIS test'
 
   - task: PublishTestResults@2

From 114c32a748aca1aa0d449b21e678ca2df4d54555 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:25:34 -0500
Subject: [PATCH 12/22] enable conda

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7ba5da167a8..7ea9c81e254 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,8 +4,8 @@
 # https://docs.microsoft.com/azure/devops/pipelines/languages/python
 
 variables:
-  - SETUP_CMD=true
-  - System.debug=true
+  - SETUP_CMD: true
+  - System.Debug: true
 
 trigger:
 - master

From c33a74da0362bd6163d96d79731ac5d5e8db85b1 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:29:59 -0500
Subject: [PATCH 13/22] enable conda

---
 azure-pipelines.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7ea9c81e254..d9a05fa0ebd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,9 +3,6 @@
 # Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/python
 
-variables:
-  - SETUP_CMD: true
-  - System.Debug: true
 
 trigger:
 - master
@@ -32,13 +29,15 @@ jobs:
 
     displayName: Add conda to PATH
   - script: |
+      pwd
+      echo $AGENT_BUILDIRECTORY
       sudo chown -R $USER /usr/share/miniconda
       conda update -y conda
       . /usr/share/miniconda/etc/profile.d/conda.sh
 
   - script: |
         conda env create -f tardis_env3.yml
-        conda activate tardis3
+        source activate tardis3
     displayName: 'Install TARDIS env'
 
   - script: python setup.py test

From 11a7d7259f5acc1fa1185ff272b6062b7f32dceb Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:36:28 -0500
Subject: [PATCH 14/22] enable conda

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d9a05fa0ebd..f5350cf93a7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,14 +37,10 @@ jobs:
 
   - script: |
         conda env create -f tardis_env3.yml
-        source activate tardis3
     displayName: 'Install TARDIS env'
 
-  - script: python setup.py test
+  - script: |
+        source activate tardis3
+        python setup.py test
     displayName: 'TARDIS test'
 
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
\ No newline at end of file

From 00929d61592e786f25af543e3a28d1011d36b755 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sat, 2 Mar 2019 23:46:12 -0500
Subject: [PATCH 15/22] enable conda

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f5350cf93a7..5a9a6ea95ab 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,6 +7,9 @@
 trigger:
 - master
 
+variables:
+  System.Debug: 'true'
+
 jobs:
 
 - job: 'Test'

From 0996b953c2aaedeee1314dbce61ec8dab9f5cc54 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 09:17:03 -0500
Subject: [PATCH 16/22] make conda activate work

---
 ci-helpers/install_miniconda.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci-helpers/install_miniconda.sh b/ci-helpers/install_miniconda.sh
index 399323e61ad..2048d3b845c 100644
--- a/ci-helpers/install_miniconda.sh
+++ b/ci-helpers/install_miniconda.sh
@@ -16,3 +16,5 @@ else
     hash -r
     conda update --yes conda
 fi
+
+source $HOME/miniconda/etc/profile.d/conda.sh
\ No newline at end of file

From 1ec504b3b4e00a70b5a1f51dd4bf3b5d8b0d35e2 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 10:32:15 -0500
Subject: [PATCH 17/22] get reference data

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a03fe049c0b..07cd4aa2f84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,13 +38,12 @@ cache:
 before_install:
     # We do this to make sure we get the dependencies so pip works below
     - source ci-helpers/install_miniconda.sh
-    - if [[ $TEST_MODE == 'spectrum' ]]; then source ci-helpers/fetch_reference_data.sh; fi
-    -
 
 #- source ci-helpers/fetch_reference_data.sh
 
 install:
    - source ci-helpers/install_tardis_env.sh
+   - source ci-helpers/fetch_reference_data.sh
 
 script:
     - echo CC=$COMPILER python setup.py $SETUP_CMD

From c634b7b500e4a6fc3bf62f9f2c9873fc7ac0c0d4 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 11:03:06 -0500
Subject: [PATCH 18/22] adding fetch reference data to azure

---
 azure-pipelines.yml | 17 ++++++++++++++---
 tardis_env3.yml     |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5a9a6ea95ab..89232a2f716 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,6 +9,9 @@ trigger:
 
 variables:
   System.Debug: 'true'
+  ref_data_home: '$(home)/tardis-refdata'
+  ref_data_githuburl: 'https://github.com/tardis-sn/tardis-refdata.git'
+
 
 jobs:
 
@@ -31,18 +34,26 @@ jobs:
           echo "##vso[task.prependpath]/usr/share/miniconda/bin"
 
     displayName: Add conda to PATH
-  - script: |
+  - bash: |
       pwd
       echo $AGENT_BUILDIRECTORY
       sudo chown -R $USER /usr/share/miniconda
       conda update -y conda
       . /usr/share/miniconda/etc/profile.d/conda.sh
 
-  - script: |
+  - bash: |
         conda env create -f tardis_env3.yml
     displayName: 'Install TARDIS env'
 
-  - script: |
+  - bash: |
+        echo $HOME
+        echo $AGENT_BUILD_DIRECTORY
+        echo $REF_DATA_HOME
+        echo $REF_DATA_GITHUBURL
+
+      displayName: 'fetching reference data'
+
+  - bash: |
         source activate tardis3
         python setup.py test
     displayName: 'TARDIS test'
diff --git a/tardis_env3.yml b/tardis_env3.yml
index 6cd9e87364a..dbab315c014 100644
--- a/tardis_env3.yml
+++ b/tardis_env3.yml
@@ -1,4 +1,4 @@
-name: tardis3
+name: tardis
 
 channels:
     - conda-forge

From 7d626e2bc5ea80d07623cfc636528faf81cffcbe Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 11:05:11 -0500
Subject: [PATCH 19/22] fixing azure yml

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 89232a2f716..59b362d1ef8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -51,7 +51,7 @@ jobs:
         echo $REF_DATA_HOME
         echo $REF_DATA_GITHUBURL
 
-      displayName: 'fetching reference data'
+    displayName: 'fetching reference data'
 
   - bash: |
         source activate tardis3

From a0a7f6083a187c663d4d3cd207af2d78040f4526 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 11:22:50 -0500
Subject: [PATCH 20/22] final push for azure - hopefully

---
 azure-pipelines.yml              | 2 +-
 ci-helpers/install_tardis_env.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 59b362d1ef8..a0022793cad 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -54,7 +54,7 @@ jobs:
     displayName: 'fetching reference data'
 
   - bash: |
-        source activate tardis3
+        source activate tardis
         python setup.py test
     displayName: 'TARDIS test'
 
diff --git a/ci-helpers/install_tardis_env.sh b/ci-helpers/install_tardis_env.sh
index 41f8761d461..5f66e7186f8 100644
--- a/ci-helpers/install_tardis_env.sh
+++ b/ci-helpers/install_tardis_env.sh
@@ -7,7 +7,7 @@ else
    conda env create -f tardis_env3.yml
    #trouble with building due to segfault at cython (https://github.com/cython/cython/issues/2199)
    #remove if we can get normal cython through conda
-   conda activate tardis3
+   conda activate tardis
 fi
 
-conda activate tardis3
+conda activate tardis

From 624d87f468b64f61b88061346004ee15d99e7a1d Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 11:38:42 -0500
Subject: [PATCH 21/22] final push for azure - hopefully

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a0022793cad..ec13bcb9eac 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,14 +32,15 @@ jobs:
       architecture: 'x64'
   - bash: |
           echo "##vso[task.prependpath]/usr/share/miniconda/bin"
-
     displayName: Add conda to PATH
+
   - bash: |
       pwd
       echo $AGENT_BUILDIRECTORY
       sudo chown -R $USER /usr/share/miniconda
       conda update -y conda
       . /usr/share/miniconda/etc/profile.d/conda.sh
+    displayName: updating conda and activating
 
   - bash: |
         conda env create -f tardis_env3.yml

From 4622f846e05c3b8954fa36cefcf3d1e3084c5cb8 Mon Sep 17 00:00:00 2001
From: Wolfgang Kerzendorf <wkerzendorf@gmail.com>
Date: Sun, 3 Mar 2019 11:44:01 -0500
Subject: [PATCH 22/22] remove print statements for compilation

---
 tardis/montecarlo/setup_package.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tardis/montecarlo/setup_package.py b/tardis/montecarlo/setup_package.py
index 446042b246b..6f0a2e58bc2 100644
--- a/tardis/montecarlo/setup_package.py
+++ b/tardis/montecarlo/setup_package.py
@@ -8,7 +8,6 @@
 
 
 if get_distutils_option('with_openmp', ['build', 'install', 'develop']) is not None:
-    print("WITH OPENMP"*20)
     compile_args = ['-fopenmp', '-W', '-Wall', '-Wmissing-prototypes', '-std=c99']
     link_args = ['-fopenmp']
     define_macros = [('WITHOPENMP', None)]
@@ -16,7 +15,6 @@
     compile_args = ['-W', '-Wall', '-Wmissing-prototypes', '-std=c99']
     link_args = []
     define_macros = []
-    print("WITHOUT OPENMP"*20)
 
 
 if get_distutils_option('with_vpacket_logging', ['build', 'install', 'develop']) is not None: