Moved package under lib folder (#16)

ansible-community · Oct 20, 2020 · 1a0f82c · 1a0f82c
1 parent 257ac56
commit 1a0f82c
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 14 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,7 +47,7 @@ repos:
       - id: mypy
         # empty args needed in order to match mypy cli behavior
         args: []
-        entry: mypy molecule_podman/
+        entry: mypy lib/
         pass_filenames: false
         additional_dependencies:
           - molecule

diff --git a/.yamllint b/.yamllint
@@ -1,10 +1,6 @@
+---
+# Based on ansible-lint config
 extends: default
-ignore: |
-  *.molecule/
-  molecule/cookiecutter/
-  .tox
-  # HACK: https://github.com/pyupio/pyup/issues/346
-  .pyup.yml
 
 rules:
   braces:
@@ -13,7 +9,25 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
   document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
   line-length: disable
-  truthy:
-    allowed-values: ['true', 'false', 'on']
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable
diff --git a/molecule_podman/__init__.py → lib/molecule_podman/__init__.py b/molecule_podman/__init__.py → lib/molecule_podman/__init__.py
diff --git a/...ule_podman/cookiecutter/cookiecutter.json → ...ule_podman/cookiecutter/cookiecutter.json b/...ule_podman/cookiecutter/cookiecutter.json → ...ule_podman/cookiecutter/cookiecutter.json
diff --git a/...cookiecutter.scenario_name}}/converge.yml → ...cookiecutter.scenario_name}}/converge.yml b/...cookiecutter.scenario_name}}/converge.yml → ...cookiecutter.scenario_name}}/converge.yml
diff --git a/molecule_podman/driver.py → lib/molecule_podman/driver.py b/molecule_podman/driver.py → lib/molecule_podman/driver.py
diff --git a/molecule_podman/playbooks/Dockerfile.j2 → lib/molecule_podman/playbooks/Dockerfile.j2 b/molecule_podman/playbooks/Dockerfile.j2 → lib/molecule_podman/playbooks/Dockerfile.j2
diff --git a/molecule_podman/playbooks/create.yml → lib/molecule_podman/playbooks/create.yml b/molecule_podman/playbooks/create.yml → lib/molecule_podman/playbooks/create.yml
diff --git a/molecule_podman/playbooks/destroy.yml → lib/molecule_podman/playbooks/destroy.yml b/molecule_podman/playbooks/destroy.yml → lib/molecule_podman/playbooks/destroy.yml
diff --git a/..._podman/playbooks/validate-dockerfile.yml → ..._podman/playbooks/validate-dockerfile.yml b/..._podman/playbooks/validate-dockerfile.yml → ..._podman/playbooks/validate-dockerfile.yml
diff --git a/molecule_podman/test/__init__.py → lib/molecule_podman/test/__init__.py b/molecule_podman/test/__init__.py → lib/molecule_podman/test/__init__.py
diff --git a/molecule_podman/test/conftest.py → lib/molecule_podman/test/conftest.py b/molecule_podman/test/conftest.py → lib/molecule_podman/test/conftest.py
diff --git a/molecule_podman/test/test_driver.py → lib/molecule_podman/test/test_driver.py b/molecule_podman/test/test_driver.py → lib/molecule_podman/test/test_driver.py
diff --git a/molecule_podman/test/test_func.py → lib/molecule_podman/test/test_func.py b/molecule_podman/test/test_func.py → lib/molecule_podman/test/test_func.py
@@ -2,13 +2,12 @@
 import os
 import subprocess
 
+import molecule_podman
 import pytest
 import sh
 from molecule import logger
 from molecule.test.conftest import change_dir_to, run_command
 
-import molecule_podman
-
 LOG = logger.get_logger(__name__)
 
 

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+    - name: test
+      debug:
+        msg: it worked!
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -0,0 +1,13 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: podman
+platforms:
+  - name: instance
+    image: docker.io/pycontribs/centos:8
+    pre_build_image: true
+provisioner:
+  name: ansible
+verifier:
+  name: ansible
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -0,0 +1,9 @@
+---
+# This is an example playbook to execute Ansible tests.
+
+- name: Verify
+  hosts: all
+  tasks:
+  - name: Example assertion
+    assert:
+      that: true
diff --git a/setup.cfg b/setup.cfg
@@ -53,6 +53,8 @@ keywords =
 [options]
 use_scm_version = True
 python_requires = >=3.6
+package_dir =
+  = lib
 packages = find:
 include_package_data = True
 zip_safe = False
@@ -85,13 +87,13 @@ molecule.driver =
     podman = molecule_podman.driver:Podman
 
 [options.packages.find]
-where = .
+where = lib
 
 [tool:pytest]
 addopts = --doctest-modules --durations 10 --color=yes
 doctest_optionflags = ALLOW_UNICODE ELLIPSIS
 norecursedirs = dist doc build .tox .eggs
-# testpaths = molecule/test/
+
 filterwarnings =
     # treat warnings as errors unless we add them below
     error
@@ -112,4 +114,4 @@ ignore = E741,W503,W504,H,E501,E203,D102
 max-line-length = 88
 per-file-ignores =
   docs/conf.py: D
-  molecule/test/*: D100,D103,D104
+  lib/molecule/test/*: D100,D103,D104