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

Bump dev-python/jaraco-classes and dev-python/jaraco-functools #8786

Closed
wants to merge 4 commits into from

Conversation

sbraz
Copy link
Member

@sbraz sbraz commented Jun 10, 2018

jaraco/jaraco.classes@1.4...1.5
jaraco/jaraco.functools@1.15.1...1.19

--- jaraco-classes-1.4.ebuild   2017-07-23 23:47:32.203526991 +0200
+++ jaraco-classes-1.5.ebuild   2018-06-10 16:27:28.188362019 +0200
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+# Tests fail with pypy
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )

 inherit distutils-r1

@@ -14,34 +15,44 @@

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"

-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+RDEPEND="
+       dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+       dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
        doc? (
+               >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
                dev-python/sphinx[${PYTHON_USEDEP}]
                dev-python/rst-linker[${PYTHON_USEDEP}]
        )
        test? (
                ${RDEPEND}
-               dev-python/pytest[${PYTHON_USEDEP}]
-               dev-python/pytest-runner[${PYTHON_USEDEP}]
+               >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
        )
 "

 S="${WORKDIR}/${MY_PN}-${PV}"

 python_compile_all() {
-       use doc && esetup.py build_sphinx
+       if use doc; then
+                       cd docs || die
+                       sphinx-build . _build/html || die
+                       HTML_DOCS=( docs/_build/html/. )
+       fi
 }

 python_test() {
-       PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+       # Override pytest options to skip flake8
+       PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+               || die "tests failed with ${EPYTHON}"
 }

 python_install_all() {
-       use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
        distutils-r1_python_install_all
+       find "${ED}" -name '*.pth' -delete || die
 }
--- jaraco-functools-1.15.1.ebuild      2017-07-23 23:47:32.203526991 +0200
+++ jaraco-functools-1.19.ebuild        2018-06-10 16:34:37.031521621 +0200
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )

inherit distutils-r1

@@ -14,12 +14,12 @@

LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc test"

RDEPEND="
+       dev-python/namespace-jaraco[${PYTHON_USEDEP}]
       dev-python/more-itertools[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
       $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -31,22 +31,29 @@
       test? (
               ${RDEPEND}
               >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-               dev-python/pytest-runner[${PYTHON_USEDEP}]
               dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+               dev-python/jaraco-classes[${PYTHON_USEDEP}]
+               dev-python/six[${PYTHON_USEDEP}]
       )
"

S="${WORKDIR}/${MY_PN}-${PV}"

python_compile_all() {
-       use doc && esetup.py build_sphinx
+       if use doc; then
+               cd docs || die
+               sphinx-build . _build/html || die
+               HTML_DOCS=( docs/_build/html/. )
+       fi
}

python_test() {
-       PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
+       # Override pytest options to skip flake8
+       PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+               || die "tests failed with ${EPYTHON}"
+       }

python_install_all() {
-       use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
       distutils-r1_python_install_all
+       find "${ED}" -name '*.pth' -delete || die
}

Remove useless DEPEND on pytest-runner, add RDEPEND on
dev-python/namespace-jaraco.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Package-Manager: Portage-2.3.40, Repoman-2.3.9
DEPEND on dev-python/namespace-jaraco.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Package-Manager: Portage-2.3.40, Repoman-2.3.9
@gentoo-bot
Copy link

Pull Request assignment

Areas affected: ebuilds
Packages affected: dev-python/jaraco-classes, dev-python/jaraco-functools

dev-python/jaraco-classes: @sbraz, @gentoo/proxy-maint
dev-python/jaraco-functools: @sbraz, @gentoo/proxy-maint

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and ping us to reset the assignment.

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

@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). labels Jun 10, 2018
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2018-06-10 15:13 UTC
Newest commit scanned: 6e6a9d2
Status: ✅ good

No issues found

@monsieurp
Copy link
Member

@sbraz 1er de la classe

@sbraz sbraz deleted the jaraco-classes branch June 26, 2018 09:00
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). self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants