Skip to content

Commit

Permalink
Adapt testing to molecule 3.2 (ansible-community#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea authored Nov 26, 2020
1 parent 474c778 commit d11a99b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:
- id: black
language_version: python3
- repo: https://github.com/pre-commit/pre-commit-hooks.git
rev: v3.2.0
rev: v3.3.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand Down
3 changes: 2 additions & 1 deletion lib/molecule_podman/test/test_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import molecule_podman
import pytest
from molecule import logger
from molecule.test.conftest import change_dir_to, run_command
from molecule.test.conftest import change_dir_to
from molecule.util import run_command

LOG = logger.get_logger(__name__)

Expand Down
6 changes: 0 additions & 6 deletions mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,8 @@ disallow_untyped_calls=True
warn_redundant_casts=True

# 3rd party ignores, to remove once they add hints
[mypy-molecule.*]
ignore_missing_imports = True

[mypy-pytest]
ignore_missing_imports = True

[mypy-setuptools]
ignore_missing_imports = True

[mypy-sh]
ignore_missing_imports = True
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ setup_requires =

# These are required in actual runtime:
install_requires =
molecule >= 3.2.0a0
molecule >= 3.2.0
# selinux python module is needed as least by ansible-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
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ setenv =
MOLECULE_NO_LOG=0
deps =
devel: ansible>=2.10.0a2,<2.11
py{36,37,38,39}: molecule[test]
py{36,37,38,39}: molecule[ansible,test]
py{36,37,38,39}-{devel}: git+https://github.com/ansible-community/molecule.git@master#egg=molecule[test]
dockerfile: ansible>=2.9.12
selinux
Expand Down

0 comments on commit d11a99b

Please sign in to comment.