From 257932d2216822550b659b442c64bb8625ead3b6 Mon Sep 17 00:00:00 2001 From: staticdev Date: Sat, 17 Jun 2023 09:18:54 +0200 Subject: [PATCH] Remove Debian 10 --- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 5 ++--- README.md | 18 +++++++++--------- defaults/main.yml | 6 +++--- meta/main.yml | 2 +- molecule/default/converge.yml | 6 +++--- molecule/multi-version/converge.yml | 18 +++++++++--------- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e83ab8..c74f0ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Upgrade pip run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 27b6462..e240541 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install test dependencies run: pip install --constraint=.github/workflows/constraints.txt ansible yamllint ansible-lint @@ -45,7 +45,6 @@ jobs: distro: - debian12 - debian11 - - debian10 # https://github.com/geerlingguy/docker-ubuntu2204-ansible/issues/6 # - ubuntu2204 - ubuntu2004 @@ -59,7 +58,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Upgrade pip run: | diff --git a/README.md b/README.md index 99d735f..2406c58 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ Here is the list of all variables and their default values: - `pyenvrc_path: "{{ pyenv_path }}"` - `pyenv_owner: "{{ ansible_env.USER }}"` - `pyenv_owner_group: "{{ pyenv_owner }}"` -- `pyenv_python_versions: [3.11.0]` -- `pyenv_virtualenvs: [{ venv_name: latest, py_version: 3.11.0 }]` -- `pyenv_global: [3.11.0]` +- `pyenv_python_versions: [3.11.4]` +- `pyenv_virtualenvs: [{ venv_name: latest, py_version: 3.11.4 }]` +- `pyenv_global: [3.11.4]` - `pyenv_update_git_install: true` (get latest pyenv from git) - `pyenv_enable_autocompletion: false` - `pyenv_enable_virtualenvs: true` @@ -54,17 +54,17 @@ None. pyenvrc_path: "{{ ansible_env.HOME }}" pyenv_owner: "{{ instance_owner }}" pyenv_global: - - 3.11.0 - - 3.10.6 + - 3.11.4 + - 3.10.12 pyenv_enable_autocompletion: false pyenv_python_versions: - - 3.11.0 - - 3.10.6 + - 3.11.4 + - 3.10.12 pyenv_virtualenvs: - venv_name: latest_v311 - py_version: 3.11.0 + py_version: 3.11.4 - venv_name: latest_v310 - py_version: 3.10.6 + py_version: 3.10.12 ``` ## License diff --git a/defaults/main.yml b/defaults/main.yml index a6ce6ae..149c4bf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,12 +13,12 @@ pyenv_update_git_install: true pyenv_enable_autocompletion: false pyenv_enable_virtualenvs: true pyenv_python_versions: - - 3.11.0 + - 3.11.4 pyenv_global: - - 3.11.0 + - 3.11.4 pyenv_virtualenvs: [] - # - { venv_name: "latest", py_version: "3.11.0" } + # - { venv_name: "latest", py_version: "3.11.4" } # 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 %}" diff --git a/meta/main.yml b/meta/main.yml index 1ccf3a1..ddc50f0 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -15,7 +15,7 @@ galaxy_info: - name: Debian versions: - - buster + - bookworm - bullseye - name: Ubuntu diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 80064c0..4b55b09 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -8,6 +8,6 @@ ansible.builtin.include_role: name: "staticdev.pyenv" vars: - pyenv_version: "v2.3.9" - pyenv_virtualenv_version: "v1.1.5" - pyenv_update_version: "810db78" + pyenv_version: "v2.3.20" + pyenv_virtualenv_version: "v1.2.1" + pyenv_update_version: "38ac747" diff --git a/molecule/multi-version/converge.yml b/molecule/multi-version/converge.yml index d0f1fdc..331c4d9 100644 --- a/molecule/multi-version/converge.yml +++ b/molecule/multi-version/converge.yml @@ -8,17 +8,17 @@ ansible.builtin.include_role: name: "staticdev.pyenv" vars: - pyenv_version: "v2.3.9" - pyenv_virtualenv_version: "v1.1.5" - pyenv_update_version: "810db78" + pyenv_version: "v2.3.20" + pyenv_virtualenv_version: "v1.2.1" + pyenv_update_version: "38ac747" pyenv_global: - - 3.11.0 - - 3.10.6 + - 3.11.4 + - 3.10.12 pyenv_python_versions: - - 3.11.0 - - 3.10.6 + - 3.11.4 + - 3.10.12 pyenv_virtualenvs: - venv_name: latest_v311 - py_version: 3.11.0 + py_version: 3.11.4 - venv_name: latest_v310 - py_version: 3.10.6 + py_version: 3.10.12