diff --git a/.gitignore b/.gitignore index 00059ed..da304c5 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ /ansible-2.9.13.tar.gz /ansible-2.9.14.tar.gz /ansible-2.9.15.tar.gz +/ansible-2.9.16.tar.gz diff --git a/ansible.spec b/ansible.spec index 0ba7c53..d4234cb 100644 --- a/ansible.spec +++ b/ansible.spec @@ -17,7 +17,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.9.15 +Version: 2.9.16 Release: 1%{?dist} License: GPLv3+ @@ -245,6 +245,9 @@ make PYTHON=/usr/bin/python3 tests-py3 %endif %changelog +* Tue Dec 15 2020 Kevin Fenzi - 2.9.16-1 +- Update to 2.9.16. + * Tue Nov 03 2020 Kevin Fenzi - 2.9.15-1 - Update to 2.9.15. diff --git a/fix-python-3.9-compatibility.patch b/fix-python-3.9-compatibility.patch index 97faf39..0cc6fee 100644 --- a/fix-python-3.9-compatibility.patch +++ b/fix-python-3.9-compatibility.patch @@ -1,42 +1,21 @@ -diff --git a/shippable.yml b/shippable.yml -index 4ad9f63b..2ded6041 100644 ---- a/shippable.yml -+++ b/shippable.yml -@@ -20,6 +20,7 @@ matrix: - - env: T=units/3.6/1 - - env: T=units/3.7/1 - - env: T=units/3.8/1 -+ - env: T=units/3.9/1 - - - env: T=units/2.6/2 - - env: T=units/2.7/2 -@@ -27,6 +28,7 @@ matrix: - - env: T=units/3.6/2 - - env: T=units/3.7/2 - - env: T=units/3.8/2 -+ - env: T=units/3.9/2 - - - env: T=windows/2012/1 - - env: T=windows/2012-R2/1 -diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt -index 78653dad..bbc2734d 100644 ---- a/test/lib/ansible_test/_data/completion/docker.txt -+++ b/test/lib/ansible_test/_data/completion/docker.txt +diff --color -Nur ansible-2.9.16.orig/test/lib/ansible_test/_data/completion/docker.txt ansible-2.9.16/test/lib/ansible_test/_data/completion/docker.txt +--- ansible-2.9.16.orig/test/lib/ansible_test/_data/completion/docker.txt 2020-12-14 15:48:25.000000000 -0800 ++++ ansible-2.9.16/test/lib/ansible_test/_data/completion/docker.txt 2020-12-17 11:38:44.409269125 -0800 @@ -1,4 +1,4 @@ -default name=quay.io/ansible/default-test-container:1.10.1 python=3.6,2.6,2.7,3.5,3.7,3.8 seccomp=unconfined -+default name=quay.io/ansible/default-test-container:1.11 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9 seccomp=unconfined - centos6 name=quay.io/ansible/centos6-test-container:1.8.0 python=2.6 seccomp=unconfined ++default name=quay.io/ansible/default-test-container:1.10.1 python=3.6,2.6,2.7,3.5,3.7,3.8,3.9,3.10 seccomp=unconfined + centos6 name=quay.io/ansible/centos6-test-container:1.26.0 python=2.6 seccomp=unconfined centos7 name=quay.io/ansible/centos7-test-container:1.8.0 python=2.7 seccomp=unconfined centos8 name=quay.io/ansible/centos8-test-container:1.10.0 python=3.6 seccomp=unconfined -diff --git a/test/lib/ansible_test/_data/sanity/compile/compile.py b/test/lib/ansible_test/_data/sanity/compile/compile.py -index 3a2a0ddb..61910eee 100755 ---- a/test/lib/ansible_test/_data/sanity/compile/compile.py -+++ b/test/lib/ansible_test/_data/sanity/compile/compile.py -@@ -3,7 +3,15 @@ +diff --color -Nur ansible-2.9.16.orig/test/lib/ansible_test/_data/sanity/compile/compile.py ansible-2.9.16/test/lib/ansible_test/_data/sanity/compile/compile.py +--- ansible-2.9.16.orig/test/lib/ansible_test/_data/sanity/compile/compile.py 2020-12-14 15:48:25.000000000 -0800 ++++ ansible-2.9.16/test/lib/ansible_test/_data/sanity/compile/compile.py 2020-12-17 11:36:47.712080958 -0800 +@@ -3,9 +3,16 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import parser +-import sys +import warnings + +with warnings.catch_warnings(): @@ -45,19 +24,20 @@ index 3a2a0ddb..61910eee 100755 + # Until then, disable the deprecation warnings to prevent test failures. + warnings.simplefilter('ignore', DeprecationWarning) + import parser -+ - import sys ++import sys -diff --git a/test/lib/ansible_test/_internal/util.py b/test/lib/ansible_test/_internal/util.py -index 72058cb9..6c55434b 100644 ---- a/test/lib/ansible_test/_internal/util.py -+++ b/test/lib/ansible_test/_internal/util.py -@@ -110,6 +110,7 @@ SUPPORTED_PYTHON_VERSIONS = ( + def main(): + status = 0 +diff --color -Nur ansible-2.9.16.orig/test/lib/ansible_test/_internal/util.py ansible-2.9.16/test/lib/ansible_test/_internal/util.py +--- ansible-2.9.16.orig/test/lib/ansible_test/_internal/util.py 2020-12-14 15:48:25.000000000 -0800 ++++ ansible-2.9.16/test/lib/ansible_test/_internal/util.py 2020-12-17 11:36:47.713080960 -0800 +@@ -110,6 +110,8 @@ '3.6', '3.7', '3.8', + '3.9', ++ '3.10', ) diff --git a/sources b/sources index 9f47b44..3d64a0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-2.9.15.tar.gz) = 147663d98247f8c6c7aa8aff8c8c973d3641fdaa3e9c682d51daec2ec9afd026e3ca07d459466e2117dfc752572947b1def3a01c707d446ae6d2bf0ebd321a8b +SHA512 (ansible-2.9.16.tar.gz) = f2dd92af2529bc551e4eb0800849866bba90f869a97abbd5822fb6143939a7d59d9c84bb366fc0cb92392e25945cea125dfa377e1301e7ddef08811f0d53ba14