Merge pull request #6 from ssbarnea/master

Finished code reorganization for v3

Author: ssbarnea

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: ssbarnea

.github/labels.yml

@@ -0,0 +1,38 @@
+# Format and labels used aim to match those used by Ansible project
+# https://github.com/marketplace/actions/github-labeler
+- name: bug
+  color: "fbca04"
+  description: "This issue/PR relates to a bug."
+- name: deprecated
+  color: "fef2c0"
+  description: "This issue/PR relates to a deprecated module."
+- name: docs
+  color: "4071a5"
+  description: "This issue/PR relates to or includes documentation."
+- name: enhancement
+  color: "ededed"
+  description: "This issue/PR relates to a feature request."
+- name: feature
+  color: "006b75"
+  description: "This issue/PR relates to a feature request."
+- name: major
+  color: "c6476b"
+  description: "Marks an important and likely breaking change."
+- name: packaging
+  color: "4071a5"
+  description: "Packaging category"
+- name: performance
+  color: "555555"
+  description: "Relates to product or testing performance."
+- name: skip-changelog
+  color: "eeeeee"
+  description: "Can be missed from the changelog."
+- name: stale
+  color: "eeeeee"
+  description: "Not updated in long time, will be closed soon."
+- name: wontfix
+  color: "eeeeee"
+  description: "This will not be worked on"
+- name: test
+  color: "0e8a16"
+  description: "This PR relates to tests, QA, CI."

.github/release-drafter.yml

@@ -0,0 +1,18 @@
+categories:
+  - title: 'Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: 'Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: 'Maintenance'
+    label: 'chore'
+exclude-labels:
+  - 'skip-changelog'
+template: |
+  ## Changes
+
+  $CHANGES

.pre-commit-config.yaml

@@ -1,16 +1,10 @@
 ---
+default_language_version:
+  python: python3
+minimum_pre_commit_version: "1.14.0"
 repos:
-  - repo: https://github.com/PyCQA/doc8.git
-    rev: 0.8.1rc1
-    hooks:
-      - id: doc8
-  - repo: https://github.com/python/black.git
-    rev: 19.3b0
-    hooks:
-      - id: black
-        language_version: python3
-  - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v2.2.3
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -19,21 +13,23 @@ repos:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: debug-statements
+  - repo: https://github.com/PyCQA/doc8.git
+    rev: 0.8.1rc3
+    hooks:
+      - id: doc8
+  - repo: https://github.com/python/black.git
+    rev: 19.10b0
+    hooks:
+      - id: black
+        language_version: python3
   - repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.7.8
+    rev: 3.7.9
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-black
-  - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.16.0
-    hooks:
-      - id: yamllint
-        files: \.(yaml|yml)$
-        types: [file, yaml]
-        entry: yamllint --strict
   - repo: https://github.com/codespell-project/codespell.git
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: codespell
         name: codespell
@@ -44,3 +40,32 @@ repos:
         args: []
         require_serial: false
         additional_dependencies: []
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.20.0
+    hooks:
+      - id: yamllint
+        files: \.(yaml|yml)$
+        types: [file, yaml]
+        entry: yamllint --strict -f parsable
+  - repo: https://github.com/openstack-dev/bashate.git
+    rev: 1.0.0
+    hooks:
+      - id: bashate
+        entry: bashate --error . --ignore=E006,E040
+        # Run bashate check for all bash scripts
+        # Ignores the following rules:
+        # E006: Line longer than 79 columns (as many scripts use jinja
+        #       templating, this is very difficult)
+        # E040: Syntax error determined using `bash -n` (as many scripts
+        #       use jinja templating, this will often fail and the syntax
+        #       error will be discovered in execution anyway)
+  - repo: https://github.com/ansible/ansible-lint.git
+    rev: v4.2.0
+    hooks:
+      - id: ansible-lint
+        always_run: true
+        pass_filenames: false
+        # do not add file filters here as ansible-lint does not give reliable
+        # results when called with individual files.
+        # https://github.com/ansible/ansible-lint/issues/611
+        entry: env ANSIBLE_LIBRARY=molecule_vagrant/modules ansible-lint --force-color -p -v

README.rst

@@ -6,18 +6,18 @@ Molecule EC2 Plugin
    :target: https://badge.fury.io/py/molecule-ec2
    :alt: PyPI Package
 
-.. image:: https://img.shields.io/travis/com/pycontribs/molecule-ec2/master.svg?label=Linux%20builds%20%40%20Travis%20CI
-   :target: https://travis-ci.com/pycontribs/molecule-ec2
+.. image:: https://zuul-ci.org/gated.svg
+   :target: https://dashboard.zuul.ansible.com/t/ansible/builds?project=ansible-community/molecule-ec2
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/python/black
    :alt: Python Black Code Style
 
-.. image:: https://img.shields.io/badge/Code%20of%20Conduct-Ansible-silver.svg
+.. image:: https://img.shields.io/badge/Code%20of%20Conduct-silver.svg
    :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html
    :alt: Ansible Code of Conduct
 
-.. image:: https://img.shields.io/badge/Mailing%20lists-Ansible-orange.svg
+.. image:: https://img.shields.io/badge/Mailing%20lists-silver.svg
    :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information
    :alt: Ansible mailing lists
 

bindep.txt

@@ -0,0 +1,10 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+gcc [test platform:rpm]
+gcc-c++ [test platform:rpm]
+libselinux-python [platform:centos-7 !platform:fedora]
+python3 [test platform:rpm !platform:centos-7]
+python3-devel [test platform:rpm !platform:centos-7]
+python3-libselinux [test platform:rpm !platform:centos-7]
+python3 [test !platform:centos-7 platform:rpm]

molecule_ec2/cookiecutter/cookiecutter.json

@@ -0,0 +1,5 @@
+{
+    "molecule_directory": "molecule",
+    "role_name": "OVERRIDDEN",
+    "scenario_name": "OVERRIDDEN"
+}

molecule_ec2/cookiecutter/scenario/driver/ec2/cookiecutter.json

@@ -1,6 +1,6 @@
-*******
+*********************************************
 Amazon Web Services driver installation guide
-*******
+*********************************************
 
 Requirements
 ============
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.
 
 .. code-block:: bash
 
-    $ pip install 'molecule[ec2]'
+    $ pip install 'molecule-ec2'