From 686083d1610215f59e84ead4a196834f796f5350 2024-02-10 21:22:35
From: Branko Majic <branko@majic.rs>
Date: 2024-02-10 21:22:35
Subject: [PATCH] MAR-191: Drop support for Debian 11 Buster from the wsgi_website role:

- Get rid of the workaround that used to cause issues in some of the
  previous versions of Debian while at it. This should no longer pose
  an issue.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index b18d5c1b08b70a73ae512c2b18358b2b22c0d4c6..d80ddd9625141f7ded455a47f7560c73bea66765 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -1985,7 +1985,6 @@ Distribution compatibility
 
 Role is compatible with the following distributions:
 
-- Debian 10 (Buster)
 - Debian 11 (Bullseye)
 
 
diff --git a/roles/wsgi_website/meta/main.yml b/roles/wsgi_website/meta/main.yml
index 624799878fcbdbb0ec77dd4c410dcc45b0dc0225..06bd0794f7ba40445e79306a5db9cfd3a5ba91ef 100644
--- a/roles/wsgi_website/meta/main.yml
+++ b/roles/wsgi_website/meta/main.yml
@@ -14,5 +14,4 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - 10
         - 11
diff --git a/roles/wsgi_website/molecule/default/molecule.yml b/roles/wsgi_website/molecule/default/molecule.yml
index 7d3c82e087442b363ce07bfa0803e480c17fdc0d..cc0a275082d528fa0c3ce9b3d3da22fc366a1f35 100644
--- a/roles/wsgi_website/molecule/default/molecule.yml
+++ b/roles/wsgi_website/molecule/default/molecule.yml
@@ -14,17 +14,6 @@ lint:
 
 platforms:
 
-  - name: wsgi-website-buster
-    groups:
-      - wsgi-website
-      - parameters-mandatory
-      - parameters-optional
-    box: debian/contrib-buster64
-    memory: 512
-    cpus: 1
-    provider_raw_config_args:
-      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
-
   - name: wsgi-website-bullseye
     groups:
       - wsgi-website
diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index 1c9b2cc6e97f48c3d04e323d4e7548b2a9f18ec4..4f07bcaa56431d3bda4fd3c7e1c4feadc958e0ea 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -106,49 +106,13 @@
     group: "{{ user }}"
     mode: 02750
 
-# @TODO: Get rid of this if possible in Debian Buster.
-# Do not install setuptools when creating the virtual environment -
-# otherwise it will also install Debian-specific pkg-resources
-# package. The pkg-resources package can be removed, but this breaks
-# the package downloading via pip.
-#
-# Install setuptools later on via separate pip invocation.
-#
-# The pkg-resources package is also annoying because it shows-up in
-# the output of the pip freeze command, and also interferes with the
-# virtual environment management using pip-tools.
-#
-# For more details, see:
-#
-# - https://github.com/pypa/pip/issues/4022
-# - https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
-# - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871790
-
 - name: Create Python virtual environment
-  command: '/usr/bin/virtualenv --no-setuptools --python "{{ python_interpreter }}" --prompt "({{ fqdn }})" "{{ home }}/virtualenv"'
+  command: '/usr/bin/virtualenv --python "{{ python_interpreter }}" --prompt "({{ fqdn }})" "{{ home }}/virtualenv"'
   args:
     creates: "{{ home }}/virtualenv/bin/{{ python_interpreter | basename }}"
   become: true
   become_user: "{{ admin }}"
 
-# @TODO: Park of the pkg-resources described above.
-- name: Install setuptools in virtual environment
-  pip:
-    name:
-      - "setuptools"
-    virtualenv: "{{ home }}/virtualenv"
-  become: true
-  become_user: "{{ admin }}"
-
-# @TODO: Park of the pkg-resources described above.
-- name: Remove the pkg-resources package from virtual environment (see comments above for details)
-  pip:
-    name: pkg-resources
-    virtualenv: "{{ home }}/virtualenv"
-    state: absent
-  become: true
-  become_user: "{{ admin }}"
-
 - name: Configure project directory for the Python virtual environment
   template:
     src: "venv_project.j2"