From ef575d981ceaf16836d1500107d7838d1b6cb8ef Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 2 Jul 2022 13:22:52 -0500 Subject: [PATCH 01/48] Update to 2.7.0. Fixes rhbz#2103337. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a151fe8..264fca0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /community.docker-2.5.0.tar.gz /community.docker-2.5.1.tar.gz /community.docker-2.6.0.tar.gz +/community.docker-2.7.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index cc0edbc..fe373c1 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -11,7 +11,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 2.6.0 +Version: 2.7.0 %global tag %{version} %forgemeta Release: 1%{?dist} @@ -84,6 +84,9 @@ popd %changelog +* Sat Jul 02 2022 Maxwell G - 2.7.0-1 +- Update to 2.7.0. Fixes rhbz#2103337. + * Wed May 25 2022 Maxwell G - 2.6.0-1 - Update to 2.6.0. Fixes rhbz#2089991. diff --git a/sources b/sources index 174e012..ae154fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-2.6.0.tar.gz) = 8cd8bb735576324c57bc0a897e3ae080d08762b74f9f33072a5b95b8e07adc0ee50c5f4226cb620ebd6ad7a121b3a88b26f61b65bd4f2ad254b165acf1b9c2e1 +SHA512 (community.docker-2.7.0.tar.gz) = 1b2a6eb54df8d7445b0bb334fb20ac0f01c660f1b23cc4508149927a88e7ff0dc8beb65b13b5f8bb31b4d60c70541cbc7724b69a3e2b7d7c434ced13fd257231 From 403a9e40651e1924b2fcb5267731bdb7325bee40 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 2 Jul 2022 19:46:25 -0500 Subject: [PATCH 02/48] Fix shebangs --- ansible-collection-community-docker.rpmlintrc | 2 -- ansible-collection-community-docker.spec | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 ansible-collection-community-docker.rpmlintrc diff --git a/ansible-collection-community-docker.rpmlintrc b/ansible-collection-community-docker.rpmlintrc deleted file mode 100644 index 22575a0..0000000 --- a/ansible-collection-community-docker.rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -# See https://src.fedoraproject.org/rpms/ansible/pull-request/19#comment-90820 for more information. -addFilter("E: non-executable-script") diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index fe373c1..483750d 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -21,7 +21,6 @@ Summary: Ansible modules and plugins for working with Docker License: GPLv3+ and Python URL: %{ansible_collection_url} Source0: %{forgesource} -Source1: %{name}.rpmlintrc Patch0: build_ignore-unnecessary-files.patch BuildArch: noarch @@ -46,8 +45,7 @@ working with Docker. %prep %forgeautosetup -p1 -%global py3_shbang_opts %{nil} -%py3_shebang_fix . +find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' + %if %{with tests} @@ -86,6 +84,7 @@ popd %changelog * Sat Jul 02 2022 Maxwell G - 2.7.0-1 - Update to 2.7.0. Fixes rhbz#2103337. +- Fix shebangs * Wed May 25 2022 Maxwell G - 2.6.0-1 - Update to 2.6.0. Fixes rhbz#2089991. From c24d7fcf2822b251cac2d73c0c00c252700bb1af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:50:32 +0000 Subject: [PATCH 03/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 483750d..9aa925d 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -14,7 +14,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} Version: 2.7.0 %global tag %{version} %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPLv3+ except plugins/module_utils/_version.py. @@ -82,6 +82,9 @@ popd %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 02 2022 Maxwell G - 2.7.0-1 - Update to 2.7.0. Fixes rhbz#2103337. - Fix shebangs From a039b9ba8f1f2df0d5dbdb027dff257e2f1c4828 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 12 Aug 2022 17:23:06 -0500 Subject: [PATCH 04/48] Update to 3.0.0 (rhbz#2105298). Follow Fedora's new licensing guidelines --- .gitignore | 1 + ansible-collection-community-docker.spec | 64 ++++++++++++++++++++++-- sources | 2 +- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 264fca0..e0bc2d4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /community.docker-2.5.1.tar.gz /community.docker-2.6.0.tar.gz /community.docker-2.7.0.tar.gz +/community.docker-3.0.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 9aa925d..5098d93 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -11,14 +11,61 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 2.7.0 -%global tag %{version} +Version: 3.0.0 +%global tag %{version} %forgemeta Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker -# All files are GPLv3+ except plugins/module_utils/_version.py. -License: GPLv3+ and Python +# All files are GPL-3.0-or-later, except the following files, which are originally +# from the Docker Python SDK. +# rg --pcre2 -g '!tests/sanity/extra/licenses.py' 'SPDX-License-Identifier: (?!GPL-3\.0-or-later)' | sed 's|^|# |' +# +# plugins/module_utils/_api/constants.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/_import_helper.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/api/daemon.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/basehttpadapter.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/ssladapter.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/unixconn.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/npipeconn.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/proxy.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/ports.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/types/daemon.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/json_stream.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/sshconn.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/decorators.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/api/client.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/build.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/tls.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/errors.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/config.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/fnmatch.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/auth.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/errors.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/npipesocket.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/constants.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/utils.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/socket.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/utils.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/store.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/test_errors.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/fake_stat.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/transport/test_sshconn.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_ports.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_decorators.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_json_stream.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_proxy.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/test_auth.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_config.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/ca.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_build.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_utils.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/cert.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/key.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/api/test_client.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/fake_api.py:# SPDX-License-Identifier: Apache-2.0 +License: GPL-3.0-or-later AND Apache-2.0 URL: %{ansible_collection_url} Source0: %{forgesource} Patch0: build_ignore-unnecessary-files.patch @@ -36,6 +83,9 @@ BuildRequires: ansible-core BuildRequires: /usr/bin/ansible-test %endif +# This collection contains vendored code from the Docker Python SDK. +Provides: bundled(python3dist(docker)) + %description %{name} provides the %{collection_namespace}.%{collection_name} @@ -76,12 +126,16 @@ popd %files -%license COPYING PSF-license.txt +%license COPYING LICENSES %doc README.md CHANGELOG.rst %{ansible_collection_files} %changelog +* Fri Aug 12 2022 Maxwell G - 3.0.0-1 +- Update to 3.0.0 (rhbz#2105298). +- Follow Fedora's new licensing guidelines + * Wed Jul 20 2022 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index ae154fa..55468c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-2.7.0.tar.gz) = 1b2a6eb54df8d7445b0bb334fb20ac0f01c660f1b23cc4508149927a88e7ff0dc8beb65b13b5f8bb31b4d60c70541cbc7724b69a3e2b7d7c434ced13fd257231 +SHA512 (community.docker-3.0.0.tar.gz) = a40e64c21044c1d3f5a02cc91cd783882f1fdee9f18dfaea442910f89e0b0a1ea4fca775364d72fd2c84f5c306b757bcdf3da99f295189c4a65141ce497e158a From 53881cd75a64256b472c6968024a64d4799e966e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 15 Aug 2022 20:39:12 -0500 Subject: [PATCH 05/48] Update to 3.0.1. --- .gitignore | 1 + ansible-collection-community-docker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e0bc2d4..3121e79 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /community.docker-2.6.0.tar.gz /community.docker-2.7.0.tar.gz /community.docker-3.0.0.tar.gz +/community.docker-3.0.1.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 5098d93..7b17240 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -11,10 +11,10 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 3.0.0 +Version: 3.0.1 %global tag %{version} %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -132,6 +132,9 @@ popd %changelog +* Tue Aug 16 2022 Maxwell G - 3.0.1-1 +- Update to 3.0.1. + * Fri Aug 12 2022 Maxwell G - 3.0.0-1 - Update to 3.0.0 (rhbz#2105298). - Follow Fedora's new licensing guidelines diff --git a/sources b/sources index 55468c3..e6f9411 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.0.0.tar.gz) = a40e64c21044c1d3f5a02cc91cd783882f1fdee9f18dfaea442910f89e0b0a1ea4fca775364d72fd2c84f5c306b757bcdf3da99f295189c4a65141ce497e158a +SHA512 (community.docker-3.0.1.tar.gz) = c34befb9c74d5025efd7566dfa1668b0dcc7a300726562375455b86629511057c22a1be19b0ba841b2a3185cc1500665f55eb8beb7426a3edce9d99f7072b502 From 61f496a6d76a5887694c5e58782751d24448767e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 16 Aug 2022 18:16:59 -0500 Subject: [PATCH 06/48] Update to 3.0.2. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3121e79..07fd0b9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /community.docker-2.7.0.tar.gz /community.docker-3.0.0.tar.gz /community.docker-3.0.1.tar.gz +/community.docker-3.0.2.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 7b17240..8097ebb 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -11,7 +11,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 3.0.1 +Version: 3.0.2 %global tag %{version} %forgemeta Release: 1%{?dist} @@ -132,6 +132,9 @@ popd %changelog +* Tue Aug 16 2022 Maxwell G - 3.0.2-1 +- Update to 3.0.2. + * Tue Aug 16 2022 Maxwell G - 3.0.1-1 - Update to 3.0.1. diff --git a/sources b/sources index e6f9411..5556e5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.0.1.tar.gz) = c34befb9c74d5025efd7566dfa1668b0dcc7a300726562375455b86629511057c22a1be19b0ba841b2a3185cc1500665f55eb8beb7426a3edce9d99f7072b502 +SHA512 (community.docker-3.0.2.tar.gz) = 4d222075626d0067300ab01a1d797abddcd63549575da0d6a71145e1b210242e7522b0d6f9aaa5e8938db8f1ccee842fc67632f94ca6d14b396a34938f3267b9 From e996983cd2f10f6b17f71446b4b6fbb660e0a25e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 18 Aug 2022 21:50:39 -0500 Subject: [PATCH 07/48] Use new %ansible_test_unit macro --- ansible-collection-community-docker.spec | 38 ++++++++++-------------- build_ignore-unnecessary-files.patch | 7 +++-- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 8097ebb..96ecc0c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -2,11 +2,20 @@ %global collection_name docker %global forgeurl https://github.com/ansible-collections/%{collection_namespace}.%{collection_name} -# Only run tests where %%generate_buildrequires and test deps are available. -%if 0%{?fedora} -%bcond_without tests +# 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 c9s. +# The conditional should be replaced with the line below once RHEL 9.1 is +# released. +# %%if (%%{defined fedora} || 0%%{?rhel} >= 9) +# +%if %{defined fedora} +%bcond_without tests %else -%bcond_with tests +%bcond_with tests %endif @@ -76,11 +85,9 @@ BuildArch: noarch Buildrequires: python3-devel BuildRequires: ansible-packaging -# The new ansible-core, specifically, is required for the `build_ignore:` patch and ansible-test to work properly. -# Therefore, we cannot rely on ansible-packaging which might pull in ansible 2.9. -BuildRequires: ansible-core %if %{with tests} -BuildRequires: /usr/bin/ansible-test +BuildRequires: ansible-packaging-tests +BuildRequires: %{py3_dist requests} %endif # This collection contains vendored code from the Docker Python SDK. @@ -98,12 +105,6 @@ working with Docker. find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' + -%if %{with tests} -%generate_buildrequires -%pyproject_buildrequires -N tests/unit/requirements.txt %{python3_sitelib}/ansible_test/_data/requirements/units.txt -%endif - - %build %ansible_collection_build @@ -114,14 +115,7 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %check %if %{with tests} -mkdir -p ../ansible_collections/%{collection_namespace} -cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name} -pushd ../ansible_collections/%{collection_namespace}/%{collection_name} -# mkdir -p ansible_collections/%%{collection_namespace} -# ln -sr . ansible_collections/%%{collection_namespace}/%%{collection_name} -# pushd ansible_collections/%%{collection_namespace}/%%{collection_name} -ansible-test units --python-interpreter %{__python3} --local -popd +%ansible_test_unit %endif diff --git a/build_ignore-unnecessary-files.patch b/build_ignore-unnecessary-files.patch index 9586180..2f2e9ae 100644 --- a/build_ignore-unnecessary-files.patch +++ b/build_ignore-unnecessary-files.patch @@ -1,7 +1,8 @@ diff -Naur a/galaxy.yml b/galaxy.yml ---- a/galaxy.yml 2022-04-25 14:32:27.000000000 -0500 -+++ b/galaxy.yml 2022-04-29 21:07:55.917219135 -0500 -@@ -18,3 +18,9 @@ +--- a/galaxy.yml ++++ b/galaxy.yml +@@ -25,4 +25,10 @@ + build_ignore: # https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#ignoring-files-and-folders - .gitignore - changelogs/.plugin-cache.yaml From 47d5722ba0f8f47265e619f4ba627ad68683d516 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 19 Aug 2022 14:46:01 -0500 Subject: [PATCH 08/48] Update to 2.7.1. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a151fe8..9f57afa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /community.docker-2.5.0.tar.gz /community.docker-2.5.1.tar.gz /community.docker-2.6.0.tar.gz +/community.docker-2.7.1.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index cc0edbc..b0d7408 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -11,7 +11,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 2.6.0 +Version: 2.7.1 %global tag %{version} %forgemeta Release: 1%{?dist} @@ -84,6 +84,9 @@ popd %changelog +* Fri Aug 19 2022 Maxwell G - 2.7.1-1 +- Update to 2.7.1. + * Wed May 25 2022 Maxwell G - 2.6.0-1 - Update to 2.6.0. Fixes rhbz#2089991. diff --git a/sources b/sources index 174e012..81b4061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-2.6.0.tar.gz) = 8cd8bb735576324c57bc0a897e3ae080d08762b74f9f33072a5b95b8e07adc0ee50c5f4226cb620ebd6ad7a121b3a88b26f61b65bd4f2ad254b165acf1b9c2e1 +SHA512 (community.docker-2.7.1.tar.gz) = 4b0b3bd123729d35fbb70c7ddc90eb67154e17e53762be9a9ccc4cf63081b4a4f4e73a050a881d56bd13cd119e14785259777e2caf64a89243403eec8e99d8ea From 79c9b8a25f82657ad73618be013d812076f8e676 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 19 Aug 2022 15:10:33 -0500 Subject: [PATCH 09/48] Use new macros for unit testing --- ansible-collection-community-docker.spec | 35 +++++++----------------- build_ignore-unnecessary-files.patch | 3 +- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index b0d7408..5d5708a 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -3,10 +3,10 @@ %global forgeurl https://github.com/ansible-collections/%{collection_namespace}.%{collection_name} # Only run tests where %%generate_buildrequires and test deps are available. -%if 0%{?fedora} -%bcond_without tests +%if %{defined fedora} +%bcond_without tests %else -%bcond_with tests +%bcond_with tests %endif @@ -22,19 +22,17 @@ License: GPLv3+ and Python URL: %{ansible_collection_url} Source0: %{forgesource} Source1: %{name}.rpmlintrc +# Downstream only patch to remove tests, CI configuration, and other +# unnecessary development files from the built collection. Patch0: build_ignore-unnecessary-files.patch +Patch1: https://github.com/ansible-collections/community.docker/pull/433.patch#/remove-python-mock.patch BuildArch: noarch -# Needed for %%py3_shebang_fix. -Buildrequires: python3-devel - BuildRequires: ansible-packaging -# The new ansible-core, specifically, is required for the `build_ignore:` patch and ansible-test to work properly. -# Therefore, we cannot rely on ansible-packaging which might pull in ansible 2.9. -BuildRequires: ansible-core %if %{with tests} -BuildRequires: /usr/bin/ansible-test +BuildRequires: ansible-packaging-tests +BuildRequires: %{py3_dist docker} %endif @@ -46,16 +44,10 @@ working with Docker. %prep %forgeautosetup -p1 + %global py3_shbang_opts %{nil} %py3_shebang_fix . - -%if %{with tests} -%generate_buildrequires -%pyproject_buildrequires -N tests/unit/requirements.txt %{python3_sitelib}/ansible_test/_data/requirements/units.txt -%endif - - %build %ansible_collection_build @@ -66,14 +58,7 @@ working with Docker. %check %if %{with tests} -mkdir -p ../ansible_collections/%{collection_namespace} -cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name} -pushd ../ansible_collections/%{collection_namespace}/%{collection_name} -# mkdir -p ansible_collections/%%{collection_namespace} -# ln -sr . ansible_collections/%%{collection_namespace}/%%{collection_name} -# pushd ansible_collections/%%{collection_namespace}/%%{collection_name} -ansible-test units --python-interpreter %{__python3} --local -popd +%ansible_test_unit %endif diff --git a/build_ignore-unnecessary-files.patch b/build_ignore-unnecessary-files.patch index 9586180..762a921 100644 --- a/build_ignore-unnecessary-files.patch +++ b/build_ignore-unnecessary-files.patch @@ -1,7 +1,7 @@ diff -Naur a/galaxy.yml b/galaxy.yml --- a/galaxy.yml 2022-04-25 14:32:27.000000000 -0500 +++ b/galaxy.yml 2022-04-29 21:07:55.917219135 -0500 -@@ -18,3 +18,9 @@ +@@ -18,3 +18,8 @@ # https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#ignoring-files-and-folders - .gitignore - changelogs/.plugin-cache.yaml @@ -10,4 +10,3 @@ diff -Naur a/galaxy.yml b/galaxy.yml + - .azure-pipelines + - changelogs/fragments/.keep + - docs -+ - .pyproject-builddir From 0bf04a1127d6c115625136e716ef56b85931b37a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 19 Aug 2022 15:11:29 -0500 Subject: [PATCH 10/48] Fix shebang handling --- ansible-collection-community-docker.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 5d5708a..f09cbd4 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -44,9 +44,8 @@ working with Docker. %prep %forgeautosetup -p1 +find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' + -%global py3_shbang_opts %{nil} -%py3_shebang_fix . %build %ansible_collection_build From 1e2d60d2dea4b70c6eceff659d290cf5765b81a8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 19 Aug 2022 15:12:09 -0500 Subject: [PATCH 11/48] Adopt new licensing guidelines --- ansible-collection-community-docker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index f09cbd4..007874e 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -17,8 +17,8 @@ Version: 2.7.1 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker -# All files are GPLv3+ except plugins/module_utils/_version.py. -License: GPLv3+ and Python +# All files are GPL-3.0-or-later except plugins/module_utils/_version.py. +License: GPL-3.0-or-later and Python URL: %{ansible_collection_url} Source0: %{forgesource} Source1: %{name}.rpmlintrc From 5c1e44164141eeaad0252b6776a5120e5e38bcfa Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 19 Aug 2022 15:27:18 -0500 Subject: [PATCH 12/48] Upload missing patch --- remove-python-mock.patch | 125 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 remove-python-mock.patch diff --git a/remove-python-mock.patch b/remove-python-mock.patch new file mode 100644 index 0000000..3ff2c20 --- /dev/null +++ b/remove-python-mock.patch @@ -0,0 +1,125 @@ +From 7e9eee69c273515129cc0ac0e425b4b2c7da9263 Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Thu, 28 Jul 2022 13:57:18 +0200 +Subject: [PATCH 1/2] Prefer unitest.mock by using compat.mock + +`mock` is a backport of the `unittest.mock` module from the stdlib, and +there's no reason to use it on newer Python versions. `mock` is deprecated +in Fedora, so I figured I'd propose this here before downstream patching +our ansible-collection-community-docker package. +--- + tests/unit/plugins/inventory/test_docker_containers.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/plugins/inventory/test_docker_containers.py b/tests/unit/plugins/inventory/test_docker_containers.py +index 1c831b21..74721bfe 100644 +--- a/tests/unit/plugins/inventory/test_docker_containers.py ++++ b/tests/unit/plugins/inventory/test_docker_containers.py +@@ -11,7 +11,7 @@ + + import pytest + +-from mock import MagicMock ++from ansible_collections.community.docker.tests.unit.compat.mock import MagicMock + + from ansible import constants as C + from ansible.errors import AnsibleError + +From 0efaff6a01c113980a70b92e93bdadd7237a7949 Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Thu, 28 Jul 2022 14:15:53 +0200 +Subject: [PATCH 2/2] Remove compat.mock code for older Python 3 versions + +This removes compatibility for older versions of Python 3 that are no +longer supported. +--- + tests/unit/compat/mock.py | 79 --------------------------------------- + 1 file changed, 79 deletions(-) + +diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py +index f8f565dc..515b94a3 100644 +--- a/tests/unit/compat/mock.py ++++ b/tests/unit/compat/mock.py +@@ -28,82 +28,3 @@ + from mock import * + except ImportError: + print('You need the mock library installed on python2.x to run tests') +- +- +-# Prior to 3.4.4, mock_open cannot handle binary read_data +-if sys.version_info >= (3,) and sys.version_info < (3, 4, 4): +- file_spec = None +- +- def _iterate_read_data(read_data): +- # Helper for mock_open: +- # Retrieve lines from read_data via a generator so that separate calls to +- # readline, read, and readlines are properly interleaved +- sep = b'\n' if isinstance(read_data, bytes) else '\n' +- data_as_list = [l + sep for l in read_data.split(sep)] +- +- if data_as_list[-1] == sep: +- # If the last line ended in a newline, the list comprehension will have an +- # extra entry that's just a newline. Remove this. +- data_as_list = data_as_list[:-1] +- else: +- # If there wasn't an extra newline by itself, then the file being +- # emulated doesn't have a newline to end the last line remove the +- # newline that our naive format() added +- data_as_list[-1] = data_as_list[-1][:-1] +- +- for line in data_as_list: +- yield line +- +- def mock_open(mock=None, read_data=''): +- """ +- A helper function to create a mock to replace the use of `open`. It works +- for `open` called directly or used as a context manager. +- +- The `mock` argument is the mock object to configure. If `None` (the +- default) then a `MagicMock` will be created for you, with the API limited +- to methods or attributes available on standard file handles. +- +- `read_data` is a string for the `read` methoddline`, and `readlines` of the +- file handle to return. This is an empty string by default. +- """ +- def _readlines_side_effect(*args, **kwargs): +- if handle.readlines.return_value is not None: +- return handle.readlines.return_value +- return list(_data) +- +- def _read_side_effect(*args, **kwargs): +- if handle.read.return_value is not None: +- return handle.read.return_value +- return type(read_data)().join(_data) +- +- def _readline_side_effect(): +- if handle.readline.return_value is not None: +- while True: +- yield handle.readline.return_value +- for line in _data: +- yield line +- +- global file_spec +- if file_spec is None: +- import _io +- file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) +- +- if mock is None: +- mock = MagicMock(name='open', spec=open) +- +- handle = MagicMock(spec=file_spec) +- handle.__enter__.return_value = handle +- +- _data = _iterate_read_data(read_data) +- +- handle.write.return_value = None +- handle.read.return_value = None +- handle.readline.return_value = None +- handle.readlines.return_value = None +- +- handle.read.side_effect = _read_side_effect +- handle.readline.side_effect = _readline_side_effect() +- handle.readlines.side_effect = _readlines_side_effect +- +- mock.return_value = handle +- return mock From e55893e2184f663d517921db469a5c4b2b9f3071 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 8 Sep 2022 08:52:46 -0500 Subject: [PATCH 13/48] Update to 3.1.0. Fixes rhbz#2125151. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07fd0b9..1f0065d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /community.docker-3.0.0.tar.gz /community.docker-3.0.1.tar.gz /community.docker-3.0.2.tar.gz +/community.docker-3.1.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 96ecc0c..acaa7e0 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -20,7 +20,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 3.0.2 +Version: 3.1.0 %global tag %{version} %forgemeta Release: 1%{?dist} @@ -126,6 +126,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Thu Sep 08 2022 Maxwell G - 3.1.0-1 +- Update to 3.1.0. Fixes rhbz#2125151. + * Tue Aug 16 2022 Maxwell G - 3.0.2-1 - Update to 3.0.2. diff --git a/sources b/sources index 5556e5b..66eb3cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.0.2.tar.gz) = 4d222075626d0067300ab01a1d797abddcd63549575da0d6a71145e1b210242e7522b0d6f9aaa5e8938db8f1ccee842fc67632f94ca6d14b396a34938f3267b9 +SHA512 (community.docker-3.1.0.tar.gz) = 4848648f2b5c16386ab5ae9539bebabeb2264e28a210fca7bb873e3877f7d436d4f8c114a467f6438cf6490d4f870dfe5913d59a8f799c7968fc0dbe10b2e898 From e9292d008e7838ca3398c1ea6f1ca9eab9c8f301 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 8 Sep 2022 08:56:00 -0500 Subject: [PATCH 14/48] Update licensing --- ansible-collection-community-docker.spec | 68 ++++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index acaa7e0..37f880c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -28,52 +28,52 @@ Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally # from the Docker Python SDK. -# rg --pcre2 -g '!tests/sanity/extra/licenses.py' 'SPDX-License-Identifier: (?!GPL-3\.0-or-later)' | sed 's|^|# |' +# rg --pcre2 -g '!tests/sanity/extra/licenses.py' 'SPDX-License-Identifier: (?!GPL-3\.0-or-later)' | sort | sed 's|^|# |' # -# plugins/module_utils/_api/constants.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/_import_helper.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/api/client.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/api/daemon.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/auth.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/constants.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/constants.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/errors.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/store.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/credentials/utils.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/errors.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/_import_helper.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/tls.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/transport/basehttpadapter.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/npipeconn.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/npipesocket.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/transport/sshconn.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/transport/ssladapter.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/transport/unixconn.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/transport/npipeconn.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/utils/proxy.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/utils/ports.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/types/daemon.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/utils/json_stream.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/transport/sshconn.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/utils/decorators.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/api/client.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/utils/build.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/tls.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/errors.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/utils/config.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/decorators.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/utils/fnmatch.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/auth.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/credentials/errors.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/transport/npipesocket.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/credentials/constants.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/utils/utils.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/json_stream.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/ports.py:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/proxy.py:# SPDX-License-Identifier: Apache-2.0 # plugins/module_utils/_api/utils/socket.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/credentials/utils.py:# SPDX-License-Identifier: Apache-2.0 -# plugins/module_utils/_api/credentials/store.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/test_errors.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/fake_stat.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/transport/test_sshconn.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_ports.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_decorators.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_json_stream.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_proxy.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/test_auth.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_config.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/testdata/certs/ca.pem:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_build.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/test_utils.py:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/testdata/certs/cert.pem:# SPDX-License-Identifier: Apache-2.0 -# tests/unit/plugins/module_utils/_api/utils/testdata/certs/key.pem:# SPDX-License-Identifier: Apache-2.0 +# plugins/module_utils/_api/utils/utils.py:# SPDX-License-Identifier: Apache-2.0 # tests/unit/plugins/module_utils/_api/api/test_client.py:# SPDX-License-Identifier: Apache-2.0 # tests/unit/plugins/module_utils/_api/fake_api.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/fake_stat.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/test_auth.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/test_errors.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/transport/test_sshconn.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_build.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_config.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/ca.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/cert.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/testdata/certs/key.pem:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_decorators.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_json_stream.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_ports.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_proxy.py:# SPDX-License-Identifier: Apache-2.0 +# tests/unit/plugins/module_utils/_api/utils/test_utils.py:# SPDX-License-Identifier: Apache-2.0 License: GPL-3.0-or-later AND Apache-2.0 URL: %{ansible_collection_url} Source0: %{forgesource} From 8f124aa45352e007486c421ed283fe3b9f87614f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 8 Sep 2022 10:22:27 -0500 Subject: [PATCH 15/48] Remove more duplicate and unnecessary files --- ansible-collection-community-docker.spec | 3 +++ build_ignore-unnecessary-files.patch | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 37f880c..d622965 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -1,6 +1,9 @@ %global collection_namespace community %global collection_name docker %global forgeurl https://github.com/ansible-collections/%{collection_namespace}.%{collection_name} +# This package does not include any ELF binaries, and we don't want this file +# in the built collection artifact. +%undefine _package_note_file # 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 diff --git a/build_ignore-unnecessary-files.patch b/build_ignore-unnecessary-files.patch index 2f2e9ae..08c1af3 100644 --- a/build_ignore-unnecessary-files.patch +++ b/build_ignore-unnecessary-files.patch @@ -1,7 +1,7 @@ diff -Naur a/galaxy.yml b/galaxy.yml --- a/galaxy.yml +++ b/galaxy.yml -@@ -25,4 +25,10 @@ +@@ -25,4 +25,15 @@ build_ignore: # https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#ignoring-files-and-folders - .gitignore @@ -12,3 +12,8 @@ diff -Naur a/galaxy.yml b/galaxy.yml + - changelogs/fragments/.keep + - docs + - .pyproject-builddir ++ # We install these files with %license and %doc. We don't want them duplicated. ++ - CHANGELOG.rst ++ - README.md ++ - COPYING ++ - LICENSES From 512d903b07efb3b3a3871a136f98a0cc6a0cad9d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 2 Nov 2022 17:38:18 -0500 Subject: [PATCH 16/48] Update to 3.2.0 (rhbz#2139344). Remove forge macros. --- .gitignore | 1 + ansible-collection-community-docker.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1f0065d..81a5e76 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /community.docker-3.0.1.tar.gz /community.docker-3.0.2.tar.gz /community.docker-3.1.0.tar.gz +/community.docker-3.2.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index d622965..6ffd532 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -1,6 +1,5 @@ %global collection_namespace community %global collection_name docker -%global forgeurl https://github.com/ansible-collections/%{collection_namespace}.%{collection_name} # This package does not include any ELF binaries, and we don't want this file # in the built collection artifact. %undefine _package_note_file @@ -23,9 +22,7 @@ Name: ansible-collection-%{collection_namespace}-%{collection_name} -Version: 3.1.0 -%global tag %{version} -%forgemeta +Version: 3.2.0 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -79,7 +76,8 @@ Summary: Ansible modules and plugins for working with Docker # tests/unit/plugins/module_utils/_api/utils/test_utils.py:# SPDX-License-Identifier: Apache-2.0 License: GPL-3.0-or-later AND Apache-2.0 URL: %{ansible_collection_url} -Source0: %{forgesource} +%global forgeurl https://github.com/ansible-collections/community.docker +Source0: %{forgeurl}/archive/%{version}/community.docker-%{version}.tar.gz Patch0: build_ignore-unnecessary-files.patch BuildArch: noarch @@ -104,7 +102,7 @@ working with Docker. %prep -%forgeautosetup -p1 +%autosetup -p1 -n community.docker-%{version} find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' + @@ -129,6 +127,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Nov 02 2022 Maxwell G - 3.2.0-1 +- Update to 3.2.0. Fixes rhbz#2139344. + * Thu Sep 08 2022 Maxwell G - 3.1.0-1 - Update to 3.1.0. Fixes rhbz#2125151. diff --git a/sources b/sources index 66eb3cd..a29802e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.1.0.tar.gz) = 4848648f2b5c16386ab5ae9539bebabeb2264e28a210fca7bb873e3877f7d436d4f8c114a467f6438cf6490d4f870dfe5913d59a8f799c7968fc0dbe10b2e898 +SHA512 (community.docker-3.2.0.tar.gz) = 46a192772c0cdfc5d7719e451602028fdaffee0185027eacf3025146e6ef7151109cddb59edcf7088872dac32b9eb0597b0e6bad5d2c90fe4d4b9242c70df089 From d78ad0e5758190a49a282bdffaa1a4af01793931 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 2 Nov 2022 17:38:22 -0500 Subject: [PATCH 17/48] Remove %collection_name* and _package_note_file handling - The %collection_name* macros are no longer needed with the new ansible-packaging version. - Remove `%undefine _package_note_file`. This is now handled by the ansible macros. --- ansible-collection-community-docker.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 6ffd532..61be12c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -1,9 +1,3 @@ -%global collection_namespace community -%global collection_name docker -# This package does not include any ELF binaries, and we don't want this file -# in the built collection artifact. -%undefine _package_note_file - # 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. @@ -21,7 +15,7 @@ %endif -Name: ansible-collection-%{collection_namespace}-%{collection_name} +Name: ansible-collection-community-docker Version: 3.2.0 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -75,7 +69,7 @@ Summary: Ansible modules and plugins for working with Docker # tests/unit/plugins/module_utils/_api/utils/test_proxy.py:# SPDX-License-Identifier: Apache-2.0 # tests/unit/plugins/module_utils/_api/utils/test_utils.py:# SPDX-License-Identifier: Apache-2.0 License: GPL-3.0-or-later AND Apache-2.0 -URL: %{ansible_collection_url} +URL: %{ansible_collection_url community docker} %global forgeurl https://github.com/ansible-collections/community.docker Source0: %{forgeurl}/archive/%{version}/community.docker-%{version}.tar.gz Patch0: build_ignore-unnecessary-files.patch @@ -120,10 +114,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %endif -%files +%files -f %{ansible_collection_filelist} %license COPYING LICENSES %doc README.md CHANGELOG.rst -%{ansible_collection_files} %changelog From 4510cadc3a136700d8232f91e63c4d73ed827cbb Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 2 Nov 2022 20:53:41 -0500 Subject: [PATCH 18/48] Remove unexpanded macros from %description --- ansible-collection-community-docker.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 61be12c..a78f6af 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -7,7 +7,7 @@ # The conditional should be replaced with the line below once RHEL 9.1 is # released. # %%if (%%{defined fedora} || 0%%{?rhel} >= 9) -# + %if %{defined fedora} %bcond_without tests %else @@ -90,9 +90,9 @@ Provides: bundled(python3dist(docker)) %description -%{name} provides the %{collection_namespace}.%{collection_name} -Ansible collection. The collection includes Ansible modules and plugins for -working with Docker. +ansible-collection-community-docker provides the community.docker Ansible +collection. The collection includes Ansible modules and plugins for working +with Docker. %prep From a48f6abe3fb2d1980ddc31984e8595e19003db60 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 2 Nov 2022 20:55:17 -0500 Subject: [PATCH 19/48] Account for .reuse and CHANGELOG.license community.docker has a .reuse/dep5 file that we want to be installed with the rest of the license files. CHANGELOG.rst.license is also a REUSE convention. These files should be installed next to the base file, so CHANGELOG.rst.license is moved to %{_docdir} along with CHANGELOG.rst. --- ansible-collection-community-docker.spec | 4 ++-- build_ignore-unnecessary-files.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index a78f6af..d86494a 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -115,8 +115,8 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %files -f %{ansible_collection_filelist} -%license COPYING LICENSES -%doc README.md CHANGELOG.rst +%license COPYING LICENSES .reuse/dep5 +%doc README.md CHANGELOG.rst* %changelog diff --git a/build_ignore-unnecessary-files.patch b/build_ignore-unnecessary-files.patch index 08c1af3..6e64bc8 100644 --- a/build_ignore-unnecessary-files.patch +++ b/build_ignore-unnecessary-files.patch @@ -11,9 +11,9 @@ diff -Naur a/galaxy.yml b/galaxy.yml + - .azure-pipelines + - changelogs/fragments/.keep + - docs -+ - .pyproject-builddir + # We install these files with %license and %doc. We don't want them duplicated. -+ - CHANGELOG.rst ++ - "CHANGELOG.rst*" + - README.md + - COPYING + - LICENSES ++ - .reuse From ae95f0ff009f44432c12f59a084fd765f9eef931 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Wed, 2 Nov 2022 21:00:21 -0500 Subject: [PATCH 20/48] Bump changelog --- ansible-collection-community-docker.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index d86494a..f0bcb54 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -17,7 +17,7 @@ Name: ansible-collection-community-docker Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -120,6 +120,10 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Thu Nov 03 2022 Maxwell G - 3.2.0-2 +- Remove unexpanded macros from %description +- Handle .reuse/dep5 + * Wed Nov 02 2022 Maxwell G - 3.2.0-1 - Update to 3.2.0. Fixes rhbz#2139344. From 69ddae7d521def885ae1e27191e1811db0d4b834 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 23 Sep 2022 18:52:19 -0500 Subject: [PATCH 21/48] Remove outdated dependency on python3-devel --- ansible-collection-community-docker.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index f0bcb54..2500007 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -76,9 +76,6 @@ Patch0: build_ignore-unnecessary-files.patch BuildArch: noarch -# Needed for %%py3_shebang_fix. -Buildrequires: python3-devel - BuildRequires: ansible-packaging %if %{with tests} BuildRequires: ansible-packaging-tests From 780e4b3ba4539a23d45f9016ace000dac07a559d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 29 Nov 2022 13:33:09 -0600 Subject: [PATCH 22/48] Enable unit tests on EPEL 9 RHEL 9.1 has the necessary ansible-core change to make this happen. --- ansible-collection-community-docker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 2500007..f291607 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,7 +8,7 @@ # released. # %%if (%%{defined fedora} || 0%%{?rhel} >= 9) -%if %{defined fedora} +%if %{defined fedora} || 0%{?rhel} >= 9 %bcond_without tests %else %bcond_with tests From 40a0e17c91f97d02853a4d85cc364e10a8286cb9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 29 Nov 2022 13:37:07 -0600 Subject: [PATCH 23/48] Update to 3.2.2. --- .gitignore | 1 + ansible-collection-community-docker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 81a5e76..df61160 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /community.docker-3.0.2.tar.gz /community.docker-3.1.0.tar.gz /community.docker-3.2.0.tar.gz +/community.docker-3.2.2.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index f291607..c71f44d 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,8 +16,8 @@ Name: ansible-collection-community-docker -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Tue Nov 29 2022 Maxwell G - 3.2.2-1 +- Update to 3.2.2. + * Thu Nov 03 2022 Maxwell G - 3.2.0-2 - Remove unexpanded macros from %description - Handle .reuse/dep5 diff --git a/sources b/sources index a29802e..2f70ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.2.0.tar.gz) = 46a192772c0cdfc5d7719e451602028fdaffee0185027eacf3025146e6ef7151109cddb59edcf7088872dac32b9eb0597b0e6bad5d2c90fe4d4b9242c70df089 +SHA512 (community.docker-3.2.2.tar.gz) = 2d3ac7efa4acd9ae153f7bbf5e2a886010bf9cc16393feb5d2edcf85cb1baa757e23a16bc005da45e939253a3f59028e2e84dc8f94602679f4e6f71d7da8f3ff From 49ac3f9e071291320902dc81d974658faec0fb5c Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 3 Dec 2022 16:05:50 -0600 Subject: [PATCH 24/48] Update to 3.3.0. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df61160..07b51cb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /community.docker-3.1.0.tar.gz /community.docker-3.2.0.tar.gz /community.docker-3.2.2.tar.gz +/community.docker-3.3.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index c71f44d..f096303 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.2.2 +Version: 3.3.0 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Sat Dec 03 2022 Maxwell G - 3.3.0-1 +- Update to 3.3.0. + * Tue Nov 29 2022 Maxwell G - 3.2.2-1 - Update to 3.2.2. diff --git a/sources b/sources index 2f70ee5..c4cab05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.2.2.tar.gz) = 2d3ac7efa4acd9ae153f7bbf5e2a886010bf9cc16393feb5d2edcf85cb1baa757e23a16bc005da45e939253a3f59028e2e84dc8f94602679f4e6f71d7da8f3ff +SHA512 (community.docker-3.3.0.tar.gz) = 66b190b9132af0b833f306f36379ecf51972264cb788e466aa2314a5f7c769da1dbe526e8c624c0e2309da311e17744205d8883fe51ca811f33f891d6f371e41 From 3688ce2b9e4344f3ab817ab6dbcfd17363a1bdbd Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 8 Dec 2022 18:57:36 -0600 Subject: [PATCH 25/48] Update to 3.3.1. Fixes rhbz#2150678. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07b51cb..d1dc043 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /community.docker-3.2.0.tar.gz /community.docker-3.2.2.tar.gz /community.docker-3.3.0.tar.gz +/community.docker-3.3.1.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index f096303..ebdcc5c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.3.0 +Version: 3.3.1 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Dec 09 2022 Maxwell G - 3.3.1-1 +- Update to 3.3.1. Fixes rhbz#2150678. + * Sat Dec 03 2022 Maxwell G - 3.3.0-1 - Update to 3.3.0. diff --git a/sources b/sources index c4cab05..f717b18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.3.0.tar.gz) = 66b190b9132af0b833f306f36379ecf51972264cb788e466aa2314a5f7c769da1dbe526e8c624c0e2309da311e17744205d8883fe51ca811f33f891d6f371e41 +SHA512 (community.docker-3.3.1.tar.gz) = 80f6cee607711cb90dede82773d951dda9d760aa9679a514a2e87577aa25015f844c5d2613a76bd6db81c3fde64e5f588b408ca7f408711a0f91a295f377e144 From 0de26dad4e02c6e92c7bf7839be800b1ee0aa350 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 10 Dec 2022 14:08:20 -0600 Subject: [PATCH 26/48] Fix macro in changelog --- ansible-collection-community-docker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index ebdcc5c..2d8072e 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -127,7 +127,7 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ - Update to 3.2.2. * Thu Nov 03 2022 Maxwell G - 3.2.0-2 -- Remove unexpanded macros from %description +- Remove unexpanded macros from %%description - Handle .reuse/dep5 * Wed Nov 02 2022 Maxwell G - 3.2.0-1 From 447ed9f012a316c033cd483736a25d39692e1480 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 10 Dec 2022 14:10:09 -0600 Subject: [PATCH 27/48] Update to 3.3.2. Fixes rhbz#2150678. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d1dc043..8df0f16 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /community.docker-3.2.2.tar.gz /community.docker-3.3.0.tar.gz /community.docker-3.3.1.tar.gz +/community.docker-3.3.2.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 2d8072e..460b596 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Sat Dec 10 2022 Maxwell G - 3.3.2-1 +- Update to 3.3.2. Fixes rhbz#2150678. + * Fri Dec 09 2022 Maxwell G - 3.3.1-1 - Update to 3.3.1. Fixes rhbz#2150678. diff --git a/sources b/sources index f717b18..777b691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.3.1.tar.gz) = 80f6cee607711cb90dede82773d951dda9d760aa9679a514a2e87577aa25015f844c5d2613a76bd6db81c3fde64e5f588b408ca7f408711a0f91a295f377e144 +SHA512 (community.docker-3.3.2.tar.gz) = 5674e4d909a19b0c1608b88b435d1ce3f865daadd3accd0c020305a1a6042e72a33baf37f792a5c61c07ece336d209921c0cff7c704f73f8b3ea629c6650c4c7 From 65d0faba7b75c19ccd7db1a2438d936f2af99c33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:46:31 +0000 Subject: [PATCH 28/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 460b596..e60bc11 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -17,7 +17,7 @@ Name: ansible-collection-community-docker Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 10 2022 Maxwell G - 3.3.2-1 - Update to 3.3.2. Fixes rhbz#2150678. From 3ffafd84a9fee724c88c07cbe35a0bea1b70bc97 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 23 Jan 2023 18:03:20 -0600 Subject: [PATCH 29/48] Update to 3.4.0. Fixes rhbz#2161016. --- .gitignore | 1 + ansible-collection-community-docker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8df0f16..4abc56c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /community.docker-3.3.0.tar.gz /community.docker-3.3.1.tar.gz /community.docker-3.3.2.tar.gz +/community.docker-3.4.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index e60bc11..f7fbd71 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,8 +16,8 @@ Name: ansible-collection-community-docker -Version: 3.3.2 -Release: 2%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Tue Jan 24 2023 Maxwell G - 3.4.0-1 +- Update to 3.4.0. Fixes rhbz#2161016. + * Wed Jan 18 2023 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 777b691..275f63c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.3.2.tar.gz) = 5674e4d909a19b0c1608b88b435d1ce3f865daadd3accd0c020305a1a6042e72a33baf37f792a5c61c07ece336d209921c0cff7c704f73f8b3ea629c6650c4c7 +SHA512 (community.docker-3.4.0.tar.gz) = cd9530b692a10069c0d054b72fae6efed6d8b5c25ad628c0f21a09eddeafd9607c806f20e535c291bd47bfda199f7f71af85852b894e40a19f613a9b3d6095a4 From fb047b25f4986c871c0151811b8bb27e1d6ea66b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 28 Feb 2023 18:57:51 -0600 Subject: [PATCH 30/48] Update to 3.4.2. Fixes rhbz#2172008. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4abc56c..0d69d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /community.docker-3.3.1.tar.gz /community.docker-3.3.2.tar.gz /community.docker-3.4.0.tar.gz +/community.docker-3.4.2.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index f7fbd71..72cf105 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.4.0 +Version: 3.4.2 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Mar 01 2023 Maxwell G - 3.4.2-1 +- Update to 3.4.2. Fixes rhbz#2172008. + * Tue Jan 24 2023 Maxwell G - 3.4.0-1 - Update to 3.4.0. Fixes rhbz#2161016. diff --git a/sources b/sources index 275f63c..d754137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.4.0.tar.gz) = cd9530b692a10069c0d054b72fae6efed6d8b5c25ad628c0f21a09eddeafd9607c806f20e535c291bd47bfda199f7f71af85852b894e40a19f613a9b3d6095a4 +SHA512 (community.docker-3.4.2.tar.gz) = 50aaa90a56d1d4e5a5198000a83ce015a70f01bb575e6cb21c567ec38d348e01cb07a2effe3d64a4e9fe3e8494a62764f32b7fb7642aa471a375acbe321064d9 From c6396ab5c8869e003cf67f13dc49adac99887695 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 31 Mar 2023 14:04:32 -0500 Subject: [PATCH 31/48] Update to 3.4.3. Fixes rhbz#2181482. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d69d4a..63c854f 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /community.docker-3.3.2.tar.gz /community.docker-3.4.0.tar.gz /community.docker-3.4.2.tar.gz +/community.docker-3.4.3.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 72cf105..d79d125 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Mar 31 2023 Maxwell G - 3.4.3-1 +- Update to 3.4.3. Fixes rhbz#2181482. + * Wed Mar 01 2023 Maxwell G - 3.4.2-1 - Update to 3.4.2. Fixes rhbz#2172008. diff --git a/sources b/sources index d754137..8d3ac1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.4.2.tar.gz) = 50aaa90a56d1d4e5a5198000a83ce015a70f01bb575e6cb21c567ec38d348e01cb07a2effe3d64a4e9fe3e8494a62764f32b7fb7642aa471a375acbe321064d9 +SHA512 (community.docker-3.4.3.tar.gz) = 8b810443b3c51049680e3c09d25de6b3ce77f619a29598ff5de84375a403789756000be7c3236afca60f5fb0f761e1cefadf30ccc85b4ed8761f12929502e0c1 From b4dfcf11c47bca35f853f678eae3b49685cbfeb8 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 6 May 2023 12:40:08 -0500 Subject: [PATCH 32/48] Update to 3.4.5. Fixes rhbz#2181482. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63c854f..13b5e93 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /community.docker-3.4.0.tar.gz /community.docker-3.4.2.tar.gz /community.docker-3.4.3.tar.gz +/community.docker-3.4.5.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index d79d125..cea4fe7 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -16,7 +16,7 @@ Name: ansible-collection-community-docker -Version: 3.4.3 +Version: 3.4.5 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -117,6 +117,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Sat May 06 2023 Maxwell G - 3.4.5-1 +- Update to 3.4.5. Fixes rhbz#2181482. + * Fri Mar 31 2023 Maxwell G - 3.4.3-1 - Update to 3.4.3. Fixes rhbz#2181482. diff --git a/sources b/sources index 8d3ac1d..ac1f1ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.4.3.tar.gz) = 8b810443b3c51049680e3c09d25de6b3ce77f619a29598ff5de84375a403789756000be7c3236afca60f5fb0f761e1cefadf30ccc85b4ed8761f12929502e0c1 +SHA512 (community.docker-3.4.5.tar.gz) = 59e992c4305f114315cb5bb3e30988d9730bc22985ec828cf571fe146a2240dbd5671b310d073ac5a524438a18dc535fcb6ee4f271b05d73be9862ee37b7b549 From 0a1e00226722819a285e65656f880823951c0e35 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 12 May 2023 19:21:53 +0000 Subject: [PATCH 33/48] Disable unit tests on RHEL 9 ansible-core is now packaged for python3.11 in RHEL 9.2. We don't have the necessary test deps packaged for that alternative Python stack. Relates: https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/thread/2MAGEGNYTGIPQLMYDJHNS2E5MQ5P35XD/ --- ansible-collection-community-docker.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index cea4fe7..1d8c3ca 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -1,14 +1,6 @@ -# 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 c9s. -# The conditional should be replaced with the line below once RHEL 9.1 is -# released. -# %%if (%%{defined fedora} || 0%%{?rhel} >= 9) - -%if %{defined fedora} || 0%{?rhel} >= 9 +# ansible-core is built for alternative Python stacks in RHEL which do not have +# the necessary test deps packaged. +%if %{defined fedora} %bcond_without tests %else %bcond_with tests From 20390fcfa494994d35129edd6380cef392853a6e Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 20 May 2023 15:04:05 -0500 Subject: [PATCH 34/48] Update to 3.4.6. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13b5e93..a8bb5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /community.docker-3.4.2.tar.gz /community.docker-3.4.3.tar.gz /community.docker-3.4.5.tar.gz +/community.docker-3.4.6.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 1d8c3ca..52e51e0 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,7 +8,7 @@ Name: ansible-collection-community-docker -Version: 3.4.5 +Version: 3.4.6 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -109,6 +109,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Sat May 20 2023 Maxwell G - 3.4.6-1 +- Update to 3.4.6. + * Sat May 06 2023 Maxwell G - 3.4.5-1 - Update to 3.4.5. Fixes rhbz#2181482. diff --git a/sources b/sources index ac1f1ec..7b611fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.4.5.tar.gz) = 59e992c4305f114315cb5bb3e30988d9730bc22985ec828cf571fe146a2240dbd5671b310d073ac5a524438a18dc535fcb6ee4f271b05d73be9862ee37b7b549 +SHA512 (community.docker-3.4.6.tar.gz) = 9f65d84ff1e764a162a0c22a2eb9d05882b975cec9f6b17255d09358ea05bd7526f0bbbab7da411fd864cf21f16b2219631d211bb4000a78ead7b55309609b48 From 00b3af90777401ef68a50a8a71ebaa004d41f613 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:19:16 +0000 Subject: [PATCH 35/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 52e51e0..0edd78c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 3.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -109,6 +109,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat May 20 2023 Maxwell G - 3.4.6-1 - Update to 3.4.6. From f4dcc0d58499079b0cd1048888dc99aede9c4034 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 25 Jul 2023 15:12:31 -0500 Subject: [PATCH 36/48] Fix FTBFS. Closes rhbz#2215512. --- ansible-collection-community-docker.spec | 7 +++- ...s-import-match_hostname-from-urllib3.patch | 35 +++++++++++++++++++ ...usage-of-deprecated-TestCase-methods.patch | 31 ++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 tests-import-match_hostname-from-urllib3.patch create mode 100644 tests-remove-usage-of-deprecated-TestCase-methods.patch diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 0edd78c..dc52d12 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 3.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -65,6 +65,8 @@ URL: %{ansible_collection_url community docker} %global forgeurl https://github.com/ansible-collections/community.docker Source0: %{forgeurl}/archive/%{version}/community.docker-%{version}.tar.gz Patch0: build_ignore-unnecessary-files.patch +Patch1: tests-import-match_hostname-from-urllib3.patch +Patch2: tests-remove-usage-of-deprecated-TestCase-methods.patch BuildArch: noarch @@ -109,6 +111,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Tue Jul 25 2023 Maxwell G - 3.4.6-3 +- Fix FTBFS. Closes rhbz#2215512. + * Wed Jul 19 2023 Fedora Release Engineering - 3.4.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/tests-import-match_hostname-from-urllib3.patch b/tests-import-match_hostname-from-urllib3.patch new file mode 100644 index 0000000..6a75571 --- /dev/null +++ b/tests-import-match_hostname-from-urllib3.patch @@ -0,0 +1,35 @@ +From b1c9a7ae922667742a1bb0dcce89ac372512d91a Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Tue, 25 Jul 2023 20:11:11 +0000 +Subject: [PATCH] tests: import match_hostname() from urllib3 + +It's been removed from the ssl module in Python 3.12. +--- + .../module_utils/_api/transport/test_ssladapter.py | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py +index 428163e..751b896 100644 +--- a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py ++++ b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py +@@ -25,9 +25,14 @@ try: + match_hostname, CertificateError + ) + except ImportError: +- from ssl import ( +- match_hostname, CertificateError +- ) ++ try: ++ from ssl import ( ++ match_hostname, CertificateError ++ ) ++ except ImportError: ++ from urllib3.util.ssl_match_hostname import ( ++ match_hostname, CertificateError ++ ) + + try: + from ssl import OP_NO_SSLv3, OP_NO_SSLv2, OP_NO_TLSv1 +-- +2.41.0 + diff --git a/tests-remove-usage-of-deprecated-TestCase-methods.patch b/tests-remove-usage-of-deprecated-TestCase-methods.patch new file mode 100644 index 0000000..c305ef4 --- /dev/null +++ b/tests-remove-usage-of-deprecated-TestCase-methods.patch @@ -0,0 +1,31 @@ +From 076a13403c41f7f509403398d0e3dd24d7f7df82 Mon Sep 17 00:00:00 2001 +From: Maxwell G +Date: Tue, 25 Jul 2023 20:14:49 +0000 +Subject: [PATCH] tests: remove usage of deprecated TestCase methods + +--- + tests/unit/plugins/connection/test_docker.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py +index 5ae6a8e..12a67ee 100644 +--- a/tests/unit/plugins/connection/test_docker.py ++++ b/tests/unit/plugins/connection/test_docker.py +@@ -36,7 +36,7 @@ class TestDockerConnectionClass(unittest.TestCase): + def test_docker_connection_module_too_old(self, mock_new_docker_verison, mock_old_docker_version): + self.dc._version = None + self.dc.remote_user = 'foo' +- self.assertRaisesRegexp(AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user) ++ self.assertRaisesRegex(AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user) + + @mock.patch('ansible_collections.community.docker.plugins.connection.docker.Connection._old_docker_version', + return_value=('false', 'garbage', '', 1)) +@@ -54,4 +54,4 @@ class TestDockerConnectionClass(unittest.TestCase): + def test_docker_connection_module_wrong_cmd(self, mock_new_docker_version, mock_old_docker_version): + self.dc._version = None + self.dc.remote_user = 'foo' +- self.assertRaisesRegexp(AnsibleError, '^Docker version check (.*?) failed: ', self.dc._get_actual_user) ++ self.assertRaisesRegex(AnsibleError, '^Docker version check (.*?) failed: ', self.dc._get_actual_user) +-- +2.41.0 + From 2b8d8e65f664ca41b036035910fb59be85104949 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:00:31 +0000 Subject: [PATCH 37/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index dc52d12..475af47 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 3.4.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -111,6 +111,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.4.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jul 25 2023 Maxwell G - 3.4.6-3 - Fix FTBFS. Closes rhbz#2215512. From b2e70df4942b2c59448364dd5e0b2914b12a25af Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 21 Jan 2024 06:12:47 +0000 Subject: [PATCH 38/48] Update to 3.5.0. --- .gitignore | 1 + ansible-collection-community-docker.spec | 9 ++--- sources | 2 +- ...s-import-match_hostname-from-urllib3.patch | 35 ------------------- ...usage-of-deprecated-TestCase-methods.patch | 31 ---------------- 5 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 tests-import-match_hostname-from-urllib3.patch delete mode 100644 tests-remove-usage-of-deprecated-TestCase-methods.patch diff --git a/.gitignore b/.gitignore index a8bb5c3..64c24a4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /community.docker-3.4.3.tar.gz /community.docker-3.4.5.tar.gz /community.docker-3.4.6.tar.gz +/community.docker-3.5.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 475af47..3ec8c6e 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,8 +8,8 @@ Name: ansible-collection-community-docker -Version: 3.4.6 -Release: 4%{?dist} +Version: 3.5.0 +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -65,8 +65,6 @@ URL: %{ansible_collection_url community docker} %global forgeurl https://github.com/ansible-collections/community.docker Source0: %{forgeurl}/archive/%{version}/community.docker-%{version}.tar.gz Patch0: build_ignore-unnecessary-files.patch -Patch1: tests-import-match_hostname-from-urllib3.patch -Patch2: tests-remove-usage-of-deprecated-TestCase-methods.patch BuildArch: noarch @@ -111,6 +109,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Sun Jan 21 2024 Maxwell G - 3.5.0-1 +- Update to 3.5.0. + * Fri Jan 19 2024 Fedora Release Engineering - 3.4.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 7b611fb..70249a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.4.6.tar.gz) = 9f65d84ff1e764a162a0c22a2eb9d05882b975cec9f6b17255d09358ea05bd7526f0bbbab7da411fd864cf21f16b2219631d211bb4000a78ead7b55309609b48 +SHA512 (community.docker-3.5.0.tar.gz) = 9699fbdb563d272ed80a63a960783554c549a99bba17d25bac57ec701dd29a8ce7620580204dc78b7b1e64c4ef738dfb51ef8cf3a85fc449f835a4ef135155c2 diff --git a/tests-import-match_hostname-from-urllib3.patch b/tests-import-match_hostname-from-urllib3.patch deleted file mode 100644 index 6a75571..0000000 --- a/tests-import-match_hostname-from-urllib3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b1c9a7ae922667742a1bb0dcce89ac372512d91a Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Tue, 25 Jul 2023 20:11:11 +0000 -Subject: [PATCH] tests: import match_hostname() from urllib3 - -It's been removed from the ssl module in Python 3.12. ---- - .../module_utils/_api/transport/test_ssladapter.py | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py -index 428163e..751b896 100644 ---- a/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py -+++ b/tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py -@@ -25,9 +25,14 @@ try: - match_hostname, CertificateError - ) - except ImportError: -- from ssl import ( -- match_hostname, CertificateError -- ) -+ try: -+ from ssl import ( -+ match_hostname, CertificateError -+ ) -+ except ImportError: -+ from urllib3.util.ssl_match_hostname import ( -+ match_hostname, CertificateError -+ ) - - try: - from ssl import OP_NO_SSLv3, OP_NO_SSLv2, OP_NO_TLSv1 --- -2.41.0 - diff --git a/tests-remove-usage-of-deprecated-TestCase-methods.patch b/tests-remove-usage-of-deprecated-TestCase-methods.patch deleted file mode 100644 index c305ef4..0000000 --- a/tests-remove-usage-of-deprecated-TestCase-methods.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 076a13403c41f7f509403398d0e3dd24d7f7df82 Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Tue, 25 Jul 2023 20:14:49 +0000 -Subject: [PATCH] tests: remove usage of deprecated TestCase methods - ---- - tests/unit/plugins/connection/test_docker.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py -index 5ae6a8e..12a67ee 100644 ---- a/tests/unit/plugins/connection/test_docker.py -+++ b/tests/unit/plugins/connection/test_docker.py -@@ -36,7 +36,7 @@ class TestDockerConnectionClass(unittest.TestCase): - def test_docker_connection_module_too_old(self, mock_new_docker_verison, mock_old_docker_version): - self.dc._version = None - self.dc.remote_user = 'foo' -- self.assertRaisesRegexp(AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user) -+ self.assertRaisesRegex(AnsibleError, '^docker connection type requires docker 1.3 or higher$', self.dc._get_actual_user) - - @mock.patch('ansible_collections.community.docker.plugins.connection.docker.Connection._old_docker_version', - return_value=('false', 'garbage', '', 1)) -@@ -54,4 +54,4 @@ class TestDockerConnectionClass(unittest.TestCase): - def test_docker_connection_module_wrong_cmd(self, mock_new_docker_version, mock_old_docker_version): - self.dc._version = None - self.dc.remote_user = 'foo' -- self.assertRaisesRegexp(AnsibleError, '^Docker version check (.*?) failed: ', self.dc._get_actual_user) -+ self.assertRaisesRegex(AnsibleError, '^Docker version check (.*?) failed: ', self.dc._get_actual_user) --- -2.41.0 - From fa440ae6018ecc44995b817001cc06ad7edb64a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:05:28 +0000 Subject: [PATCH 39/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 3ec8c6e..92e0882 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 3.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -109,6 +109,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Maxwell G - 3.5.0-1 - Update to 3.5.0. From e3e917327c4ffd02651cffb21609960c2e1d54a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:02:26 +0000 Subject: [PATCH 40/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 92e0882..7a96a0b 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 3.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -109,6 +109,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 09bc2b79dd1779ea57c53896b85de3d0fa5a6072 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 26 Sep 2024 15:33:48 -0500 Subject: [PATCH 41/48] Update to 3.12.2. Fixes rhbz#2242856. --- .gitignore | 1 + ansible-collection-community-docker.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 64c24a4..b445cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /community.docker-3.4.5.tar.gz /community.docker-3.4.6.tar.gz /community.docker-3.5.0.tar.gz +/community.docker-3.12.2.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 7a96a0b..8f2d9c6 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,8 +8,8 @@ Name: ansible-collection-community-docker -Version: 3.5.0 -Release: 3%{?dist} +Version: 3.12.2 +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -71,6 +71,7 @@ BuildArch: noarch BuildRequires: ansible-packaging %if %{with tests} BuildRequires: ansible-packaging-tests +BuildRequires: ansible-collection(community.library_inventory_filtering_v1) BuildRequires: %{py3_dist requests} %endif @@ -99,7 +100,7 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %check %if %{with tests} -%ansible_test_unit +%ansible_test_unit -c community.library_inventory_filtering_v1 %endif @@ -109,6 +110,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Thu Sep 26 2024 Maxwell G - 3.12.2-1 +- Update to 3.12.2. Fixes rhbz#2242856. + * Wed Jul 17 2024 Fedora Release Engineering - 3.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 70249a7..b44acba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.5.0.tar.gz) = 9699fbdb563d272ed80a63a960783554c549a99bba17d25bac57ec701dd29a8ce7620580204dc78b7b1e64c4ef738dfb51ef8cf3a85fc449f835a4ef135155c2 +SHA512 (community.docker-3.12.2.tar.gz) = cdf8e309e9897a7395375d71faccab457c141f119874018f5ad9e2ef54409da0b6753a5cbb23b1da216f4de7e641daaf7ee508ac4f0a4acee39397543c0a2cd3 From 67b30a0a7969f26aa93dac0bfb993800aacbde82 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 10 Oct 2024 22:07:52 -0500 Subject: [PATCH 42/48] Update to 3.13.0. Fixes rhbz#2316730. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b445cfc..217aa06 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /community.docker-3.4.6.tar.gz /community.docker-3.5.0.tar.gz /community.docker-3.12.2.tar.gz +/community.docker-3.13.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 8f2d9c6..c872a97 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,7 +8,7 @@ Name: ansible-collection-community-docker -Version: 3.12.2 +Version: 3.13.0 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -110,6 +110,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Oct 11 2024 Maxwell G - 3.13.0-1 +- Update to 3.13.0. Fixes rhbz#2316730. + * Thu Sep 26 2024 Maxwell G - 3.12.2-1 - Update to 3.12.2. Fixes rhbz#2242856. diff --git a/sources b/sources index b44acba..8505980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.12.2.tar.gz) = cdf8e309e9897a7395375d71faccab457c141f119874018f5ad9e2ef54409da0b6753a5cbb23b1da216f4de7e641daaf7ee508ac4f0a4acee39397543c0a2cd3 +SHA512 (community.docker-3.13.0.tar.gz) = 2b772cc324acc03e62376e420574643df2fb89bab30387e808aeb3dd6338f0ab9c0b3d635854cacb7e42de6373e03b7da6feb1e26b5e9989853104ecaa0ce9fe From 9e46e4c4fd785161b98b430a0e9034c60a5a02d2 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 25 Nov 2024 23:26:28 -0600 Subject: [PATCH 43/48] Update to 4.1.0. Fixes rhbz#2319299. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 217aa06..e521821 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /community.docker-3.5.0.tar.gz /community.docker-3.12.2.tar.gz /community.docker-3.13.0.tar.gz +/community.docker-4.1.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index c872a97..29769b8 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,7 +8,7 @@ Name: ansible-collection-community-docker -Version: 3.13.0 +Version: 4.1.0 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -110,6 +110,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Tue Nov 26 2024 Maxwell G - 4.1.0-1 +- Update to 4.1.0. Fixes rhbz#2319299. + * Fri Oct 11 2024 Maxwell G - 3.13.0-1 - Update to 3.13.0. Fixes rhbz#2316730. diff --git a/sources b/sources index 8505980..ebda418 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-3.13.0.tar.gz) = 2b772cc324acc03e62376e420574643df2fb89bab30387e808aeb3dd6338f0ab9c0b3d635854cacb7e42de6373e03b7da6feb1e26b5e9989853104ecaa0ce9fe +SHA512 (community.docker-4.1.0.tar.gz) = 0df4abb636a4c8c8680e9996ee6fb0bc9a3d71966e3c6b772e3050cddda75025943363b94bc27bbcbf76617e9d8cf128a2ce877c225b21bbac720aa95c7539b6 From 30fb5f718b7a43dce38d7a570cb62dfa9a29cb04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:05:38 +0000 Subject: [PATCH 44/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 29769b8..75c526d 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -110,6 +110,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 26 2024 Maxwell G - 4.1.0-1 - Update to 4.1.0. Fixes rhbz#2319299. From ac1b919849dc785b79ffdbf0c734e18ba3b492d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:00:33 +0000 Subject: [PATCH 45/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 75c526d..a31e209 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -110,6 +110,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 59028c68cab955e5a5c0ec36f064b2075e04e2df Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 30 Aug 2025 00:30:57 -0500 Subject: [PATCH 46/48] Update to 4.7.0. Fixes rhbz#2332649. --- .gitignore | 1 + ansible-collection-community-docker.spec | 12 ++++++++---- build_ignore-unnecessary-files.patch | 2 +- sources | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e521821..2622ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /community.docker-3.12.2.tar.gz /community.docker-3.13.0.tar.gz /community.docker-4.1.0.tar.gz +/community.docker-4.7.0.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index a31e209..7bbf87c 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,8 +8,8 @@ Name: ansible-collection-community-docker -Version: 4.1.0 -Release: 3%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -72,6 +72,7 @@ BuildRequires: ansible-packaging %if %{with tests} BuildRequires: ansible-packaging-tests BuildRequires: ansible-collection(community.library_inventory_filtering_v1) +BuildRequires: ansible-collection(community.internal_test_tools) BuildRequires: %{py3_dist requests} %endif @@ -100,16 +101,19 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %check %if %{with tests} -%ansible_test_unit -c community.library_inventory_filtering_v1 +%ansible_test_unit -c community.library_inventory_filtering_v1 -c community.internal_test_tools %endif %files -f %{ansible_collection_filelist} -%license COPYING LICENSES .reuse/dep5 +%license COPYING LICENSES REUSE.toml %doc README.md CHANGELOG.rst* %changelog +* Sat Aug 30 2025 Maxwell G - 4.7.0-1 +- Update to 4.7.0. Fixes rhbz#2332649. + * Wed Jul 23 2025 Fedora Release Engineering - 4.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/build_ignore-unnecessary-files.patch b/build_ignore-unnecessary-files.patch index 6e64bc8..26a2253 100644 --- a/build_ignore-unnecessary-files.patch +++ b/build_ignore-unnecessary-files.patch @@ -16,4 +16,4 @@ diff -Naur a/galaxy.yml b/galaxy.yml + - README.md + - COPYING + - LICENSES -+ - .reuse ++ - REUSE.toml diff --git a/sources b/sources index ebda418..1a174a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-4.1.0.tar.gz) = 0df4abb636a4c8c8680e9996ee6fb0bc9a3d71966e3c6b772e3050cddda75025943363b94bc27bbcbf76617e9d8cf128a2ce877c225b21bbac720aa95c7539b6 +SHA512 (community.docker-4.7.0.tar.gz) = 5abd256e525e583d028e84a6ce160617780a4a60e72141fe1ac8f73a62a147deb45da5e53a56657ffc228051569340208bf679ce1d6f6f89c740176e9aa8fc63 From 97a2eae8f8cb5da76fe1cf45bd34ac21f167d265 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 5 Dec 2025 16:20:12 -0600 Subject: [PATCH 47/48] Update to 5.0.3. Fixes rhbz#2401383. --- .gitignore | 1 + ansible-collection-community-docker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2622ee6..a389d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /community.docker-3.13.0.tar.gz /community.docker-4.1.0.tar.gz /community.docker-4.7.0.tar.gz +/community.docker-5.0.3.tar.gz diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 7bbf87c..2450989 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -8,7 +8,7 @@ Name: ansible-collection-community-docker -Version: 4.7.0 +Version: 5.0.3 Release: 1%{?dist} Summary: Ansible modules and plugins for working with Docker @@ -111,6 +111,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Dec 05 2025 Maxwell G - 5.0.3-1 +- Update to 5.0.3. Fixes rhbz#2401383. + * Sat Aug 30 2025 Maxwell G - 4.7.0-1 - Update to 4.7.0. Fixes rhbz#2332649. diff --git a/sources b/sources index 1a174a8..d501ec6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (community.docker-4.7.0.tar.gz) = 5abd256e525e583d028e84a6ce160617780a4a60e72141fe1ac8f73a62a147deb45da5e53a56657ffc228051569340208bf679ce1d6f6f89c740176e9aa8fc63 +SHA512 (community.docker-5.0.3.tar.gz) = a4fd0c49eaf6b09f1831f007a042cc03202b4e1767dbd677bc00f89012d50ed5487bd4b94276e4b4b553d4a46504ec35a034267d20ed762a79caa169c1b35633 From 6284bcb2aee61d7b8c7a91322388d771316c2553 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:42:06 +0000 Subject: [PATCH 48/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- ansible-collection-community-docker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible-collection-community-docker.spec b/ansible-collection-community-docker.spec index 2450989..15826a9 100644 --- a/ansible-collection-community-docker.spec +++ b/ansible-collection-community-docker.spec @@ -9,7 +9,7 @@ Name: ansible-collection-community-docker Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible modules and plugins for working with Docker # All files are GPL-3.0-or-later, except the following files, which are originally @@ -111,6 +111,9 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{ %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Dec 05 2025 Maxwell G - 5.0.3-1 - Update to 5.0.3. Fixes rhbz#2401383.