Attachment #219094 for bug #250626




# $FreeBSD$

PORTNAME=		ansible
PORTVERSION?=		2.10.2
PORTREVISION?=		0
DISTVERSIONPREFIX=	base-
CATEGORIES=		sysutils python
MASTER_SITES=		https://pypi.python.org/packages/source/a/ansible-base/
PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	lifanov@FreeBSD.org
COMMENT=	Radically simple IT automation

		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}

USES?=		cpe python shebangfix
USE_PYTHON=	distutils autoplist concurrent
		ansible24-* \
		ansible25-* \
		ansible27-* \
		ansible26-* \
		ansible27-* \
		ansible28-*

OPTIONS_DEFINE=	DOCS EXAMPLES

NO_ARCH=	yes
USES?=		cpe python shebangfix
USE_PYTHON=	distutils autoplist concurrent
CPE_VENDOR=	ansibleworks

CONFLICTS?=	*ansible1-* \
		*ansible23-* \
		*ansible24-* \
		*ansible25-* \
		*ansible27-* \
		*ansible26-* \
		*ansible27-* \
		*ansible28-* \
		*ansible29-*

EXTRA_PATCHES?=

SHEBANG_FILES?=	\
		test/lib/ansible_test/_data/injector/python.py \
		test/lib/ansible_test/_data/versions.py \

		test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
		test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
		test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
		test/lib/ansible_test/_data/sanity/code-smell/changelog.py \
		test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py \
		test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
		test/lib/ansible_test/_data/sanity/compile/compile.py \
		test/lib/ansible_test/_data/sanity/validate-modules/main.py


PORTEXAMPLES=	ansible.cfg hosts

OPTIONS_DEFINE=	DOCS EXAMPLES

post-patch:
	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
		-e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \

	# python autoplist doesn't add this file in plist
	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory

# TEST_WRKSRC=${WRKSRC}/test
#
#do-test:
#	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v
#	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
#	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)sysutils/ansible/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588106713	1	TIMESTAMP = 1603670603
2	SHA256 (ansible-2.9.7.tar.gz) = 7222ce925536a25b2912364e13b03a3e21dbf2f96799ebff304f48509324de7b	2	SHA256 (ansible-base-2.10.2.tar.gz) = c79fe108e13b286bad21734208624aaef9dabb49bb4211b13bc96d88829e22ab
3	SIZE (ansible-2.9.7.tar.gz) = 14215538	3	SIZE (ansible-base-2.10.2.tar.gz) = 6023200




}
{
message: <<EOD
Ansible has been updated to 2.10. Please follow the porting guide
to update the rulesets:

https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.10.html

If you wish to stay with version 2.9, you can switch to the
new port sysutils/ansible29, which tracks the stable 2.9 branch:

# pkg set -n ansible:ansible29

EOD
maximum_version: "2.10"
type: upgrade
}
]

Return to bug 250626

Lines 1-11 Link Here

(-)sysutils/ansible/Makefile (-24 / +29 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ansible	3	PORTNAME= ansible
4	PORTVERSION?= 2.9.7	4	PORTVERSION?= 2.10.2
5	PORTREVISION?= 0	5	PORTREVISION?= 0
6	CATEGORIES= sysutils python	6	DISTVERSIONPREFIX= base-
7	MASTER_SITES= http://releases.ansible.com/ansible/	7	CATEGORIES= sysutils python
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	MASTER_SITES= https://pypi.python.org/packages/source/a/ansible-base/
		9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		10
10	MAINTAINER= lifanov@FreeBSD.org	11	MAINTAINER= lifanov@FreeBSD.org
11	COMMENT= Radically simple IT automation	12	COMMENT= Radically simple IT automation
Lines 28-49 Link Here
28	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}	30	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
30		31
31	CONFLICTS?= ansible1-* \	32	USES?= cpe python shebangfix
32	ansible23-* \	33	USE_PYTHON= distutils autoplist concurrent
33	ansible24-* \
34	ansible25-* \
35	ansible27-* \
36	ansible26-* \
37	ansible27-* \
38	ansible28-*
39		34
40	EXTRA_PATCHES?=	35	OPTIONS_DEFINE= DOCS EXAMPLES
41		36
42	NO_ARCH= yes	37	NO_ARCH= yes
43	USES?= cpe python shebangfix
44	USE_PYTHON= distutils autoplist concurrent
45	CPE_VENDOR= ansibleworks	38	CPE_VENDOR= ansibleworks
46		39
		40	CONFLICTS?= ansible1- \
		41	ansible23- \
		42	ansible24- \
		43	ansible25- \
		44	ansible27- \
		45	ansible26- \
		46	ansible27- \
		47	ansible28- \
		48	ansible29-
		49
		50	EXTRA_PATCHES?=
		51
47	SHEBANG_FILES?= \	52	SHEBANG_FILES?= \
48	test/lib/ansible_test/_data/injector/python.py \	53	test/lib/ansible_test/_data/injector/python.py \
49	test/lib/ansible_test/_data/versions.py \	54	test/lib/ansible_test/_data/versions.py \
Lines 71-76 Link Here
71	test/lib/ansible_test/_data/sanity/code-smell/shebang.py \	76	test/lib/ansible_test/_data/sanity/code-smell/shebang.py \
72	test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \	77	test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \
73	test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \	78	test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \
		79	test/lib/ansible_test/_data/sanity/code-smell/changelog.py \
		80	test/lib/ansible_test/_data/sanity/code-smell/runtime-metadata.py \
74	test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \	81	test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \
75	test/lib/ansible_test/_data/sanity/compile/compile.py \	82	test/lib/ansible_test/_data/sanity/compile/compile.py \
76	test/lib/ansible_test/_data/sanity/validate-modules/main.py	83	test/lib/ansible_test/_data/sanity/validate-modules/main.py
Lines 90-97 Link Here
90		97
91	PORTEXAMPLES= ansible.cfg hosts	98	PORTEXAMPLES= ansible.cfg hosts
92		99
93	OPTIONS_DEFINE= DOCS EXAMPLES
94
95	post-patch:	100	post-patch:
96	${FIND} ${WRKSRC} -type f -print0 \| ${XARGS} -0 ${REINPLACE_CMD} \	101	${FIND} ${WRKSRC} -type f -print0 \| ${XARGS} -0 ${REINPLACE_CMD} \
97	-e 's\|/etc/ansible\|${ETCDIR:S/${PY_FLAVOR}-//}\|g' \	102	-e 's\|/etc/ansible\|${ETCDIR:S/${PY_FLAVOR}-//}\|g' \
Lines 114-124 Link Here
114	# python autoplist doesn't add this file in plist	119	# python autoplist doesn't add this file in plist
115	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory	120	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
116		121
117	TEST_WRKSRC=${WRKSRC}/test	122	# TEST_WRKSRC=${WRKSRC}/test
118		123	#
119	do-test:	124	#do-test:
120	# ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v	125	# ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v
121	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose	126	# ${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
122	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v	127	# ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v
123		128
124	.include <bsd.port.mk>	129	.include <bsd.port.mk>

Lines 13-30 Link Here

(-)sysutils/ansible/files/pkg-message.in (-6 / +6 lines)
13	}	13	}
14	{	14	{
15	message: <<EOD	15	message: <<EOD
16	Ansible has been updated to 2.8. Please follow the porting guide	16	Ansible has been updated to 2.10. Please follow the porting guide
17	to update the rulesets:	17	to update the rulesets:
18		18
19	https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.8.html	19	https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.10.html
20		20
21	If you wish to stay with 2.7 version, you can switch	21	If you wish to stay with version 2.9, you can switch to the
22	to new sysutils/ansible27 port, which tracks stable 2.7 branch:	22	new port sysutils/ansible29, which tracks the stable 2.9 branch:
23		23
24	# pkg set -n ansible:ansible27	24	# pkg set -n ansible:ansible29
25		25
26	EOD	26	EOD
27	maximum_version: "2.8"	27	maximum_version: "2.10"
28	type: upgrade	28	type: upgrade
29	}	29	}
30	]	30	]