Skip to content

Commit

Permalink
Depend on 'juju' when no extra is passed.
Browse files Browse the repository at this point in the history
By default depend on 'juju' (no pinning), the pinning only comes into
place when an explicit extra is passed.

This makes the extras effectively nothing more than a pinning alias,
basically `pip install juju<3.0 zaza` becomes equivalent to `pip install
zaza[juju-29]`.
  • Loading branch information
freyes committed Jul 18, 2023
1 parent 11a08ae commit 084fced
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

extras_require={
'testing': tests_require,
'': ['juju'],
'juju-29': ['juju<3.0'],
'juju-31': ['juju>=3.1.0,<3.2.0'],
'juju-32': ['juju>=3.2.0,<3.3.0'],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ passenv =
CS_*
OS_*
TEST_*
extras = {env:EXTRA:juju-29}
extras = {env:EXTRA}
deps =
-r{toxinidir}/test-requirements.txt
commands = pytest --cov=./zaza/ {posargs} {toxinidir}/unit_tests
Expand Down

0 comments on commit 084fced

Please sign in to comment.