From 2ba84f94bd1d26c2a519589f8c4b3c745c356ffc Mon Sep 17 00:00:00 2001
From: Jacob Wilkins <jacob.wilkins@stfc.ac.uk>
Date: Thu, 7 Nov 2024 16:15:29 +0000
Subject: [PATCH] Experiment with MSVC

---
 .github/workflows/run_tests.yml |  6 ++++++
 tox.ini                         | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index ae2fc05ca..84c1e155b 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -31,6 +31,12 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         run: |
           brew install llvm
+          echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV
+      - name: Setup MSVC on Windows
+        if: startsWith(matrix.os, 'windows')
+        uses: bus1/cabuild/action/msdevshell@v1
+        with:
+          architecture: x64
       - name: Update pip and install dependencies
         shell: bash -l {0}
         run: |
diff --git a/tox.ini b/tox.ini
index 6b269588a..1601e8a9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ deps =
     numpy
     -r{toxinidir}/tests_and_analysis/tox_requirements.txt
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
     --upgrade \
     --upgrade-strategy eager \
     '{toxinidir}[matplotlib,phonopy_reader,brille]'
@@ -33,7 +33,7 @@ commands =
 install_command = {[testenv:py310]install_command}
 deps = {[testenv:py310]deps}
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
         --upgrade \
         --upgrade-strategy eager \
         '{toxinidir}'
@@ -44,7 +44,7 @@ commands = {[testenv]test_command} --cov -m "not (phonopy_reader or matplotlib o
 install_command = {[testenv:py310]install_command}
 deps = {[testenv:py310]deps}
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
         --upgrade \
         --upgrade-strategy eager \
         '{toxinidir}[matplotlib]'
@@ -55,7 +55,7 @@ commands = {[testenv]test_command} --cov -m "matplotlib and not multiple_extras"
 install_command = {[testenv:py310]install_command}
 deps = {[testenv:py310]deps}
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
         --upgrade \
         --upgrade-strategy eager \
         '{toxinidir}[phonopy_reader]'
@@ -66,7 +66,7 @@ commands = {[testenv]test_command} --cov -m "phonopy_reader and not multiple_ext
 install_command = {[testenv:py310]install_command}
 deps = {[testenv:py310]deps}
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
         --upgrade \
         --upgrade-strategy eager \
         '{toxinidir}[brille]'
@@ -77,7 +77,7 @@ commands = {[testenv]test_command} --cov -m "brille and not multiple_extras"
 install_command = {[testenv:py310]install_command}
 deps = {[testenv:py310]deps}
 commands_pre =
-    python -m pip install -vvv \
+    python -m pip install -vv \
         --upgrade \
         --upgrade-strategy eager \
         '{toxinidir}[phonopy_reader,matplotlib,brille]'
@@ -100,5 +100,5 @@ commands_pre =
         -r{toxinidir}/tests_and_analysis/tox_requirements.txt
     # Force rebuild of euphonic extension to avoid Numpy clash
     rm -rf {toxinidir}/build
-    python -m pip install -vvv '{toxinidir}[matplotlib,phonopy_reader,brille]'
+    python -m pip install -vv '{toxinidir}[matplotlib,phonopy_reader,brille]'
 commands = {[testenv]test_command}