Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 python-pypi/ansible/DEPENDS           |    2 +-
 python-pypi/ansible/DETAILS           |    4 ++--
 python-pypi/ansible/HISTORY           |    5 +++++
 python-pypi/ansible/PRE_BUILD         |    3 ---
 python-pypi/ansible/auto_remove.patch |   20 --------------------
 5 files changed, 8 insertions(+), 26 deletions(-)

New commits:
commit 2d72e6008b0a2c2a0e000ef60db6ddee68e553f2
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    ansible 2.9.13

diff --git a/python-pypi/ansible/DEPENDS b/python-pypi/ansible/DEPENDS
index 5846fac..1f53ce0 100755
--- a/python-pypi/ansible/DEPENDS
+++ b/python-pypi/ansible/DEPENDS
@@ -1,4 +1,4 @@
-depends python &&
+depends python3 &&
 depends SETUPTOOLS &&
 depends pycrypto &&
 depends paramiko &&
diff --git a/python-pypi/ansible/DETAILS b/python-pypi/ansible/DETAILS
index 79a57fb..457b27c 100755
--- a/python-pypi/ansible/DETAILS
+++ b/python-pypi/ansible/DETAILS
@@ -1,11 +1,11 @@
            SPELL=ansible
-         VERSION=2.5.15
+         VERSION=2.9.13
           BRANCH=`echo ${VERSION}|cut -d. -f1,2`
   SECURITY_PATCH=5
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://releases.ansible.com/${SPELL}/${SOURCE}
    SOURCE_URL[1]=https://pypi.io/packages/source/a/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:d8b0de7b616c2efb6d38748a84f602c9d5bc3d67ca8a5d2019d227bebf8e0f1d5d5295453f562414be34feeeac059f9e0c569f5e3f208ae2b3c1c7b8ca0c0329
+     
SOURCE_HASH=sha512:cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
 if [[ ${ANSIBLE_SIMPLEINIT_MSB} == y ]]; then
          SOURCE2="${SPELL}-${BRANCH}-simpleinit-msb.patch"
   SOURCE2_URL[0]=http://ftp.sourcemage.us/mirror/${SOURCE2}
diff --git a/python-pypi/ansible/HISTORY b/python-pypi/ansible/HISTORY
index e35e3c6..6888bea 100644
--- a/python-pypi/ansible/HISTORY
+++ b/python-pypi/ansible/HISTORY
@@ -1,3 +1,8 @@
+2020-09-08 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 2.9.13
+       * PRE_BUILD, auto_remove.patch: patch removed, no longer needed
+       * DEPENDS: switched to python3
+
 2019-03-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.5.15; SECURITY_PATCH++
 
diff --git a/python-pypi/ansible/PRE_BUILD b/python-pypi/ansible/PRE_BUILD
index 8093d94..26f5342 100755
--- a/python-pypi/ansible/PRE_BUILD
+++ b/python-pypi/ansible/PRE_BUILD
@@ -1,9 +1,6 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
-# Fix docker_container idempotency
-patch -p0 < "${SPELL_DIRECTORY}/auto_remove.patch" &&
-
 # This one is tracked here: https://github.com/ansible/ansible/pull/19231
 # until we get official support for the init system
 if [[ ${ANSIBLE_SIMPLEINIT_MSB} == y ]]; then
diff --git a/python-pypi/ansible/auto_remove.patch 
b/python-pypi/ansible/auto_remove.patch
deleted file mode 100644
index 512d85f..0000000
--- a/python-pypi/ansible/auto_remove.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/ansible/modules/cloud/docker/docker_container.py.orig
-+++ lib/ansible/modules/cloud/docker/docker_container.py
-@@ -1310,7 +1310,6 @@
- 
-         # Map parameters to container inspect results
-         config_mapping = dict(
--            auto_remove=host_config.get('AutoRemove'),
-             expected_cmd=config.get('Cmd'),
-             domainname=config.get('Domainname'),
-             hostname=config.get('Hostname'),
-@@ -1360,6 +1359,9 @@
-             working_dir=host_config.get('WorkingDir')
-         )
- 
-+        if HAS_DOCKER_PY_2 or HAS_DOCKER_PY_3:
-+            config_mapping.update(auto_remove=host_config.get('AutoRemove'))
-+
-         differences = []
-         for key, value in config_mapping.items():
-             self.log('check differences %s %s vs %s' % (key, 
getattr(self.parameters, key), str(value)))