Merge pull request #286 from staticdev/deps/staticdev.pyenv-2.10.2

Changed syntax for dependency on molecule
staticdev · Dec 1, 2023 · fe91911 · fe91911
2 parents de6cce4 + 65eb677
commit fe91911
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 26 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Install test dependencies
         run: |
-          python3 -m pip install --constraint=.github/workflows/constraints.txt ansible 'molecule-plugins[podman]' podman
+          python3 -m pip install --constraint=.github/workflows/constraints.txt ansible 'molecule-plugins[podman]'
 
       - name: Run Molecule tests
         run: molecule test

diff --git a/README.md b/README.md
@@ -16,14 +16,13 @@ Installs:
 - [Pipx]
 - [Poetry]
 - [pre-commit]
-- [pyenv]
 - [Tox]
 
 Note: for a playbook that installs IDEs, try [Linux workstation playbook].
 
 ## Requirements
 
-None.
+- [pyenv]
 
 ## Role Variables
 
@@ -32,10 +31,6 @@ Here is the list of all variables and their default values:
 - `pyenv_global`: optional list of Python global versions for pyenv (from [staticdev.pyenv])
 - `pyenv_python_versions`: optional list of Python versions installed (from [staticdev.pyenv])
 
-## Dependencies
-
-- [staticdev.pyenv]
-
 ## Example Playbook
 
 Here are some common usages of this role.
@@ -53,6 +48,7 @@ Here are some common usages of this role.
 ```yaml
 - hosts: all
   roles:
+    - role: staticdev.pyenv
     - role: staticdev.python-developer
       vars:
         pyenv_global:

diff --git a/meta/main.yml b/meta/main.yml
@@ -27,12 +27,7 @@ galaxy_info:
     - hatch
     - nox
     - poetry
-    - pyenv
     - pipx
     - precommit
     - tox
     - workstation
-
-dependencies:
-  - name: staticdev.pyenv
-    version: 2.10.2
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,8 +1,6 @@
 ---
 dependency:
   name: galaxy
-  options:
-    role-file: requirements.yml
 driver:
   name: podman
 platforms:

diff --git a/playbook.yml b/playbook.yml
@@ -12,4 +12,5 @@
       when: ansible_os_family == 'Debian'
 
   roles:
+    - role: staticdev.pyenv
     - role: .
diff --git a/requirements.yml b/requirements.yml
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -2,14 +2,6 @@
 - name: Load custom facts
   ansible.builtin.import_tasks: custom_facts.yml
 
-- name: Install pyenv
-  ansible.builtin.import_role:
-    name: staticdev.pyenv
-  vars:
-    pyenv_owner: "{{ ansible_facts.user_id }}"
-    pyenv_path: "{{ ansible_env.HOME }}/pyenv"
-  when: pyenv_python_versions
-
 - name: Ensure dependencies are installed
   ansible.builtin.package:
     name: "{{ item }}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,5 @@ @@
           when: ansible_os_family == 'Debian'
       roles:
+        - role: staticdev.pyenv
         - role: .