Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev-python/elasticsearch-curator: enable newer pyyaml #15482

Closed
wants to merge 1 commit into from

Conversation

hydrapolic
Copy link
Contributor

@hydrapolic hydrapolic commented Apr 23, 2020

--- elasticsearch-curator-5.8.1.ebuild  2020-03-17 19:50:17.482638852 +0000
+++ elasticsearch-curator-5.8.1-r1.ebuild       2020-04-23 12:11:24.662440183 +0000
@@ -17,7 +17,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
 RESTRICT="test"
@@ -38,7 +38,7 @@
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        >=dev-python/six-1.11.0[${PYTHON_USEDEP}]
        dev-python/sphinx
-       ~dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+       dev-python/pyyaml[${PYTHON_USEDEP}]
        test? ( ${RDEPEND}
                virtual/jre
                dev-python/mock[${PYTHON_USEDEP}]
@@ -54,9 +54,13 @@
        # requests_aws4auth not in portage
        sed -e '/boto3/d' \
                -e '/requests_aws4auth/d' \
+               -e 's/pyyaml==3.13/pyyaml/g' \
                -e '/tests_require/s/, "coverage", "nosexcover"//g' \
                -i setup.cfg setup.py || die
 
+       # Bug 713342
+       sed -i 's/yaml.load/yaml.unsafe_load/g' curator/utils.py test/unit/* || die
+
        distutils-r1_python_prepare_all
 }

Tests pass with latest pyyaml 5.3.1.

Bug: https://bugs.gentoo.org/713342
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @hydrapolic
Areas affected: ebuilds
Packages affected: dev-python/elasticsearch-curator

dev-python/elasticsearch-curator: @hydrapolic, @gentoo/proxy-maint

Linked bugs

Bugs linked: 713342


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Apr 23, 2020
@hydrapolic
Copy link
Contributor Author

Thanks @mgorny.

@hydrapolic hydrapolic deleted the curator branch October 1, 2020 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
2 participants