* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/files/, app-admin/ansible-molecule/
@ 2023-07-08 23:39 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2023-07-08 23:39 UTC (permalink / raw
To: gentoo-commits
commit: 4490fdae0d510034ebe30925c0e72d6a9e951f0e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 22:19:50 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 23:39:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4490fdae
app-admin/ansible-molecule: make mkdocs stop trying to download fonts
This should probably be addressed more generally at the level of
dev-python/mkdocs-material, as that is what defaults to downloading
typefaces from Google Fonts [1].
[1] https://squidfunk.github.io/mkdocs-material/setup/changing-the-fonts/
Closes: https://bugs.gentoo.org/906141
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild | 4 ++++
.../files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
index 12b1245c52d6..0a8afdb32b5f 100644
--- a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
@@ -60,6 +60,10 @@ BDEPEND="$(python_gen_cond_dep '
)
')"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.1.0-mkdocs_google_fonts.patch
+)
+
# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
# - quite a few of these tests use the network;
# - test_command_dependency[shell] only works if Molecule has previously been installed;
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
new file mode 100644
index 000000000000..2b3f6af82dcc
--- /dev/null
+++ b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
@@ -0,0 +1,10 @@
+--- a/mkdocs.yml
++++ b/mkdocs.yml
+@@ -19,6 +19,7 @@
+ - navigation.indexes
+ - navigation.tracking
+ - toc.integrate
++ font: false
+ palette:
+ - media: "(prefers-color-scheme: light)"
+ primary: teal
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/files/, app-admin/ansible-molecule/
@ 2024-04-11 12:03 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2024-04-11 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 16526674b149e79a18a86edc22c429b58dbc0e50
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 11:59:00 2024 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 12:03:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16526674
app-admin/ansible-molecule: add 24.2.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-molecule/Manifest | 1 +
.../ansible-molecule-24.2.1.ebuild | 87 ++++++++++++++++++++++
...sible-molecule-24.2.1-mkdocs_google_fonts.patch | 10 +++
3 files changed, 98 insertions(+)
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index b850ee05029c..948c0d4c840d 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1 +1,2 @@
+DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d
DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5
diff --git a/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild
new file mode 100644
index 000000000000..5d55bc9dd5af
--- /dev/null
+++ b/app-admin/ansible-molecule/ansible-molecule-24.2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ >=dev-python/mkdocs-ansible-24.3.0
+ dev-python/mkdocs-autorefs
+ dev-python/mkdocstrings-python
+ media-gfx/cairosvg
+"
+PYPI_PN="molecule"
+
+inherit distutils-r1 docs optfeature pypi
+
+DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
+HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="selinux"
+
+# Since around the time of the switch to the yy.m.patchlevel versioning scheme
+# the test suite has been completely incompatible with Portage, with several
+# tests which do pass under Tox failing even with disabled sandboxing.
+# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub
+# tarballs.
+RESTRICT="test"
+
+RDEPEND="$(python_gen_cond_dep '
+ >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}]
+ >=dev-python/ansible-compat-4.1.8[${PYTHON_USEDEP}]
+ >=dev-python/click-8.0[${PYTHON_USEDEP}]
+ <dev-python/click-9[${PYTHON_USEDEP}]
+ >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
+ >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ <dev-python/pluggy-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
+ selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
+')"
+BDEPEND="$(python_gen_cond_dep '
+ <dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/pillow[truetype,${PYTHON_USEDEP}]
+ media-fonts/roboto
+ )
+ test? (
+ >=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}]
+ app-misc/check-jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}]
+ <dev-python/pexpect-5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}]
+ )
+')"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch
+)
+
+# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
+# - quite a few of these tests use the network;
+# - test_command_dependency[shell] only works if Molecule has previously been installed;
+# - tests involving creation of a new scenario fail on ansible-lint errors, even though
+# a config file is deployed which should skip expected issues.
+EPYTEST_DESELECT=(
+ src/molecule/test/functional/test_command.py
+ src/molecule/test/unit/command/init/test_role.py
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature_header "Some optional packages commonly used in Molecule scenarios:"
+ optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
+}
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch
new file mode 100644
index 000000000000..bf8883258f79
--- /dev/null
+++ b/app-admin/ansible-molecule/files/ansible-molecule-24.2.1-mkdocs_google_fonts.patch
@@ -0,0 +1,10 @@
+--- a/mkdocs.yml
++++ b/mkdocs.yml
+@@ -9,6 +9,7 @@
+
+ theme:
+ name: ansible
++ font: false
+ features:
+ - announce.dismiss
+ - content.action.edit
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/files/, app-admin/ansible-molecule/
@ 2024-04-30 1:35 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2024-04-30 1:35 UTC (permalink / raw
To: gentoo-commits
commit: fe80e59c639df097c20074934fd1416e9e714347
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 01:31:22 2024 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 01:31:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe80e59c
app-admin/ansible-molecule: drop 5.1.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-admin/ansible-molecule/Manifest | 1 -
.../ansible-molecule/ansible-molecule-5.1.0.ebuild | 82 ----------------------
...nsible-molecule-5.1.0-mkdocs_google_fonts.patch | 10 ---
3 files changed, 93 deletions(-)
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index 948c0d4c840d..a9ab839d7c5c 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,2 +1 @@
DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d
-DIST molecule-5.1.0.tar.gz 335161 BLAKE2B 55c2f3c181bef6ab848cf7b52b19649fd861dbdbd68b92d3de9e0a1330755b9b887affd8f78e92ab33145ed60e7131d3cf1ffb7b4d8f10c1c3cab8dd58288af9 SHA512 4d025a512e3a6ac7f424318f06bb23b2c1ef1cc122d31d012430bfccf4efeeb3c7ddf2450abd78378c1c50f54fffb1fa8f366f14eebe58125f177ced8cec3ff5
diff --git a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
deleted file mode 100644
index 66a672771a29..000000000000
--- a/app-admin/ansible-molecule/ansible-molecule-5.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
- >=dev-python/mkdocs-ansible-0.1.4
- dev-python/mkdocs-autorefs
- dev-python/mkdocstrings-python
- media-gfx/cairosvg
-"
-PYPI_PN="molecule"
-
-inherit distutils-r1 docs optfeature pypi
-
-DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
-HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="selinux"
-
-RDEPEND="$(python_gen_cond_dep '
- >=app-admin/ansible-core-2.12.10[${PYTHON_USEDEP}]
- >=dev-python/ansible-compat-4.1.2[${PYTHON_USEDEP}]
- >=dev-python/click-8.0[${PYTHON_USEDEP}]
- <dev-python/click-9[${PYTHON_USEDEP}]
- >=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
- >=dev-python/enrich-1.2.7[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- <dev-python/pluggy-2.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
- >=dev-util/cookiecutter-1.7.3[${PYTHON_USEDEP}]
- selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
-')"
-BDEPEND="$(python_gen_cond_dep '
- <dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
- doc? (
- dev-python/pillow[truetype,${PYTHON_USEDEP}]
- media-fonts/roboto
- )
- test? (
- >=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}]
- app-misc/check-jsonschema[${PYTHON_USEDEP}]
- >=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/filelock-3.9.0[${PYTHON_USEDEP}]
- <dev-python/pexpect-5[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-testinfra-7.0.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}]
- )
-')"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.0-mkdocs_google_fonts.patch
-)
-
-# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
-# - quite a few of these tests use the network;
-# - test_command_dependency[shell] only works if Molecule has previously been installed;
-# - tests involving creation of a new scenario fail on ansible-lint errors, even though
-# a config file is deployed which should skip expected issues.
-EPYTEST_DESELECT=(
- src/molecule/test/functional/test_command.py
- src/molecule/test/unit/command/init/test_role.py
-)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
- optfeature_header "Some optional packages commonly used in Molecule scenarios:"
- optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
-}
diff --git a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch b/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
deleted file mode 100644
index 2b3f6af82dcc..000000000000
--- a/app-admin/ansible-molecule/files/ansible-molecule-5.1.0-mkdocs_google_fonts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mkdocs.yml
-+++ b/mkdocs.yml
-@@ -19,6 +19,7 @@
- - navigation.indexes
- - navigation.tracking
- - toc.integrate
-+ font: false
- palette:
- - media: "(prefers-color-scheme: light)"
- primary: teal
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-30 1:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-11 12:03 [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-molecule/files/, app-admin/ansible-molecule/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2024-04-30 1:35 Marek Szuba
2023-07-08 23:39 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox