majic-ansible-roles Changeset

Changeset - 686083d16102

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Branko Majic (branko) - 2 months ago 2024-02-10 21:22:35
branko@majic.rs

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.

4 files changed with 1 insertions and 50 deletions:

docs/rolereference.rst

roles/wsgi_website/meta/main.yml

roles/wsgi_website/molecule/default/molecule.yml

roles/wsgi_website/tasks/main.yml

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1985,7 +1985,6 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 10 (Buster)
 - Debian 11 (Bullseye)

roles/wsgi_website/meta/main.yml

➞

Show inline comments

@@ @@ -14,5 +14,4 @@ galaxy_info: @@
   platforms:
     - name: Debian
       versions:
         - 10
         - 11

roles/wsgi_website/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -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

roles/wsgi_website/tasks/main.yml

➞

Show inline comments

@@ @@ -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"

0 comments (0 inline, 0 general)