diff options
Diffstat (limited to 'dev-python/ansible-compat')
| -rw-r--r-- | dev-python/ansible-compat/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/ansible-compat/ansible-compat-2.1.0.ebuild | 62 | ||||
| -rw-r--r-- | dev-python/ansible-compat/ansible-compat-4.1.12.ebuild (renamed from dev-python/ansible-compat/ansible-compat-2.2.0.ebuild) | 29 |
3 files changed, 12 insertions, 82 deletions
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest index b17ac388a8c1..f9da22d4cff0 100644 --- a/dev-python/ansible-compat/Manifest +++ b/dev-python/ansible-compat/Manifest @@ -1,2 +1 @@ -DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3 -DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136 +DIST ansible-compat-4.1.12.gh.tar.gz 67966 BLAKE2B 3c665eb2cb87e184042da78ed1c41e7ca2b437c5151ba21bdd609104b44fa28c5f03247d275c58cfdf04a8e9ed328947cb0c2670603218798e3a484861274af2 SHA512 c9b2c340dc2b1ffb6f6db76017f7537e20307a7519a4df2dfb31811180cd647e39812bc433db51bd94d42f4c52a6c2f729d81edadcd615a5e0d23566969d8911 diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild deleted file mode 100644 index 7f566730059f..000000000000 --- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Contains functions that facilitate working with various versions of Ansible" -HOMEPAGE=" - https://pypi.org/project/ansible-compat/ - https://github.com/ansible/ansible-compat/ -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND=" - >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/pytest-markdown[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-plus[${PYTHON_USEDEP}] - ) -" - -# All these tests attempt to connect to galaxy.ansible.com -EPYTEST_DESELECT=( - test/test_runtime.py::test_install_collection - test/test_runtime.py::test_install_collection_dest - test/test_runtime.py::test_prepare_environment_with_collections - test/test_runtime.py::test_prerun_reqs_v1 - test/test_runtime.py::test_prerun_reqs_v2 - test/test_runtime.py::test_require_collection_no_cache_dir - test/test_runtime.py::test_require_collection_wrong_version - test/test_runtime.py::test_require_collection - test/test_runtime.py::test_upgrade_collection - test/test_runtime_example.py::test_runtime -) - -distutils_enable_sphinx docs \ - dev-python/ansible-pygments \ - dev-python/myst_parser \ - dev-python/sphinx_ansible_theme - -distutils_enable_tests pytest - -python_test() { - epytest -p pytest_markdown.plugin -} diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-4.1.12.ebuild index 36ec1e075135..6c992bf59229 100644 --- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild +++ b/dev-python/ansible-compat/ansible-compat-4.1.12.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -13,25 +14,24 @@ HOMEPAGE=" https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/ " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +# We normally use PyPI here but 4.1.12 has never been uploaded there for some reason +SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" RDEPEND=" - >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}] + >=app-admin/ansible-core-2.12[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}] + >=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}] " BDEPEND=" - >=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] + >=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}] test? ( dev-python/flaky[${PYTHON_USEDEP}] - dev-python/pytest-markdown[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/pytest-plus[${PYTHON_USEDEP}] ) @@ -49,15 +49,8 @@ EPYTEST_DESELECT=( test/test_runtime.py::test_require_collection test/test_runtime.py::test_upgrade_collection test/test_runtime_example.py::test_runtime + # pip, failing due to internets + test/test_runtime_scan_path.py::test_scan_sys_path ) -distutils_enable_sphinx docs \ - dev-python/ansible-pygments \ - dev-python/myst_parser \ - dev-python/sphinx_ansible_theme - distutils_enable_tests pytest - -python_test() { - epytest -p pytest_markdown.plugin -} |