diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch index f3345d6e0a3..3a3bea50b9a 100644 --- a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch +++ b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch @@ -1,7 +1,8 @@ -we don't need all the dependencies for generating the manpage, avoids needing 4 new packages +Avoid adding four new packages that aren't necessary for the manual page, +and fix the path to the manual source to allow it to be generated. --- a/doc/en/conf.py +++ b/doc/en/conf.py -@@ -45,15 +45,11 @@ +@@ -65,16 +65,12 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ @@ -9,6 +10,7 @@ we don't need all the dependencies for generating the manpage, avoids needing 4 - "pygments_pytest", "sphinx.ext.autodoc", "sphinx.ext.autosummary", + "sphinx.ext.extlinks", "sphinx.ext.intersphinx", "sphinx.ext.todo", "sphinx.ext.viewcode", @@ -16,4 +18,13 @@ we don't need all the dependencies for generating the manpage, avoids needing 4 - "sphinxcontrib_trio", ] - # Add any paths that contain templates here, relative to this directory. + # Building PDF docs on readthedocs requires inkscape for svg to pdf +@@ -316,7 +320,7 @@ + + # One entry per manual page. List of tuples + # (source start file, name, description, authors, manual section). +-man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)] ++man_pages = [("how-to/usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)] + + + # -- Options for Epub output --------------------------------------------------- diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 8c907f54b14..f0bf2feddb3 100644 --- a/srcpkgs/python3-pytest/template +++ b/srcpkgs/python3-pytest/template @@ -1,12 +1,12 @@ # Template file for 'python3-pytest' pkgname=python3-pytest -version=6.2.5 -revision=3 +version=7.1.2 +revision=1 wrksrc="pytest-${version}" build_style=python3-module -hostmakedepends="python3-setuptools_scm python3-Sphinx" -depends="python3-py python3-packaging python3-attrs python3-pluggy - python3-iniconfig python3-toml python3-setuptools" +_common_deps="python3-attrs python3-iniconfig python3-py python3-pluggy" +hostmakedepends="python3-setuptools_scm python3-wheel python3-Sphinx ${_common_deps}" +depends="python3-packaging python3-tomli ${_common_deps}" checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock python3-nose python3-requests python3-parsing python3-xmlschema" short_desc="Simple powerful testing with Python 3" @@ -15,7 +15,7 @@ license="MIT" homepage="https://docs.pytest.org/en/latest/" changelog="https://docs.pytest.org/en/latest/changelog.html" distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz" -checksum=131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 +checksum=a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45 alternatives=" pytest:pytest:/usr/bin/pytest3 pytest:py.test:/usr/bin/py.test3" @@ -26,16 +26,16 @@ post_patch() { rm testing/test_entry_points.py } -do_check() { - PYTHONPATH=$(pwd)/build/lib python3 -m pytest \ - -k 'not test_color_yes and not test_code_highlight' -} - post_build() { PYTHONPATH=$(pwd)/build/lib/ make -C doc/en man vman doc/en/_build/man/pytest.1 } +do_check() { + PYTHONPATH="${PWD}/build/lib" python3 -m pytest \ + -k 'not test_color_yes and not test_code_highlight' +} + post_install() { mv ${DESTDIR}/usr/bin/pytest ${DESTDIR}/usr/bin/pytest3 mv ${DESTDIR}/usr/bin/py.test ${DESTDIR}/usr/bin/py.test3