Sudo_pair Charm

Merge ~peter-sabaini/charm-sudo-pair:fix-tests into ~sudo-pair-charmers/charm-sudo-pair:master

  1. Git
  2. lp:~peter-sabaini/charm-sudo-pair
  3. fix-tests
  4. Merge into master
Proposed by Peter Sabaini
Status: Merged
Merged at revision: ec1f92d37b9de13db69db5e5066e162d527a9c36
Proposed branch: ~peter-sabaini/charm-sudo-pair:fix-tests
Merge into: ~sudo-pair-charmers/charm-sudo-pair:master
Diff against target: 24 lines (+2/-2)
2 files modified
tests/functional/requirements.txt (+1/-1)
tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
Diko Parvanov Approve
Review via email: mp+374024@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Diko Parvanov (dparv) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
2index 6c6cdc6..b9815c2 100644
3--- a/tests/functional/requirements.txt
4+++ b/tests/functional/requirements.txt
5@@ -1,6 +1,6 @@
6 juju
7 requests
8-pytest==4.0.2
9+pytest
10 pytest-asyncio
11 mock
12 flake8
13diff --git a/tox.ini b/tox.ini
14index 7d3565b..562d0ba 100644
15--- a/tox.ini
16+++ b/tox.ini
17@@ -4,7 +4,7 @@ envlist = unit, functional, func_xenial
18 skip_missing_interpreters = True
19
20 [testenv]
21-basepython = python3.6
22+basepython = python3
23 setenv =
24 PYTHONPATH = .
25

Subscribers

People subscribed via source and target branches