Merge pull request #206 from YPCrumble/feature/upgrade-python

Upgrade Python to 3.12 and 3.13.

Author: YPCrumble

.github/workflows/molecule.yml

@@ -1,22 +1,25 @@
 ---
 name: Molecule Test
 on:
-  push:
   pull_request:
   schedule:
     - cron: '30 5 * * 0'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: true
       max-parallel: 4
       matrix:
-        python-version: ["3.10", 3.11]
+        python-version: ["3.12", "3.13"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

README.md

@@ -1,8 +1,13 @@
-ansible-django-stack
-====================
+# Ansible Django Stack
 
 ![Build Status](https://github.com/jcalazan/ansible-django-stack/actions/workflows/molecule.yml/badge.svg?branch=master)
 
+This is a complete Ansible playbook that will deploy a Django application to a
+server. It includes roles for setting up a PostgreSQL database, Nginx web
+server, Gunicorn application server, and Celery task queue.
+
+## Requirements
+
 Ansible Playbook designed for environments running a Django app.
 It can install and configure these applications that are commonly used in
 production Django deployments:
@@ -26,6 +31,10 @@ trusted SSL certificates with [Let's Encrypt][lets-encrypt].
 
 **Tested with Cloud Providers:** [Digital Ocean][digital-ocean], [AWS][aws], [Rackspace][rackspace]
 
+## Python Requirements
+
+This project requires **Python 3.12 or 3.13**. Earlier versions of Python are no longer supported.
+
 ## Getting Started
 
 A quick way to get started is with Vagrant.
@@ -194,9 +203,6 @@ ansible-playbook --ssh-extra-args=-A -i production site.yml
 This is a little bit clunky but it does not restrict you from setting other
 SSH options if you need to.
 
-
-
-
 ## Security
 
 *NOTE: Do not run the Security role without understanding what it does.
@@ -318,14 +324,16 @@ The [Vagrantfile](Vagrantfile) uses the Ubuntu 22.04 LTS Vagrant box for a
 
 ### Changing the Python version used by your application
 
-Python 3 is used by default in the `virtualenv`. To use Python 2 instead, just
-override the `virtualenv_python_version` variable and set it to `python`.
+This project supports Python 3.12 and 3.13. Python 3.12 is used by default in the `virtualenv`. 
+To use Python 3.13 instead, override the `virtualenv_python_version` variable and set it to `python3.13`.
 
 It is possible to install other versions of Python from an
 [unofficial PPA by Felix Krull (see disclaimer)][deadsnakes].
 To use this PPA, override the `enable_deadsnakes_ppa` variable and set it to
 `yes`. Then the `virtualenv_python_version` variable can be set to the name of
-a Python package from this PPA, such as `python3.6`.
+a Python package from this PPA, such as `python3.12` or `python3.13`.
+
+**Note:** Only Python 3.12 and 3.13 are officially supported and tested.
 
 ### Changing the Python version used by Ansible
 

group_vars/development/vars.yml

@@ -11,7 +11,7 @@ application_name: django_default_project
 #
 # More info here: https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
 enable_deadsnakes_ppa: true
-virtualenv_python_version: python3.11
+virtualenv_python_version: python3.12
 
 
 # Git settings.

group_vars/vagrant/vars.yml

@@ -11,7 +11,7 @@ application_name: django_default_project
 #
 # More info here: https://launchpad.net/~fkrull/+archive/ubuntu/deadsnakes
 enable_deadsnakes_ppa: true
-virtualenv_python_version: python3.9
+virtualenv_python_version: python3.12
 
 
 # Git settings.

roles/rabbitmq/tasks/main.yml

@@ -1,24 +1,5 @@
 ---
 
-- name: Add the RabbitMQ release signing key to the apt trusted keys
-  ansible.builtin.apt_key: url=https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key
-           state=present
-
-- name: Add the RabbitMQ repository to the apt sources list
-  ansible.builtin.apt_repository: repo='deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu {{ ansible_distribution_release }} main'
-                  update_cache={{ update_apt_cache }}
-                  state=present
-
-- name: Add the RabbitMQ Erlang signing key to the apt trusted keys
-  ansible.builtin.apt_key: url=https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key
-           state=present
-
-- name: Add the RabbitMQ Erlang repository to the apt sources list
-  ansible.builtin.apt_repository: repo='deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu {{ ansible_distribution_release }} main'
-                  update_cache={{ update_apt_cache }}
-                  state=present
-
-
 - name: Install RabbitMQ server
   ansible.builtin.apt:
     update_cache: "{{ update_apt_cache }}"

roles/web/tasks/install_additional_packages.yml

@@ -15,4 +15,3 @@
       - gnutls-dev
       - libpq-dev
       - "{{ virtualenv_python_version + '-dev' }}"
-      - "{{ virtualenv_python_version + '-distutils' }}"  # Required by Ubuntu 22.04