Skip to content

Commit

Permalink
Try Brille branch for Conan update
Browse files Browse the repository at this point in the history
  • Loading branch information
ajjackson committed Jul 5, 2024
1 parent 257fec2 commit d20f354
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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}

0 comments on commit d20f354

Please sign in to comment.