Skip to content

Commit

Permalink
Update linter versions for lint extra (#3066)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea authored Mar 8, 2021
1 parent 969b111 commit 91bc7bf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 21 deletions.
8 changes: 3 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ install_requires =
rich >= 9.5.1
subprocess-tee >= 0.2.0
setuptools >= 42 # for pkg_resources
yamllint >= 1.15.0, < 2
# selinux python module is needed as least by ansible-docker/podman modules
# and allows us of isolated (default) virtualenvs. It does not avoid need
# to install the system selinux libraries but it will provide a clear
Expand Down Expand Up @@ -121,10 +120,9 @@ test =
pytest-xdist >= 2.1.0
pytest >= 6.1.2
lint =
ansible-lint >= 4.2.0, < 5
flake8 >= 3.6.0
pre-commit >= 1.21.0
yamllint >= 1.15.0
ansible-lint[core,yamllint] >= 5.0.2, < 6
flake8 >= 3.8.4
pre-commit >= 2.10.1

[options.entry_points]
console_scripts =
Expand Down
31 changes: 15 additions & 16 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ setenv =
ANSIBLE_DISPLAY_FAILED_STDERR=1
ANSIBLE_VERBOSITY=1
MOLECULE_NO_LOG=0
PIP_USE_FEATURE={env:PIP_USE_FEATURE:2020-resolver}
PYTHONDONTWRITEBYTECODE=1
PYTHONUNBUFFERED=1
_EXTRAS=-l --cov=molecule --no-cov-on-fail --cov-report xml:{envlogdir}/coverage.xml --html={envlogdir}/reports.html --self-contained-html
Expand Down Expand Up @@ -166,21 +165,21 @@ extras =
# we install test extra in order to validate it does not drag ansible in
test
deps =
ansible-base
molecule-azure
molecule-containers
molecule-digitalocean
molecule-docker
molecule-ec2
molecule-gce
molecule-hetznercloud
molecule-libvirt
molecule-lxd
molecule-openstack
molecule-podman
molecule-vagrant
tox-ansible
pipdeptree
ansible-base >= 2.10.6
molecule-azure >= 0.5.0
molecule-containers >= 0.2.1
molecule-digitalocean >= 0.1
molecule-docker >= 0.2.4
molecule-ec2 >= 0.3
molecule-gce >= 0.2
molecule-hetznercloud >= 1.0.0
molecule-libvirt >= 0.0.3
molecule-lxd >= 0.2
molecule-openstack >= 0.3
molecule-podman >= 0.3.0
molecule-vagrant >= 0.6.1
tox-ansible >= 1.1.0
pipdeptree >= 2.0.0
commands =
pip check
# disabled fails safe because we now install ansible-base on purpose
Expand Down

0 comments on commit 91bc7bf

Please sign in to comment.