From e7548c4073307190cd911214fa46ac19e390a6fe Mon Sep 17 00:00:00 2001
From: Robert de Bock <robert.debock@adfinis.com>
Date: Mon, 6 Jan 2025 10:09:01 +0100
Subject: [PATCH] Welcome to 2025.

---
 .github/workflows/molecule.yml | 48 ++++++++++++++++++++++++++++++++--
 .gitlab-ci.yml                 | 22 ++++++++--------
 LICENSE                        |  2 +-
 tox.ini                        | 17 +++++-------
 4 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 73c1b5c..c97b15b 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -41,7 +41,7 @@ jobs:
           - image: "debian"
             tag: "bullseye"
           - image: "fedora"
-            tag: "39"
+            tag: "40"
           - image: "fedora"
             tag: "latest"
           - image: "fedora"
@@ -85,7 +85,51 @@ jobs:
           - image: "debian"
             tag: "bullseye"
           - image: "fedora"
-            tag: "39"
+            tag: "40"
+          - image: "fedora"
+            tag: "latest"
+          - image: "fedora"
+            tag: "rawhide"
+          - image: "ubuntu"
+            tag: "latest"
+          - image: "ubuntu"
+            tag: "jammy"
+          - image: "ubuntu"
+            tag: "focal"
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: molecule
+        run: |
+          apt-get update -qq
+          apt-get -y -qq install yamllint docker.io
+          pip install --no-cache-dir tox
+          if [ -f tox.ini ] ; then tox ; fi
+          if [ ! -f tox.ini ] ; then pip install -r requirements.yml ; pip install ansible-lint ansible-core ; molecule test ; fi
+        env:
+          image: ${{ matrix.config.image }}
+          tag: ${{ matrix.config.tag }}
+  python-3-13:
+    needs:
+      - lint
+    runs-on: ubuntu-20.04
+    container:
+      image: python:3.13
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - image: "alpine"
+            tag: "latest"
+          - image: "enterpriselinux"
+            tag: "latest"
+          - image: "debian"
+            tag: "latest"
+          - image: "debian"
+            tag: "bullseye"
+          - image: "fedora"
+            tag: "40"
           - image: "fedora"
             tag: "latest"
           - image: "fedora"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c7d230..aa91089 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,34 +17,34 @@ molecule:
     matrix:
       - image: "alpine"
         tag: "latest"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "enterpriselinux"
         tag: "latest"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "debian"
         tag: "latest"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "debian"
         tag: "bullseye"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "fedora"
-        tag: "39"
-        python: ['python:3.9', 'python:3.10']
+        tag: "40"
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "fedora"
         tag: "latest"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "fedora"
         tag: "rawhide"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "ubuntu"
         tag: "latest"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "ubuntu"
         tag: "jammy"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
       - image: "ubuntu"
         tag: "focal"
-        python: ['python:3.9', 'python:3.10']
+        python: ['python:3.9', 'python:3.10', 'python:3.13']
 
 galaxy:
   script:
diff --git a/LICENSE b/LICENSE
index be5b773..9bca2cf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Robert de Bock (robert@meinit.nl)
+   Copyright 2025 Robert de Bock (robert@meinit.nl)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/tox.ini b/tox.ini
index 744a483..9013d28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = ansible-2.{15,16,17}
+envlist = ansible-2.{15,16,17,18}
 skipsdist = true
 
 [testenv]
@@ -37,12 +37,9 @@ deps =
     ansible-core==2.17.*
     ansible-lint==24.*
 
-# Future work, not releases, just prepared. See:
-# https://docs.ansible.com/ansible/devel//roadmap/ROADMAP_2_18.html
-# Note: enable python3.13 in `vars/main.yml` as well.
-# [testenv:ansible-2.18]
-# basepython = python3.13
-# deps =
-#     -rrequirements.txt
-#     ansible-core==2.18.*
-#     ansible-lint==24.*
+[testenv:ansible-2.18]
+basepython = python3.13
+deps =
+    -rrequirements.txt
+    ansible-core==2.18.*
+    ansible-lint==24.*