From 922ac53a02a755b373cb296268d7b67bae7097f8 2024-02-25 21:27:36
From: Branko Majic <branko@majic.rs>
Date: 2024-02-25 21:27:36
Subject: [PATCH] MAR-192: Drop the Python 2.7-specific packages from installation:

- These are leftovers from previous work for dropping the Python 2.7
  support.

---

diff --git a/roles/common/molecule/default/tests/test_default.py b/roles/common/molecule/default/tests/test_default.py
index b25cd3da09689fcc8fc0fbac521891dfd151380a..1cbd19f3b3ff08ab03d6e66b02f471e39bcd8c6a 100644
--- a/roles/common/molecule/default/tests/test_default.py
+++ b/roles/common/molecule/default/tests/test_default.py
@@ -119,7 +119,6 @@ def test_installed_packages(host):
     assert host.package('ssl-cert').is_installed
     assert host.package('ferm').is_installed
     assert host.package('apticron').is_installed
-    assert host.package('python-setuptools').is_installed
     assert host.package('python3-setuptools').is_installed
     assert host.package('virtualenv').is_installed
 
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index c5f44c91f7520867cec41c0ce251529cca8c3eba..3b7b17abf161cebc27d3d50af31ac92ff703d583 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -323,7 +323,6 @@
 - name: Install packages required for running pip requirements checks
   apt:
     name:
-      - python-setuptools
       - python3-setuptools
       - virtualenv
     state: present
diff --git a/roles/web_server/molecule/default/tests/test_default.py b/roles/web_server/molecule/default/tests/test_default.py
index 583410dbe3229c18e9ce652df5b5e0cf2f2de2e6..d0655271391fdbcd83506a872986b2c075628609 100644
--- a/roles/web_server/molecule/default/tests/test_default.py
+++ b/roles/web_server/molecule/default/tests/test_default.py
@@ -12,7 +12,6 @@ def test_installed_packages(host, php_info):
     """
 
     assert host.package('nginx').is_installed
-    assert host.package('python-setuptools').is_installed
     assert host.package('python3-setuptools').is_installed
     assert host.package('virtualenv').is_installed
     assert host.package('virtualenvwrapper').is_installed
diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index 8f4dedb63f8f14c5dd95134b015d1ae5c0c745f5..e36d6e352b77c6eae7140bc44c2998d0d3ee90c9 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -140,7 +140,6 @@
 - name: Install base packages for Python web applications
   apt:
     name:
-      - python-setuptools
       - python3-setuptools
       - virtualenv
       - virtualenvwrapper