From a083d5ba8877b9cf3aae1ff755d4196e2efbe5af Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 11 2023 16:52:12 +0000 Subject: [PATCH 1/3] Ansible_collections: fix copy-paste error --- diff --git a/guidelines/modules/ROOT/pages/Ansible_collections.adoc b/guidelines/modules/ROOT/pages/Ansible_collections.adoc index 43fb3bb..ce8980e 100644 --- a/guidelines/modules/ROOT/pages/Ansible_collections.adoc +++ b/guidelines/modules/ROOT/pages/Ansible_collections.adoc @@ -422,8 +422,8 @@ Now, the macros extract the collection namespace from the `galaxy.yml`. ---- The ansible-packaging macros previously required -packagers to manually set `+%collection_namespace+` in specfiles. -Now, the macros extract the collection namespace from the `galaxy.yml`. +packagers to manually set `+%collection_name+` in specfiles. +Now, the macros extract the collection name from the `galaxy.yml`. [#ansible_collection_files] From bfad073c09b62f278ff425deccc38cdd91bc34c2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 11 2023 16:52:12 +0000 Subject: [PATCH 2/3] Ansible_collections: update EPEL compatibility note Naming specific RHEL minor versions will get outdated quickly. Both RHEL 8.8 and 9.2 now build against python3.11. The RHEL people like to make our job difficult by continually changing the Python version [1]. [1]: That's not the actual reason they do it, but it's an unfortunate side effect. --- diff --git a/guidelines/modules/ROOT/pages/Ansible_collections.adoc b/guidelines/modules/ROOT/pages/Ansible_collections.adoc index ce8980e..ed8b396 100644 --- a/guidelines/modules/ROOT/pages/Ansible_collections.adoc +++ b/guidelines/modules/ROOT/pages/Ansible_collections.adoc @@ -132,12 +132,8 @@ The `+%ansible_test_unit+` macro MUST be used to run tests. ==== It is currently impossible to run unit tests on EPEL 8 and 9. -ansible-core in RHEL 8.6 is built against python38. In c8s and the next RHEL -8 minor release, it will be built against python39. The testing dependencies -are not yet packaged for either Python version in EPEL 8. - -ansible-test in RHEL 9.0 still needs python3-mock, but this -requirement has been removed in CentOS 9 Stream. +ansible-core in RHEL 8 and 9 are built against alternative python stacks for +which the necessary test dependencies are not available. The rest of these guidelines are applicable to EPEL 8 and 9, and `+ansible-packaging+` itself is available there. From 545bb921acb7a40281ab93fa1206d62bd94a4bda Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 11 2023 16:52:12 +0000 Subject: [PATCH 3/3] Ansible_collections: s/principal/principle/ 🫣 --- diff --git a/guidelines/modules/ROOT/pages/Ansible_collections.adoc b/guidelines/modules/ROOT/pages/Ansible_collections.adoc index ed8b396..a6d534a 100644 --- a/guidelines/modules/ROOT/pages/Ansible_collections.adoc +++ b/guidelines/modules/ROOT/pages/Ansible_collections.adoc @@ -101,7 +101,7 @@ but it doesn't make sense for the larger, more general ansible-collection-community-general collection to Recommend `+python3-redis+` for the `+redis+` lookup plugin. This guideline seeks to prevent ballooning collection packages. -`+ansible-core+` and `+ansible+` follow this same principal. +`+ansible-core+` and `+ansible+` follow this same principle. == Build and Installation