Skip to content

Commit

Permalink
Merge pull request #62 from staticdev/enhancement/update-default-valu…
Browse files Browse the repository at this point in the history
…es-and-docs

Update default values and docs
  • Loading branch information
staticdev authored Dec 12, 2021
2 parents 348c19a + 333d8e4 commit c56952d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 25 deletions.
22 changes: 11 additions & 11 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Here is the list of all variables and their default values:
- `pyenv_env: "user"` (should be either `"user"` or `"system"`)
- `pyenv_path: "{% if pyenv_env == 'user' %}{{ ansible_env.HOME }}/pyenv{% else %}/usr/local/pyenv{% endif %}"`
- `pyenv_owner: "{{ ansible_env.USER }}"`
- `pyenv_python_versions: [3.9.1]`
- `pyenv_virtualenvs: [{ venv_name: latest, py_version: 3.9.1 }]`
- `pyenv_global: [3.9.1]`
- `pyenv_update_git_install: false`
- `pyenv_python_versions: [3.10.0]`
- `pyenv_virtualenvs: [{ venv_name: latest, py_version: 3.10.0 }]`
- `pyenv_global: [3.10.0]`
- `pyenv_update_git_install: true` (get latest pyenv from git)
- `pyenv_enable_autocompletion: false`
- `pyenv_setting_path: "{% if pyenv_env == 'user' %}~/.bashrc{% else %}/etc/profile.d/pyenv.sh{% endif %}"`

Expand All @@ -54,17 +54,17 @@ Example Playbook
pyenv_path: "{{ home }}/pyenv"
pyenv_owner: "{{ instance_owner }}"
pyenv_global:
- 3.7.11
pyenv_update_git_install: false
- 3.10.0
- 3.9.9
pyenv_enable_autocompletion: false
pyenv_python_versions:
- 3.8.11
- 3.9.6
- 3.10.0
- 3.9.9
pyenv_virtualenvs:
- venv_name: latest_v310
py_version: 3.10.0
- venv_name: latest_v39
py_version: 3.9.6
- venv_name: latest_v38
py_version: 3.8.11
py_version: 3.9.9
Contributing
------------
Expand Down
11 changes: 4 additions & 7 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ pyenv_env: "user"
pyenv_path: "{% if pyenv_env == 'user' %}{{ ansible_env.HOME }}/pyenv{% else %}/usr/local/pyenv{% endif %}"
pyenv_owner: "{{ ansible_env.USER }}"
pyenv_setting_path: "{% if pyenv_env == 'user' %}~/.bashrc{% else %}/etc/profile.d/pyenv.sh{% endif %}"
pyenv_update_git_install: false
pyenv_update_git_install: true
pyenv_enable_autocompletion: false
pyenv_python_versions:
- 3.9.6
- 3.10.0
pyenv_global:
- 3.9.6
- 3.10.0
pyenv_virtualenvs:
[]
# - { venv_name: "latest", py_version: "3.9.6" }
# - { venv_name: "latest", py_version: "3.10.0" }
# For a system install, the shims dir will not be writable by users, disable rehashing
pyenv_init_options: "{% if pyenv_env != 'user' %}--no-rehash{% endif %}"

Expand All @@ -24,9 +24,6 @@ pyenv_uninstall_python_w_wrong_configure_opts: false

pyenv_debian_packages:
- build-essential
# On Ubuntu 12.04 build may fail with the following error:
# python-build: wget (< 1.14) doesn't support Server Name Indication.
# Please install curl (>= 7.18.1) and try again
- curl
- git
- llvm
Expand Down
14 changes: 7 additions & 7 deletions molecule/multi-version/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
roles:
- role: staticdev.pyenv
pyenv_global:
- 3.9.6
- 3.8.11
- 3.10.0
- 3.9.9
pyenv_python_versions:
- 3.9.6
- 3.8.11
- 3.10.0
- 3.9.9
pyenv_virtualenvs:
- venv_name: latest_v310
py_version: 3.10.0
- venv_name: latest_v39
py_version: 3.9.6
- venv_name: latest_v38
py_version: 3.8.11
py_version: 3.9.9

0 comments on commit c56952d

Please sign in to comment.