fix variables

mafalb · Jan 8, 2024 · a5bd68a · a5bd68a
1 parent 1117c23
commit a5bd68a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/roles/python/vars/RedHat-8.yml b/roles/python/vars/RedHat-8.yml
@@ -5,9 +5,20 @@
 python_default_version: "3.6"
 python_package:
   _default: "@python36"
-  "2.7": "@python27"
   "3.6": "@python36"
   "3.8": "@python38"
   "3.9": "@python39"
   "3.11": "python3.11"
+
+python_extra_packages:
+  _default:
+    - python3-libselinux
+    - python3-cryptography
+    - glibc-langpack-en
+    - python3-setuptools
+  '3.6': []
+  '3.8': []
+  '3.9': []
+  '3.10': []
+  '3.11': []
 ...
diff --git a/roles/python/vars/RedHat-9.yml b/roles/python/vars/RedHat-9.yml
@@ -13,15 +13,6 @@ python_extra_packages:
     - python3-cryptography
     - glibc-langpack-en
     - python3-setuptools
-  '3.9':
-    - glibc-langpack-en
-    - python3.9-libselinux
-    - python3.9-cryptography
-    - python3.9-setuptools
-  '3.11':
-    - glibc-langpack-en
-    - python3.11-libselinux
-    - python3.11-cryptography
-    - python3.11-setuptools
-
+  '3.9': []
+  '3.11': []
 ...
diff --git a/roles/python/vars/RedHat.yml b/roles/python/vars/RedHat.yml
@@ -3,6 +3,4 @@
 # see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt
 ---
 __mafalb_python_version: "{{ version | default(mafalb_python_version) | default(mafalb_python_default_version) }}"
-__mafalb_python_extra_packages:
-  "2": [python-virtualenv]
-  "3": []
+__mafalb_python_extra_packages: []
diff --git a/roles/python/vars/Ubuntu-22.yml b/roles/python/vars/Ubuntu-22.yml
@@ -9,11 +9,11 @@ python_package:
   "3.11": python3.11
 python_extra_packages:
   _default:
-    - python3.10-venv
-    - python3.10-setuptools
+    - python3-venv
+    - python3-setuptools
   "3.10":
-    - python3.10-venv
-    - python3.10-setuptools
+    - python3-venv
+    - python3-setuptools
   "3.11":
     - python3.11-venv
     - python3.11-setuptools