From 7c5be6db7677463652f4a34d37472665c11abad2 Mon Sep 17 00:00:00 2001 From: jhoyt4 Date: Fri, 20 Dec 2024 10:09:14 -0500 Subject: [PATCH] py-ansible, py-ansible-core, py-ansible-compat: update ansible packages to latest revs for python 3.13 support py-ansible: upgrade to 11.1.0 add python313 path to support py-setuptools 75.8.0 py-ansible-core: upgrade to 2.18.1 add python313 remove defunct ansible-connection py-ansible-compat: upgrade to 24.10.0 add python313 correct download name and homepage ansible-select: remove defunct ansible-connection --- python/ansible_select/Portfile | 2 +- python/ansible_select/files/base | 1 - python/py-ansible-compat/Portfile | 17 +++++++++++------ python/py-ansible-core/Portfile | 14 +++++++++----- python/py-ansible-core/files/py310-ansible | 1 - python/py-ansible-core/files/py311-ansible | 1 - python/py-ansible-core/files/py312-ansible | 1 - python/py-ansible-core/files/py313-ansible | 9 +++++++++ python/py-ansible-core/files/py39-ansible | 1 - python/py-ansible/Portfile | 10 +++++----- 10 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 python/py-ansible-core/files/py313-ansible diff --git a/python/ansible_select/Portfile b/python/ansible_select/Portfile index 7d4924a74303f..94b97130c368f 100644 --- a/python/ansible_select/Portfile +++ b/python/ansible_select/Portfile @@ -6,7 +6,7 @@ PortGroup select 1.0 name ansible_select version 0.1 -revision 1 +revision 2 categories python sysutils supported_archs noarch platforms any diff --git a/python/ansible_select/files/base b/python/ansible_select/files/base index f8c7dfd8044c3..55716baad7f4f 100644 --- a/python/ansible_select/files/base +++ b/python/ansible_select/files/base @@ -1,6 +1,5 @@ bin/ansible bin/ansible-config -bin/ansible-connection bin/ansible-console bin/ansible-doc bin/ansible-galaxy diff --git a/python/py-ansible-compat/Portfile b/python/py-ansible-compat/Portfile index 4c727702667b4..21b6a35baa282 100644 --- a/python/py-ansible-compat/Portfile +++ b/python/py-ansible-compat/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup python 1.0 name py-ansible-compat -version 4.1.11 +version 24.10.0 revision 0 platforms {darwin any} @@ -15,14 +15,19 @@ maintainers {judaew @judaew} openmaintainer description \ Functions that help interacting with various versions of Ansible long_description {*}${description} -homepage https://github.com/ansible/ansible-compat -checksums rmd160 ca04c268c763cebfd6b07551376c585b6d484138 \ - sha256 b3e9f9d7c3a1ce6222de444e9dc6fece7eba70ac64f2a0befdc4e2d542018b4a \ - size 73021 +homepage https://pypi.python.org/pypi/ansible-compat +master_sites pypi:a/ansible_compat +distname ansible_compat-${version} +distfiles ansible_compat-${version}.tar.gz +dist_subdir ansible_compat-${version} + +checksums rmd160 d7f02c83fade368c757f9144dc4bbd5a87a9a5a4 \ + sha256 0ad873e0dae8b2de79bc33ced813d6c92c716c4d7b82f9a4693e1fd57f43776e \ + size 81818 python.pep517 yes -python.versions 39 310 311 312 +python.versions 39 310 311 312 313 if {${name} ne ${subport}} { depends_build-append \ diff --git a/python/py-ansible-core/Portfile b/python/py-ansible-core/Portfile index 849bdb57ae86c..00113f5dfb931 100644 --- a/python/py-ansible-core/Portfile +++ b/python/py-ansible-core/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup select 1.0 name py-ansible-core -version 2.17.2 +version 2.18.1 distname ansible_core-${version} revision 0 license GPL-3+ @@ -19,9 +19,9 @@ maintainers {adfernandes @adfernandes} {gmail.com:pedro.salgado @steenzo homepage https://github.com/ansible/ansible description SSH-based configuration management and deployment system -checksums rmd160 da4eca386dddf6d08294d416de116141dcf37bde \ - sha256 3dfa15249069ea0d001257902c968ddf9bb71d965769b8802bce85187556c5d8 \ - size 3125313 +checksums rmd160 61fb99987fb8f6aac69a2c170f471b6b5658bef5 \ + sha256 14cac1f92bbdae881cb0616eddeb17925e8cb507e486087975e724533d9de74f \ + size 3069965 long_description \ Ansible is a radically simple model-driven configuration \ @@ -31,11 +31,15 @@ long_description \ be written in any language and are transferred to managed machines \ automatically. -python.versions 39 310 311 312 +python.versions 39 310 311 312 313 python.pep517 yes if {${name} ne ${subport}} { patch { + # This patch fixes ansible_core 2.18.1 to be compatible with the setuptools 75.8.0 + # It should be removed or modified in the future when either are updated + reinplace -q "s#75.6.0#75.8.0#g" pyproject.toml + fs-traverse f ${worksrcpath} { if {[file isfile ${f}] && [regexp {\.(py|yml|yaml)$} ${f} match]} { reinplace -q "s#/etc/ansible#${prefix}/etc/ansible#g" ${f} diff --git a/python/py-ansible-core/files/py310-ansible b/python/py-ansible-core/files/py310-ansible index 98879ff4aa447..fa9ac17f98598 100644 --- a/python/py-ansible-core/files/py310-ansible +++ b/python/py-ansible-core/files/py310-ansible @@ -1,6 +1,5 @@ bin/ansible-3.10 bin/ansible-config-3.10 -bin/ansible-connection-3.10 bin/ansible-console-3.10 bin/ansible-doc-3.10 bin/ansible-galaxy-3.10 diff --git a/python/py-ansible-core/files/py311-ansible b/python/py-ansible-core/files/py311-ansible index b58c7bb6bb101..f4ddb392e0585 100644 --- a/python/py-ansible-core/files/py311-ansible +++ b/python/py-ansible-core/files/py311-ansible @@ -1,6 +1,5 @@ bin/ansible-3.11 bin/ansible-config-3.11 -bin/ansible-connection-3.11 bin/ansible-console-3.11 bin/ansible-doc-3.11 bin/ansible-galaxy-3.11 diff --git a/python/py-ansible-core/files/py312-ansible b/python/py-ansible-core/files/py312-ansible index e669d9a53bf56..39f09596d79bc 100644 --- a/python/py-ansible-core/files/py312-ansible +++ b/python/py-ansible-core/files/py312-ansible @@ -1,6 +1,5 @@ bin/ansible-3.12 bin/ansible-config-3.12 -bin/ansible-connection-3.12 bin/ansible-console-3.12 bin/ansible-doc-3.12 bin/ansible-galaxy-3.12 diff --git a/python/py-ansible-core/files/py313-ansible b/python/py-ansible-core/files/py313-ansible new file mode 100644 index 0000000000000..e8ed970ec1ec3 --- /dev/null +++ b/python/py-ansible-core/files/py313-ansible @@ -0,0 +1,9 @@ +bin/ansible-3.13 +bin/ansible-config-3.13 +bin/ansible-console-3.13 +bin/ansible-doc-3.13 +bin/ansible-galaxy-3.13 +bin/ansible-inventory-3.13 +bin/ansible-playbook-3.13 +bin/ansible-pull-3.13 +bin/ansible-vault-3.13 diff --git a/python/py-ansible-core/files/py39-ansible b/python/py-ansible-core/files/py39-ansible index a06cba16d4d9d..013a70df16f3e 100644 --- a/python/py-ansible-core/files/py39-ansible +++ b/python/py-ansible-core/files/py39-ansible @@ -1,6 +1,5 @@ bin/ansible-3.9 bin/ansible-config-3.9 -bin/ansible-connection-3.9 bin/ansible-console-3.9 bin/ansible-doc-3.9 bin/ansible-galaxy-3.9 diff --git a/python/py-ansible/Portfile b/python/py-ansible/Portfile index 3477039fa684a..c8f3ae5cd5125 100644 --- a/python/py-ansible/Portfile +++ b/python/py-ansible/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup python 1.0 name py-ansible -version 10.2.0 +version 11.1.0 revision 0 license GPL-3+ @@ -17,9 +17,9 @@ maintainers {adfernandes @adfernandes} {gmail.com:pedro.salgado @steenzo homepage https://github.com/ansible/ansible description SSH-based configuration management and deployment system -checksums rmd160 44dc3a47200f857db6246e89b9f8bce7830deea6 \ - sha256 8aa0629ba8eced6465e2ceb49029e93d337c4a6fc5a3e6e98825c258dd6a7057 \ - size 39352378 +checksums rmd160 0a2f65660e4ddb0330e0780f8d07c75e61a70505 \ + sha256 d01b425990d960d2a33fc378e1b73dbca1c0e28bc22f4056ab6b3c8e9ae74fba \ + size 41299850 long_description \ Ansible is a radically simple model-driven configuration \ @@ -29,7 +29,7 @@ long_description \ be written in any language and are transferred to managed machines \ automatically. -python.versions 39 310 311 312 +python.versions 39 310 311 312 313 python.pep517 yes if {${name} ne ${subport}} {