git: 9866fec8c41e - main - sysutils/py-ansible-compat: update to 2.2.6

The branch main has been updated by matthew:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9866fec8c41e564672bac0f121406931b7739ace

commit 9866fec8c41e564672bac0f121406931b7739ace
Author:     Matthew Seaman <matthew@FreeBSD.org>
AuthorDate: 2022-12-07 20:03:16 +0000
Commit:     Matthew Seaman <matthew@FreeBSD.org>
CommitDate: 2022-12-07 23:12:58 +0000

    sysutils/py-ansible-compat: update to 2.2.6
    
    Changes:        https://github.com/ansible/ansible-compat/releases/tag/v2.2.6
---
 sysutils/py-ansible-compat/Makefile             | 17 +++++++++--------
 sysutils/py-ansible-compat/distinfo             |  6 +++---
 sysutils/py-ansible-compat/files/patch-setup.py |  8 --------
 sysutils/py-ansible-compat/files/setup.py       |  3 +++
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/sysutils/py-ansible-compat/Makefile b/sysutils/py-ansible-compat/Makefile
index 95c815fc2a2c..4cdb04018b21 100644
--- a/sysutils/py-ansible-compat/Makefile
+++ b/sysutils/py-ansible-compat/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ansible-compat
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.6
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,18 +11,16 @@ WWW=		https://github.com/ansible-community/ansible-compat
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=45.0.0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.3.1:devel/py-setuptools_scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.2:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}subprocess-tee>=0.3.5:devel/py-subprocess-tee@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.6.0:devel/py-jsonschema@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip-tools>0:devel/py-pip-tools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-markdown>0:devel/py-pytest-markdown@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>7.2.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-plus>0:devel/py-pytest-plus@${PY_FLAVOR}
 
@@ -31,4 +29,7 @@ USE_PYTHON=	autoplist distutils pytest
 
 NO_ARCH=	yes
 
+post-patch:
+	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/
+
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-compat/distinfo b/sysutils/py-ansible-compat/distinfo
index bbb7e847586b..bb2b0def229c 100644
--- a/sysutils/py-ansible-compat/distinfo
+++ b/sysutils/py-ansible-compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668858321
-SHA256 (ansible-compat-2.2.5.tar.gz) = 28c7c545fd60ef9c3059cfb2fefd27f92db091ff6b5868f83f121ceb5e1fe1b5
-SIZE (ansible-compat-2.2.5.tar.gz) = 39794
+TIMESTAMP = 1670425127
+SHA256 (ansible-compat-2.2.6.tar.gz) = 8bb3488327125a0948d38b766389a4819573343d5673aa78a7bed23eb9d5b28d
+SIZE (ansible-compat-2.2.6.tar.gz) = 38890
diff --git a/sysutils/py-ansible-compat/files/patch-setup.py b/sysutils/py-ansible-compat/files/patch-setup.py
deleted file mode 100644
index 12c9d0596446..000000000000
--- a/sysutils/py-ansible-compat/files/patch-setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.py.orig	2019-12-09 07:04:35 UTC
-+++ setup.py
-@@ -0,0 +1,5 @@
-+
-+import setuptools
-+if __name__ == "__main__":
-+    setuptools.setup(use_scm_version=True)
-+
diff --git a/sysutils/py-ansible-compat/files/setup.py b/sysutils/py-ansible-compat/files/setup.py
new file mode 100644
index 000000000000..606849326a40
--- /dev/null
+++ b/sysutils/py-ansible-compat/files/setup.py
@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()