From d20f354a5dec1c56633dd5808fdeb5fdae96c3ca Mon Sep 17 00:00:00 2001 From: "Adam J. Jackson" Date: Fri, 5 Jul 2024 11:25:18 +0100 Subject: [PATCH] Try Brille branch for Conan update --- .github/workflows/run_tests.yml | 2 +- tox.ini | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 05eb18f0c..337498736 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -17,7 +17,7 @@ jobs: (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no_ci')) strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-12] + os: [ubuntu-latest, windows-latest, macos-latest] fail-fast: false runs-on: ${{ matrix.os }} steps: diff --git a/tox.ini b/tox.ini index 0132e7eed..e800bdfd3 100644 --- a/tox.ini +++ b/tox.ini @@ -66,6 +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 git+https://github.com/brille/brille.git@100-conan python -m pip install \ --upgrade \ --upgrade-strategy eager \ @@ -77,6 +78,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 git+https://github.com/brille/brille.git@100-conan python -m pip install \ --upgrade \ --upgrade-strategy eager \ @@ -99,5 +101,6 @@ 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 git+https://github.com/brille/brille.git@100-conan python -m pip install '{toxinidir}[matplotlib,phonopy_reader,brille]' commands = {[testenv]test_command}