Skip to content
This repository was archived by the owner on Mar 30, 2025. It is now read-only.

Commit fe91911

Browse files
authored
Merge pull request #286 from staticdev/deps/staticdev.pyenv-2.10.2
Changed syntax for dependency on molecule
2 parents de6cce4 + 65eb677 commit fe91911

File tree

7 files changed

+4
-26
lines changed

7 files changed

+4
-26
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Install test dependencies
6868
run: |
69-
python3 -m pip install --constraint=.github/workflows/constraints.txt ansible 'molecule-plugins[podman]' podman
69+
python3 -m pip install --constraint=.github/workflows/constraints.txt ansible 'molecule-plugins[podman]'
7070
7171
- name: Run Molecule tests
7272
run: molecule test

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ Installs:
1616
- [Pipx]
1717
- [Poetry]
1818
- [pre-commit]
19-
- [pyenv]
2019
- [Tox]
2120

2221
Note: for a playbook that installs IDEs, try [Linux workstation playbook].
2322

2423
## Requirements
2524

26-
None.
25+
- [pyenv]
2726

2827
## Role Variables
2928

@@ -32,10 +31,6 @@ Here is the list of all variables and their default values:
3231
- `pyenv_global`: optional list of Python global versions for pyenv (from [staticdev.pyenv])
3332
- `pyenv_python_versions`: optional list of Python versions installed (from [staticdev.pyenv])
3433

35-
## Dependencies
36-
37-
- [staticdev.pyenv]
38-
3934
## Example Playbook
4035

4136
Here are some common usages of this role.
@@ -53,6 +48,7 @@ Here are some common usages of this role.
5348
```yaml
5449
- hosts: all
5550
roles:
51+
- role: staticdev.pyenv
5652
- role: staticdev.python-developer
5753
vars:
5854
pyenv_global:

meta/main.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,7 @@ galaxy_info:
2727
- hatch
2828
- nox
2929
- poetry
30-
- pyenv
3130
- pipx
3231
- precommit
3332
- tox
3433
- workstation
35-
36-
dependencies:
37-
- name: staticdev.pyenv
38-
version: 2.10.2

molecule/default/molecule.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
dependency:
33
name: galaxy
4-
options:
5-
role-file: requirements.yml
64
driver:
75
name: podman
86
platforms:

playbook.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
when: ansible_os_family == 'Debian'
1313

1414
roles:
15+
- role: staticdev.pyenv
1516
- role: .

requirements.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

tasks/main.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
- name: Load custom facts
33
ansible.builtin.import_tasks: custom_facts.yml
44

5-
- name: Install pyenv
6-
ansible.builtin.import_role:
7-
name: staticdev.pyenv
8-
vars:
9-
pyenv_owner: "{{ ansible_facts.user_id }}"
10-
pyenv_path: "{{ ansible_env.HOME }}/pyenv"
11-
when: pyenv_python_versions
12-
135
- name: Ensure dependencies are installed
146
ansible.builtin.package:
157
name: "{{ item }}"

0 commit comments

Comments
 (0)