Skip to content

Commit

Permalink
Merge tag 'fix-tox-conda2' into develop
Browse files Browse the repository at this point in the history
Fix (again) tox pip deps
  • Loading branch information
wpk committed Mar 29, 2023
2 parents e530836 + 21f6af0 commit 9c296b9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ conda_env = {toxinidir}/environment/test-extras.yaml
conda_deps =
conda-remote: {[base]package_name}
conda-local: {posargs}
conda: pymbar<4.0
deps =
pypi-remote: {[base]package_name}[mbar,gpr]
pypi-local: {posargs}[mbar,gpr]
Expand Down

0 comments on commit 9c296b9

Please sign in to comment.