Skip to content

Commit

Permalink
Revert "Fix the CI: remove comment that Tox cannot parse correctly" (#…
Browse files Browse the repository at this point in the history
…1990)

* Revert "Remove comments that Tox cannot parse correctly"

This reverts commit 346f7de.

* Bump tox to v3.9.0

* Add extra pyup filters into tox.ini

Signed-off-by: Sviatoslav Sydorenko <webknjaz@redhat.com>
  • Loading branch information
webknjaz authored Apr 17, 2019
1 parent 2d266b9 commit 3c4ca0d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
minversion = 3.8.6
minversion = 3.9.0
envlist =
lint
py{27,35,36,37}-ansible{25,26,27}-{functional,unit}
Expand All @@ -19,14 +19,14 @@ deps =
yamllint>=1.11.1,<2

mock==2.0.0
pytest==3.6.0
pytest==3.6.0 # pyup: < 4 # blocked by `pytest-verbose-parametrize`
pytest-cov==2.6.0
pytest-helpers-namespace==2019.1.8
pytest-mock==1.10.0
pytest-verbose-parametrize==1.4.0
pytest-xdist==1.26.0
pytest-xdist==1.26.0 # pyup: < 1.28 # blocked by `pytest`
shade==1.22.2
yapf>=0.25.0,<0.27
yapf>=0.25.0,<0.27 # pyup: < 0.27 # disable updates, conflicts with flake8 as per https://github.com/ansible/molecule/pull/1915

ansible25: ansible>=2.5,<2.6
ansible26: ansible>=2.6,<2.7
Expand Down Expand Up @@ -69,7 +69,7 @@ usedevelop = false
[testenv:format]
commands =
yapf -i -r molecule/ test/
deps = yapf>=0.25.0,<0.27
deps = yapf>=0.25.0,<0.27 # pyup: < 0.27 # disable updates, conflicts with flake8 as per https://github.com/ansible/molecule/pull/1915
extras =
skip_install = true
usedevelop = false
Expand Down

0 comments on commit 3c4ca0d

Please sign in to comment.