* [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants
@ 2022-05-14 18:49 ahesford
2022-05-14 19:08 ` [PR PATCH] [Updated] " ahesford
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: ahesford @ 2022-05-14 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages pytest
https://github.com/void-linux/void-packages/pull/37133
python3-pytest: update to 7.1.2, and a bunch of dependants
The pytest update may potential break some python package tests, but we can fix those by attrition. It's time to update some of these long-outdated packages.
The update has been tested somewhat just by watching the dependants pass checks with the new pytest, and I've done a couple of one-off tests here and there.
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @paper42 @Chocimier (This touches a few of your packages.)
A patch file from https://github.com/void-linux/void-packages/pull/37133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pytest-37133.patch --]
[-- Type: text/x-diff, Size: 19445 bytes --]
From cb7145619efdddb97687fbb67e3620b57f8b3ff6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:26:27 -0400
Subject: [PATCH 01/12] python3-pytest: update to 7.1.2.
---
.../patches/man-remove-sphinx-deps.patch | 17 ++++++++++++++---
srcpkgs/python3-pytest/template | 16 ++++++++--------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch
index f3345d6e0a35..3a3bea50b9ad 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 8c907f54b140..a273fc0a6728 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,7 +1,7 @@
# 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"
@@ -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
From 8113db8dfe271d2ce2ce62f3ecfad3b40994fccb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:32:37 -0400
Subject: [PATCH 02/12] python3-pytest-httpbin: update to 1.0.2.
---
srcpkgs/python3-pytest-httpbin/template | 10 ++++++++--
srcpkgs/python3-pytest-httpbin/update | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/python3-pytest-httpbin/update
diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template
index 7521d9bae525..b9cc464dae0b 100644
--- a/srcpkgs/python3-pytest-httpbin/template
+++ b/srcpkgs/python3-pytest-httpbin/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-httpbin'
pkgname=python3-pytest-httpbin
-version=1.0.1
+version=1.0.2
revision=1
wrksrc="pytest-httpbin-${version}"
build_style=python3-module
@@ -11,5 +11,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://github.com/kevin1024/pytest-httpbin"
distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz"
-checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7
+checksum=52c9d3f75f8f43f1488b5a0be321eeca3cc5f0fae0c85445ece66bd53c95fe0e
make_check=no # cycle: needs python3-requests which has this package in checkdepends
+
+post_install() {
+ # Extract license from README
+ sed -ne '/^## License/,$ p' README.md > LICENSE
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytest-httpbin/update b/srcpkgs/python3-pytest-httpbin/update
new file mode 100644
index 000000000000..e299d00ea67c
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpbin/update
@@ -0,0 +1 @@
+ignore="*rc*"
From 3ad311a01497944efaa9953bed74c3bcf0dccaf0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:07 -0400
Subject: [PATCH 03/12] python3-pytest-flake8: update to 1.1.1.
---
srcpkgs/python3-pytest-flake8/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
index e5d81277ac9a..4dc49b26c252 100644
--- a/srcpkgs/python3-pytest-flake8/template
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-flake8'
pkgname=python3-pytest-flake8
-version=1.0.7
-revision=2
+version=1.1.1
+revision=1
wrksrc=pytest-flake8-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://pypi.org/project/pytest-flake8/"
changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz"
-checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b
+checksum=ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e
post_install() {
vlicense LICENSE
From ff080f8cc499bd0029ee3a62de6e5d511071b6cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:25 -0400
Subject: [PATCH 04/12] python3-pytest-cov: update to 3.0.0.
---
srcpkgs/python3-pytest-cov/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index fcf45557bbf5..a1f03a67012e 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-cov'
pkgname=python3-pytest-cov
-version=2.12.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="pytest-cov-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pytest-cov.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7
+checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
make_check=no # requires unpackaged xdist, fields, process_tests
post_install() {
From f0cc1f44228ff45f2a9aba4b59ce890335b4a735 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:06 -0400
Subject: [PATCH 05/12] python3-pytest-httpserver: update to 1.0.4.
---
srcpkgs/python3-pytest-httpserver/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d3742bf696d1..20d1d3000858 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,10 +1,11 @@
# Template file for 'python3-pytest-httpserver'
pkgname=python3-pytest-httpserver
-version=1.0.2
+version=1.0.4
revision=1
wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+make_install_target="pytest_httpserver-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
depends="python3-pytest python3-Werkzeug"
short_desc="HTTP server for pytest"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,7 +13,7 @@ license="MIT"
homepage="https://www.github.com/csernazs/pytest-httpserver"
changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d
+checksum=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d
post_install() {
vlicense LICENSE
From bb62a89c402016ac1aae0953504ec3ececb77bdb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:29 -0400
Subject: [PATCH 06/12] python3-pytest-subtests: update to 0.7.0.
---
srcpkgs/python3-pytest-subtests/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index a743f0264f98..2589e678c0c1 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-subtests'
pkgname=python3-pytest-subtests
-version=0.6.0
+version=0.7.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-subtests"
distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
-checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a
+checksum=95c44c77e3fbede9848bb88ca90b384815fcba8090ef9a9f55659ab163b1681c
post_install() {
vlicense LICENSE
From 73193c8cc2debb37b3113651405ea970aae4f361 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:32:52 -0400
Subject: [PATCH 07/12] python3-pytest-asyncio: update to 0.18.3.
---
srcpkgs/python3-pytest-asyncio/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 8c1dbdaf20c2..f8bb51eb3d80 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,14 +1,16 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.14.0
-revision=2
+version=0.18.3
+revision=1
wrksrc="pytest-asyncio-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+make_check_args="-k not((test_auto_mode_cmdline)or(test_strict_mode_ignores_trio_fixtures))"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
+checkdepends="$depends python3-hypothesis"
short_desc="Pytest support for asyncio"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700
+checksum=7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91
From c89b3715736e83f8fe58a5348421c826a8e18ded Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:34:22 -0400
Subject: [PATCH 08/12] python3-pytest-mock: update to 3.7.0.
---
srcpkgs/python3-pytest-mock/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 56d4cda8dc34..3cbfc61e835a 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-mock'
pkgname=python3-pytest-mock
-version=3.5.1
-revision=2
+version=3.7.0
+revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-mock/"
distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc
+checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534
# pytest-mock requires pytest-mock to be installed so it'll always fail during
# packaging
From b99047d171752efbd4ffdb8b530822995584ba3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:23:28 -0400
Subject: [PATCH 09/12] python3-pytest-fixture-config: update to 1.7.0.
---
.../patches/no_setuptools_git.patch | 11 +++++++++++
srcpkgs/python3-pytest-fixture-config/template | 14 ++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
new file mode 100644
index 000000000000..f3455685738d
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
@@ -0,0 +1,11 @@
+Void doesn't package setuptools-git, and there's no need to start now.
+
+--- a/common_setup.py
++++ b/common_setup.py
+@@ -72,6 +72,5 @@
+ license='MIT license',
+ platforms=['unix', 'linux'],
+ cmdclass={'test': PyTest, 'egg_info': EggInfo},
+- setup_requires=['setuptools-git'],
+ include_package_data=True
+ )
diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index 3c22c9f0fb47..73f654bd6d34 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -1,26 +1,20 @@
# Template file for 'python3-pytest-fixture-config'
pkgname=python3-pytest-fixture-config
_pkgname=${pkgname#*-}
-version=1.3.0
-revision=6
+version=1.7.0
+revision=1
wrksrc="${_pkgname}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pytest"
-checkdepends="python3-pytest"
+checkdepends="python3-six $depends"
short_desc="Fixture configuration utils for py.test (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/manahl/pytest-plugins"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
+checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e
-pre_build() {
- sed -i '/setup_requires/d' common_setup.py
-}
-do_check() {
- python3 setup.py test
-}
post_install() {
vlicense LICENSE
}
From 9465edff81f1f54929cba4bb725d2bb268519345 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:25:19 -0400
Subject: [PATCH 10/12] python3-pytest-timeout: update to 2.1.0.
---
srcpkgs/python3-pytest-timeout/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template
index a3ebcf843ffe..450c90447f8d 100644
--- a/srcpkgs/python3-pytest-timeout/template
+++ b/srcpkgs/python3-pytest-timeout/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-timeout'
pkgname=python3-pytest-timeout
-version=1.4.2
-revision=2
+version=2.1.0
+revision=1
wrksrc="pytest-timeout-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,14 +12,10 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-timeout/"
distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz"
-checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76
+checksum=c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9
+# Tests require package to be installed
+make_check=no
post_install() {
vlicense LICENSE
}
-
-# adding do_check since the tests depend on this package
-do_check() {
- python setup.py install
- pytest
-}
From f43eda9272ea5db037f15b211ddc1a709bc50270 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:41:23 -0400
Subject: [PATCH 11/12] python3-pytest-aiohttp: update to 1.0.4.
---
srcpkgs/python3-pytest-aiohttp/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template
index 0d88edc7edce..3ea362b3e304 100644
--- a/srcpkgs/python3-pytest-aiohttp/template
+++ b/srcpkgs/python3-pytest-aiohttp/template
@@ -1,15 +1,17 @@
# Template file for 'python3-pytest-aiohttp'
pkgname=python3-pytest-aiohttp
-version=0.3.0
-revision=2
+version=1.0.4
+revision=1
wrksrc="pytest-aiohttp-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest python3-aiohttp python3-pytest-asyncio"
+checkdepends="$depends"
short_desc="Pytest plugin for aiohttp support"
maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aio-libs/pytest-aiohttp/"
distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz"
-checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f
-make_check=no # No tests available
+checksum=39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4
+# Tests require package be installed (but they succeed in that case)
+make_check=no
From 64cc1e885f4dc41ac0eee84d1a00d72bf6503a1d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:44:29 -0400
Subject: [PATCH 12/12] python3-hypercorn: fix tests
---
srcpkgs/python3-hypercorn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index 137b2c74a724..2133a767d49c 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -8,7 +8,7 @@ make_install_target="Hypercorn-${version}-*-*-*.whl"
hostmakedepends="python3-poetry-core"
depends="python3-h11 python3-h2 python3-priority
python3-toml python3-typing_extensions python3-wsproto"
-checkdepends="python3-pytest-asyncio $depends"
+checkdepends="python3-pytest-asyncio python3-tomli $depends"
short_desc="Python ASGI server based on hyper and inspired by gunicorn"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] python3-pytest: update to 7.1.2, and a bunch of dependants
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
@ 2022-05-14 19:08 ` ahesford
2022-05-14 20:12 ` ahesford
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-05-14 19:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages pytest
https://github.com/void-linux/void-packages/pull/37133
python3-pytest: update to 7.1.2, and a bunch of dependants
The pytest update may potential break some python package tests, but we can fix those by attrition. It's time to update some of these long-outdated packages.
The update has been tested somewhat just by watching the dependants pass checks with the new pytest, and I've done a couple of one-off tests here and there.
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @paper42 @Chocimier (This touches a few of your packages.)
A patch file from https://github.com/void-linux/void-packages/pull/37133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pytest-37133.patch --]
[-- Type: text/x-diff, Size: 19890 bytes --]
From ca41cb07a9cc85f35cfa5287a22e3a1787dc1e87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:26:27 -0400
Subject: [PATCH 01/12] python3-pytest: update to 7.1.2.
---
.../patches/man-remove-sphinx-deps.patch | 17 ++++++++++++++---
srcpkgs/python3-pytest/template | 18 +++++++++---------
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch
index f3345d6e0a35..3a3bea50b9ad 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 8c907f54b140..20d1e611e0dc 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,10 +1,10 @@
# 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"
+hostmakedepends="python3-setuptools_scm python3-Sphinx python3-attrs"
depends="python3-py python3-packaging python3-attrs python3-pluggy
python3-iniconfig python3-toml python3-setuptools"
checkdepends="$depends python3-argcomplete python3-hypothesis python3-mock
@@ -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
From a13c0359cf68487b3c11bc4fadf780cb5fe9484c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:32:37 -0400
Subject: [PATCH 02/12] python3-pytest-httpbin: update to 1.0.2.
---
srcpkgs/python3-pytest-httpbin/template | 10 ++++++++--
srcpkgs/python3-pytest-httpbin/update | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/python3-pytest-httpbin/update
diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template
index 7521d9bae525..b9cc464dae0b 100644
--- a/srcpkgs/python3-pytest-httpbin/template
+++ b/srcpkgs/python3-pytest-httpbin/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-httpbin'
pkgname=python3-pytest-httpbin
-version=1.0.1
+version=1.0.2
revision=1
wrksrc="pytest-httpbin-${version}"
build_style=python3-module
@@ -11,5 +11,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://github.com/kevin1024/pytest-httpbin"
distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz"
-checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7
+checksum=52c9d3f75f8f43f1488b5a0be321eeca3cc5f0fae0c85445ece66bd53c95fe0e
make_check=no # cycle: needs python3-requests which has this package in checkdepends
+
+post_install() {
+ # Extract license from README
+ sed -ne '/^## License/,$ p' README.md > LICENSE
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytest-httpbin/update b/srcpkgs/python3-pytest-httpbin/update
new file mode 100644
index 000000000000..e299d00ea67c
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpbin/update
@@ -0,0 +1 @@
+ignore="*rc*"
From a2268b19f44595a343d4e754b4a205951162d176 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:07 -0400
Subject: [PATCH 03/12] python3-pytest-flake8: update to 1.1.1.
---
srcpkgs/python3-pytest-flake8/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
index e5d81277ac9a..4dc49b26c252 100644
--- a/srcpkgs/python3-pytest-flake8/template
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-flake8'
pkgname=python3-pytest-flake8
-version=1.0.7
-revision=2
+version=1.1.1
+revision=1
wrksrc=pytest-flake8-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://pypi.org/project/pytest-flake8/"
changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz"
-checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b
+checksum=ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e
post_install() {
vlicense LICENSE
From 5417820ed55c357b6ad9e5cd7039850aa78db44f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:25 -0400
Subject: [PATCH 04/12] python3-pytest-cov: update to 3.0.0.
---
srcpkgs/python3-pytest-cov/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index fcf45557bbf5..a1f03a67012e 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-cov'
pkgname=python3-pytest-cov
-version=2.12.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="pytest-cov-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pytest-cov.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7
+checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
make_check=no # requires unpackaged xdist, fields, process_tests
post_install() {
From ed5e4fee38145e2acb88ffa91633766081b7a4a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:06 -0400
Subject: [PATCH 05/12] python3-pytest-httpserver: update to 1.0.4.
---
srcpkgs/python3-pytest-httpserver/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d3742bf696d1..20d1d3000858 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,10 +1,11 @@
# Template file for 'python3-pytest-httpserver'
pkgname=python3-pytest-httpserver
-version=1.0.2
+version=1.0.4
revision=1
wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+make_install_target="pytest_httpserver-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
depends="python3-pytest python3-Werkzeug"
short_desc="HTTP server for pytest"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,7 +13,7 @@ license="MIT"
homepage="https://www.github.com/csernazs/pytest-httpserver"
changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d
+checksum=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d
post_install() {
vlicense LICENSE
From 70cbb324ab34d93421f7e95823e9ad51b84c2b14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:29 -0400
Subject: [PATCH 06/12] python3-pytest-subtests: update to 0.7.0.
---
srcpkgs/python3-pytest-subtests/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index a743f0264f98..2589e678c0c1 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-subtests'
pkgname=python3-pytest-subtests
-version=0.6.0
+version=0.7.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-subtests"
distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
-checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a
+checksum=95c44c77e3fbede9848bb88ca90b384815fcba8090ef9a9f55659ab163b1681c
post_install() {
vlicense LICENSE
From 32db157e3489461c1890d8211476f7d6ab2e7f27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:32:52 -0400
Subject: [PATCH 07/12] python3-pytest-asyncio: update to 0.18.3.
---
srcpkgs/python3-pytest-asyncio/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 8c1dbdaf20c2..850b48bc683c 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,14 +1,23 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.14.0
-revision=2
+version=0.18.3
+revision=1
wrksrc="pytest-asyncio-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
+checkdepends="$depends python3-hypothesis"
short_desc="Pytest support for asyncio"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700
+checksum=7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91
+
+do_check() {
+ local skiptests="test_auto_mode_cmdline or \
+ test_strict_mode_ignores_trio_fixtures or \
+ test_unused_port_fixture or test_unused_port_factory_fixture"
+
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})"
+}
From 4d6d1c89b8342a2d992cbd0ca521c46ba81a7fe1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:34:22 -0400
Subject: [PATCH 08/12] python3-pytest-mock: update to 3.7.0.
---
srcpkgs/python3-pytest-mock/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 56d4cda8dc34..3cbfc61e835a 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-mock'
pkgname=python3-pytest-mock
-version=3.5.1
-revision=2
+version=3.7.0
+revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-mock/"
distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc
+checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534
# pytest-mock requires pytest-mock to be installed so it'll always fail during
# packaging
From 9b2e6fac621387321c2fc5b7091573f1a150ab8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:23:28 -0400
Subject: [PATCH 09/12] python3-pytest-fixture-config: update to 1.7.0.
---
.../patches/no_setuptools_git.patch | 11 +++++++++++
srcpkgs/python3-pytest-fixture-config/template | 14 ++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
new file mode 100644
index 000000000000..f3455685738d
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
@@ -0,0 +1,11 @@
+Void doesn't package setuptools-git, and there's no need to start now.
+
+--- a/common_setup.py
++++ b/common_setup.py
+@@ -72,6 +72,5 @@
+ license='MIT license',
+ platforms=['unix', 'linux'],
+ cmdclass={'test': PyTest, 'egg_info': EggInfo},
+- setup_requires=['setuptools-git'],
+ include_package_data=True
+ )
diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index 3c22c9f0fb47..73f654bd6d34 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -1,26 +1,20 @@
# Template file for 'python3-pytest-fixture-config'
pkgname=python3-pytest-fixture-config
_pkgname=${pkgname#*-}
-version=1.3.0
-revision=6
+version=1.7.0
+revision=1
wrksrc="${_pkgname}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pytest"
-checkdepends="python3-pytest"
+checkdepends="python3-six $depends"
short_desc="Fixture configuration utils for py.test (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/manahl/pytest-plugins"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
+checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e
-pre_build() {
- sed -i '/setup_requires/d' common_setup.py
-}
-do_check() {
- python3 setup.py test
-}
post_install() {
vlicense LICENSE
}
From def2fc026bc326362f9588b3c2567e5aebacc7f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:25:19 -0400
Subject: [PATCH 10/12] python3-pytest-timeout: update to 2.1.0.
---
srcpkgs/python3-pytest-timeout/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template
index a3ebcf843ffe..450c90447f8d 100644
--- a/srcpkgs/python3-pytest-timeout/template
+++ b/srcpkgs/python3-pytest-timeout/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-timeout'
pkgname=python3-pytest-timeout
-version=1.4.2
-revision=2
+version=2.1.0
+revision=1
wrksrc="pytest-timeout-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,14 +12,10 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-timeout/"
distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz"
-checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76
+checksum=c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9
+# Tests require package to be installed
+make_check=no
post_install() {
vlicense LICENSE
}
-
-# adding do_check since the tests depend on this package
-do_check() {
- python setup.py install
- pytest
-}
From bc6a916f00359eb4d928ba0fbc986d4da5082dc0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:41:23 -0400
Subject: [PATCH 11/12] python3-pytest-aiohttp: update to 1.0.4.
---
srcpkgs/python3-pytest-aiohttp/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template
index 0d88edc7edce..3ea362b3e304 100644
--- a/srcpkgs/python3-pytest-aiohttp/template
+++ b/srcpkgs/python3-pytest-aiohttp/template
@@ -1,15 +1,17 @@
# Template file for 'python3-pytest-aiohttp'
pkgname=python3-pytest-aiohttp
-version=0.3.0
-revision=2
+version=1.0.4
+revision=1
wrksrc="pytest-aiohttp-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest python3-aiohttp python3-pytest-asyncio"
+checkdepends="$depends"
short_desc="Pytest plugin for aiohttp support"
maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aio-libs/pytest-aiohttp/"
distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz"
-checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f
-make_check=no # No tests available
+checksum=39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4
+# Tests require package be installed (but they succeed in that case)
+make_check=no
From 072bd405bb9bae2935b956f3d71342d711ebbb80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:44:29 -0400
Subject: [PATCH 12/12] python3-hypercorn: fix tests
---
srcpkgs/python3-hypercorn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index 137b2c74a724..2133a767d49c 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -8,7 +8,7 @@ make_install_target="Hypercorn-${version}-*-*-*.whl"
hostmakedepends="python3-poetry-core"
depends="python3-h11 python3-h2 python3-priority
python3-toml python3-typing_extensions python3-wsproto"
-checkdepends="python3-pytest-asyncio $depends"
+checkdepends="python3-pytest-asyncio python3-tomli $depends"
short_desc="Python ASGI server based on hyper and inspired by gunicorn"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] python3-pytest: update to 7.1.2, and a bunch of dependants
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
2022-05-14 19:08 ` [PR PATCH] [Updated] " ahesford
@ 2022-05-14 20:12 ` ahesford
2022-05-16 19:59 ` Chocimier
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-05-14 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages pytest
https://github.com/void-linux/void-packages/pull/37133
python3-pytest: update to 7.1.2, and a bunch of dependants
The pytest update may potential break some python package tests, but we can fix those by attrition. It's time to update some of these long-outdated packages.
The update has been tested somewhat just by watching the dependants pass checks with the new pytest, and I've done a couple of one-off tests here and there.
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @paper42 @Chocimier (This touches a few of your packages.)
A patch file from https://github.com/void-linux/void-packages/pull/37133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pytest-37133.patch --]
[-- Type: text/x-diff, Size: 20154 bytes --]
From a27335ca9784d9089da3371da27c93178426ea96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:26:27 -0400
Subject: [PATCH 01/12] python3-pytest: update to 7.1.2.
---
.../patches/man-remove-sphinx-deps.patch | 17 +++++++++++---
srcpkgs/python3-pytest/template | 22 +++++++++----------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch
index f3345d6e0a35..3a3bea50b9ad 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 8c907f54b140..f0bf2feddb31 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
From 11ce5c18872fb5fcda9c99f9033c73bfb4720c80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:32:37 -0400
Subject: [PATCH 02/12] python3-pytest-httpbin: update to 1.0.2.
---
srcpkgs/python3-pytest-httpbin/template | 10 ++++++++--
srcpkgs/python3-pytest-httpbin/update | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/python3-pytest-httpbin/update
diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template
index 7521d9bae525..b9cc464dae0b 100644
--- a/srcpkgs/python3-pytest-httpbin/template
+++ b/srcpkgs/python3-pytest-httpbin/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-httpbin'
pkgname=python3-pytest-httpbin
-version=1.0.1
+version=1.0.2
revision=1
wrksrc="pytest-httpbin-${version}"
build_style=python3-module
@@ -11,5 +11,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://github.com/kevin1024/pytest-httpbin"
distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz"
-checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7
+checksum=52c9d3f75f8f43f1488b5a0be321eeca3cc5f0fae0c85445ece66bd53c95fe0e
make_check=no # cycle: needs python3-requests which has this package in checkdepends
+
+post_install() {
+ # Extract license from README
+ sed -ne '/^## License/,$ p' README.md > LICENSE
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytest-httpbin/update b/srcpkgs/python3-pytest-httpbin/update
new file mode 100644
index 000000000000..e299d00ea67c
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpbin/update
@@ -0,0 +1 @@
+ignore="*rc*"
From c4b0d06ff4151ad97219ea282949eec16b1fa3f6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:07 -0400
Subject: [PATCH 03/12] python3-pytest-flake8: update to 1.1.1.
---
srcpkgs/python3-pytest-flake8/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
index e5d81277ac9a..4dc49b26c252 100644
--- a/srcpkgs/python3-pytest-flake8/template
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-flake8'
pkgname=python3-pytest-flake8
-version=1.0.7
-revision=2
+version=1.1.1
+revision=1
wrksrc=pytest-flake8-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://pypi.org/project/pytest-flake8/"
changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz"
-checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b
+checksum=ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e
post_install() {
vlicense LICENSE
From e2a09487fbeff6ae2f93e13928d6ef8ec891eb07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:25 -0400
Subject: [PATCH 04/12] python3-pytest-cov: update to 3.0.0.
---
srcpkgs/python3-pytest-cov/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index fcf45557bbf5..a1f03a67012e 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-cov'
pkgname=python3-pytest-cov
-version=2.12.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="pytest-cov-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pytest-cov.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7
+checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
make_check=no # requires unpackaged xdist, fields, process_tests
post_install() {
From 78d28bdd37483b2c7220b59e9d2a63233516e567 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:06 -0400
Subject: [PATCH 05/12] python3-pytest-httpserver: update to 1.0.4.
---
srcpkgs/python3-pytest-httpserver/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d3742bf696d1..20d1d3000858 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,10 +1,11 @@
# Template file for 'python3-pytest-httpserver'
pkgname=python3-pytest-httpserver
-version=1.0.2
+version=1.0.4
revision=1
wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+make_install_target="pytest_httpserver-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
depends="python3-pytest python3-Werkzeug"
short_desc="HTTP server for pytest"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,7 +13,7 @@ license="MIT"
homepage="https://www.github.com/csernazs/pytest-httpserver"
changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d
+checksum=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d
post_install() {
vlicense LICENSE
From 89f0637a2378f1b6310efcd820f77c87d9253991 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:29 -0400
Subject: [PATCH 06/12] python3-pytest-subtests: update to 0.7.0.
---
srcpkgs/python3-pytest-subtests/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index a743f0264f98..2589e678c0c1 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-subtests'
pkgname=python3-pytest-subtests
-version=0.6.0
+version=0.7.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-subtests"
distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
-checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a
+checksum=95c44c77e3fbede9848bb88ca90b384815fcba8090ef9a9f55659ab163b1681c
post_install() {
vlicense LICENSE
From 459891907be7caa7d7904a5192115a1aeda7cceb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:32:52 -0400
Subject: [PATCH 07/12] python3-pytest-asyncio: update to 0.18.3.
---
srcpkgs/python3-pytest-asyncio/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 8c1dbdaf20c2..850b48bc683c 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,14 +1,23 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.14.0
-revision=2
+version=0.18.3
+revision=1
wrksrc="pytest-asyncio-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
+checkdepends="$depends python3-hypothesis"
short_desc="Pytest support for asyncio"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700
+checksum=7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91
+
+do_check() {
+ local skiptests="test_auto_mode_cmdline or \
+ test_strict_mode_ignores_trio_fixtures or \
+ test_unused_port_fixture or test_unused_port_factory_fixture"
+
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})"
+}
From 67df9a804c408b5f5a4716ca24af22100b2f9367 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:34:22 -0400
Subject: [PATCH 08/12] python3-pytest-mock: update to 3.7.0.
---
srcpkgs/python3-pytest-mock/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 56d4cda8dc34..3cbfc61e835a 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-mock'
pkgname=python3-pytest-mock
-version=3.5.1
-revision=2
+version=3.7.0
+revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-mock/"
distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc
+checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534
# pytest-mock requires pytest-mock to be installed so it'll always fail during
# packaging
From 12556ed2e991245db6097c7eb29c2df68f13627e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:23:28 -0400
Subject: [PATCH 09/12] python3-pytest-fixture-config: update to 1.7.0.
---
.../patches/no_setuptools_git.patch | 11 +++++++++++
srcpkgs/python3-pytest-fixture-config/template | 14 ++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
new file mode 100644
index 000000000000..f3455685738d
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
@@ -0,0 +1,11 @@
+Void doesn't package setuptools-git, and there's no need to start now.
+
+--- a/common_setup.py
++++ b/common_setup.py
+@@ -72,6 +72,5 @@
+ license='MIT license',
+ platforms=['unix', 'linux'],
+ cmdclass={'test': PyTest, 'egg_info': EggInfo},
+- setup_requires=['setuptools-git'],
+ include_package_data=True
+ )
diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index 3c22c9f0fb47..73f654bd6d34 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -1,26 +1,20 @@
# Template file for 'python3-pytest-fixture-config'
pkgname=python3-pytest-fixture-config
_pkgname=${pkgname#*-}
-version=1.3.0
-revision=6
+version=1.7.0
+revision=1
wrksrc="${_pkgname}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pytest"
-checkdepends="python3-pytest"
+checkdepends="python3-six $depends"
short_desc="Fixture configuration utils for py.test (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/manahl/pytest-plugins"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
+checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e
-pre_build() {
- sed -i '/setup_requires/d' common_setup.py
-}
-do_check() {
- python3 setup.py test
-}
post_install() {
vlicense LICENSE
}
From 7b16b86a01f34c6a7ababdbda4cb58866b54db76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:25:19 -0400
Subject: [PATCH 10/12] python3-pytest-timeout: update to 2.1.0.
---
srcpkgs/python3-pytest-timeout/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template
index a3ebcf843ffe..450c90447f8d 100644
--- a/srcpkgs/python3-pytest-timeout/template
+++ b/srcpkgs/python3-pytest-timeout/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-timeout'
pkgname=python3-pytest-timeout
-version=1.4.2
-revision=2
+version=2.1.0
+revision=1
wrksrc="pytest-timeout-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,14 +12,10 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-timeout/"
distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz"
-checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76
+checksum=c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9
+# Tests require package to be installed
+make_check=no
post_install() {
vlicense LICENSE
}
-
-# adding do_check since the tests depend on this package
-do_check() {
- python setup.py install
- pytest
-}
From e8436b33c02d1575631ba570319999d747e98625 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:41:23 -0400
Subject: [PATCH 11/12] python3-pytest-aiohttp: update to 1.0.4.
---
srcpkgs/python3-pytest-aiohttp/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template
index 0d88edc7edce..3ea362b3e304 100644
--- a/srcpkgs/python3-pytest-aiohttp/template
+++ b/srcpkgs/python3-pytest-aiohttp/template
@@ -1,15 +1,17 @@
# Template file for 'python3-pytest-aiohttp'
pkgname=python3-pytest-aiohttp
-version=0.3.0
-revision=2
+version=1.0.4
+revision=1
wrksrc="pytest-aiohttp-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest python3-aiohttp python3-pytest-asyncio"
+checkdepends="$depends"
short_desc="Pytest plugin for aiohttp support"
maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aio-libs/pytest-aiohttp/"
distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz"
-checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f
-make_check=no # No tests available
+checksum=39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4
+# Tests require package be installed (but they succeed in that case)
+make_check=no
From 57c9124866fa0847c1a5e9579544c9f368605335 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:44:29 -0400
Subject: [PATCH 12/12] python3-hypercorn: fix tests
---
srcpkgs/python3-hypercorn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index 137b2c74a724..2133a767d49c 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -8,7 +8,7 @@ make_install_target="Hypercorn-${version}-*-*-*.whl"
hostmakedepends="python3-poetry-core"
depends="python3-h11 python3-h2 python3-priority
python3-toml python3-typing_extensions python3-wsproto"
-checkdepends="python3-pytest-asyncio $depends"
+checkdepends="python3-pytest-asyncio python3-tomli $depends"
short_desc="Python ASGI server based on hyper and inspired by gunicorn"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: python3-pytest: update to 7.1.2, and a bunch of dependants
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
2022-05-14 19:08 ` [PR PATCH] [Updated] " ahesford
2022-05-14 20:12 ` ahesford
@ 2022-05-16 19:59 ` Chocimier
2022-05-17 22:51 ` [PR PATCH] [Updated] " ahesford
2022-05-17 23:38 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2022-05-16 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/37133#issuecomment-1128078625
Comment:
Okay, you can adopt.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] python3-pytest: update to 7.1.2, and a bunch of dependants
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
` (2 preceding siblings ...)
2022-05-16 19:59 ` Chocimier
@ 2022-05-17 22:51 ` ahesford
2022-05-17 23:38 ` [PR PATCH] [Merged]: " ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-05-17 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages pytest
https://github.com/void-linux/void-packages/pull/37133
python3-pytest: update to 7.1.2, and a bunch of dependants
The pytest update may potential break some python package tests, but we can fix those by attrition. It's time to update some of these long-outdated packages.
The update has been tested somewhat just by watching the dependants pass checks with the new pytest, and I've done a couple of one-off tests here and there.
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @paper42 @Chocimier (This touches a few of your packages.)
A patch file from https://github.com/void-linux/void-packages/pull/37133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pytest-37133.patch --]
[-- Type: text/x-diff, Size: 20091 bytes --]
From fe9f9656ff3b137f6b02332e942ecc00cb6e67d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:26:27 -0400
Subject: [PATCH 01/12] python3-pytest: update to 7.1.2.
---
.../patches/man-remove-sphinx-deps.patch | 17 +++++++++++---
srcpkgs/python3-pytest/template | 22 +++++++++----------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch b/srcpkgs/python3-pytest/patches/man-remove-sphinx-deps.patch
index f3345d6e0a35..3a3bea50b9ad 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 8c907f54b140..f0bf2feddb31 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
From 3d5b7956dddefa6a97fd8dd953e300e786655a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:32:37 -0400
Subject: [PATCH 02/12] python3-pytest-httpbin: update to 1.0.2.
---
srcpkgs/python3-pytest-httpbin/template | 10 ++++++++--
srcpkgs/python3-pytest-httpbin/update | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/python3-pytest-httpbin/update
diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template
index 7521d9bae525..b9cc464dae0b 100644
--- a/srcpkgs/python3-pytest-httpbin/template
+++ b/srcpkgs/python3-pytest-httpbin/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-httpbin'
pkgname=python3-pytest-httpbin
-version=1.0.1
+version=1.0.2
revision=1
wrksrc="pytest-httpbin-${version}"
build_style=python3-module
@@ -11,5 +11,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://github.com/kevin1024/pytest-httpbin"
distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz"
-checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7
+checksum=52c9d3f75f8f43f1488b5a0be321eeca3cc5f0fae0c85445ece66bd53c95fe0e
make_check=no # cycle: needs python3-requests which has this package in checkdepends
+
+post_install() {
+ # Extract license from README
+ sed -ne '/^## License/,$ p' README.md > LICENSE
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python3-pytest-httpbin/update b/srcpkgs/python3-pytest-httpbin/update
new file mode 100644
index 000000000000..e299d00ea67c
--- /dev/null
+++ b/srcpkgs/python3-pytest-httpbin/update
@@ -0,0 +1 @@
+ignore="*rc*"
From 7425a0bb7d448bb570ceada0d5792942743ca7d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:07 -0400
Subject: [PATCH 03/12] python3-pytest-flake8: update to 1.1.1.
---
srcpkgs/python3-pytest-flake8/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template
index e5d81277ac9a..4dc49b26c252 100644
--- a/srcpkgs/python3-pytest-flake8/template
+++ b/srcpkgs/python3-pytest-flake8/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-flake8'
pkgname=python3-pytest-flake8
-version=1.0.7
-revision=2
+version=1.1.1
+revision=1
wrksrc=pytest-flake8-${version}
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://pypi.org/project/pytest-flake8/"
changelog="https://raw.githubusercontent.com/tholo/pytest-flake8/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/pytest-flake8/pytest-flake8-${version}.tar.gz"
-checksum=f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b
+checksum=ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e
post_install() {
vlicense LICENSE
From b8bae02f1c875984f7a23ebdf05cd4e20da2baa2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 09:33:25 -0400
Subject: [PATCH 04/12] python3-pytest-cov: update to 3.0.0.
---
srcpkgs/python3-pytest-cov/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index fcf45557bbf5..a1f03a67012e 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-cov'
pkgname=python3-pytest-cov
-version=2.12.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="pytest-cov-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pytest-cov.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-cov/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pytest-cov/pytest-cov-${version}.tar.gz"
-checksum=261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7
+checksum=e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470
make_check=no # requires unpackaged xdist, fields, process_tests
post_install() {
From ad16dcae9d49f99e76c1f427839b79318ec186dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:06 -0400
Subject: [PATCH 05/12] python3-pytest-httpserver: update to 1.0.4.
---
srcpkgs/python3-pytest-httpserver/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template
index d3742bf696d1..8238f5d82c8f 100644
--- a/srcpkgs/python3-pytest-httpserver/template
+++ b/srcpkgs/python3-pytest-httpserver/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pytest-httpserver'
pkgname=python3-pytest-httpserver
-version=1.0.2
+version=1.0.4
revision=1
wrksrc=pytest-httpserver-${version}
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
depends="python3-pytest python3-Werkzeug"
short_desc="HTTP server for pytest"
maintainer="mobinmob <mobinmob@disroot.org>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://www.github.com/csernazs/pytest-httpserver"
changelog="https://raw.githubusercontent.com/csernazs/pytest-httpserver/master/CHANGES.rst"
distfiles="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${version}.tar.gz"
-checksum=4917bf3a70ae34816ad34b42039e020d9c0da37349e1cc562fb534799dcf202d
+checksum=164ec7aa21b776d441bdb2fddb85b92a8a0a0cd7ad5d1d5210430d23b2624a4d
post_install() {
vlicense LICENSE
From 97f7e02126fe7d8d663b169a77abbf7fdcc7e385 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:09:29 -0400
Subject: [PATCH 06/12] python3-pytest-subtests: update to 0.7.0.
---
srcpkgs/python3-pytest-subtests/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index a743f0264f98..2589e678c0c1 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pytest-subtests'
pkgname=python3-pytest-subtests
-version=0.6.0
+version=0.7.0
revision=1
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-subtests"
distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
-checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a
+checksum=95c44c77e3fbede9848bb88ca90b384815fcba8090ef9a9f55659ab163b1681c
post_install() {
vlicense LICENSE
From 2a9eb68b48c0e8ddf4d5d4665aedd997a9d51877 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:32:52 -0400
Subject: [PATCH 07/12] python3-pytest-asyncio: update to 0.18.3.
---
srcpkgs/python3-pytest-asyncio/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 8c1dbdaf20c2..850b48bc683c 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,14 +1,23 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.14.0
-revision=2
+version=0.18.3
+revision=1
wrksrc="pytest-asyncio-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
+checkdepends="$depends python3-hypothesis"
short_desc="Pytest support for asyncio"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700
+checksum=7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91
+
+do_check() {
+ local skiptests="test_auto_mode_cmdline or \
+ test_strict_mode_ignores_trio_fixtures or \
+ test_unused_port_fixture or test_unused_port_factory_fixture"
+
+ PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest -k "not (${skiptests})"
+}
From 7b2939accc5a138759c41067bb987e986eacf9a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 11:34:22 -0400
Subject: [PATCH 08/12] python3-pytest-mock: update to 3.7.0.
---
srcpkgs/python3-pytest-mock/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index 56d4cda8dc34..3cbfc61e835a 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-mock'
pkgname=python3-pytest-mock
-version=3.5.1
-revision=2
+version=3.7.0
+revision=1
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-mock/"
distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=a1e2aba6af9560d313c642dae7e00a2a12b022b80301d9d7fc8ec6858e1dd9fc
+checksum=5112bd92cc9f186ee96e1a92efc84969ea494939c3aead39c50f421c4cc69534
# pytest-mock requires pytest-mock to be installed so it'll always fail during
# packaging
From 7248312764ebe160f974df1d8063f759834271ae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:23:28 -0400
Subject: [PATCH 09/12] python3-pytest-fixture-config: update to 1.7.0.
---
.../patches/no_setuptools_git.patch | 11 +++++++++++
srcpkgs/python3-pytest-fixture-config/template | 14 ++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
new file mode 100644
index 000000000000..f3455685738d
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch
@@ -0,0 +1,11 @@
+Void doesn't package setuptools-git, and there's no need to start now.
+
+--- a/common_setup.py
++++ b/common_setup.py
+@@ -72,6 +72,5 @@
+ license='MIT license',
+ platforms=['unix', 'linux'],
+ cmdclass={'test': PyTest, 'egg_info': EggInfo},
+- setup_requires=['setuptools-git'],
+ include_package_data=True
+ )
diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index 3c22c9f0fb47..73f654bd6d34 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -1,26 +1,20 @@
# Template file for 'python3-pytest-fixture-config'
pkgname=python3-pytest-fixture-config
_pkgname=${pkgname#*-}
-version=1.3.0
-revision=6
+version=1.7.0
+revision=1
wrksrc="${_pkgname}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pytest"
-checkdepends="python3-pytest"
+checkdepends="python3-six $depends"
short_desc="Fixture configuration utils for py.test (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/manahl/pytest-plugins"
distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
-checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
+checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e
-pre_build() {
- sed -i '/setup_requires/d' common_setup.py
-}
-do_check() {
- python3 setup.py test
-}
post_install() {
vlicense LICENSE
}
From 6ffcdd6b141cff8e247d3480b7fbb3e14a59832f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:25:19 -0400
Subject: [PATCH 10/12] python3-pytest-timeout: update to 2.1.0.
---
srcpkgs/python3-pytest-timeout/template | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template
index a3ebcf843ffe..450c90447f8d 100644
--- a/srcpkgs/python3-pytest-timeout/template
+++ b/srcpkgs/python3-pytest-timeout/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-timeout'
pkgname=python3-pytest-timeout
-version=1.4.2
-revision=2
+version=2.1.0
+revision=1
wrksrc="pytest-timeout-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,14 +12,10 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="MIT"
homepage="https://github.com/pytest-dev/pytest-timeout/"
distfiles="${PYPI_SITE}/p/pytest-timeout/pytest-timeout-${version}.tar.gz"
-checksum=20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76
+checksum=c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9
+# Tests require package to be installed
+make_check=no
post_install() {
vlicense LICENSE
}
-
-# adding do_check since the tests depend on this package
-do_check() {
- python setup.py install
- pytest
-}
From a94138eb0fcf6bd1704e24a3726d0a2e9ad06eeb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:41:23 -0400
Subject: [PATCH 11/12] python3-pytest-aiohttp: update to 1.0.4.
---
srcpkgs/python3-pytest-aiohttp/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template
index 0d88edc7edce..3ea362b3e304 100644
--- a/srcpkgs/python3-pytest-aiohttp/template
+++ b/srcpkgs/python3-pytest-aiohttp/template
@@ -1,15 +1,17 @@
# Template file for 'python3-pytest-aiohttp'
pkgname=python3-pytest-aiohttp
-version=0.3.0
-revision=2
+version=1.0.4
+revision=1
wrksrc="pytest-aiohttp-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-pytest"
+hostmakedepends="python3-setuptools_scm python3-wheel"
+depends="python3-pytest python3-aiohttp python3-pytest-asyncio"
+checkdepends="$depends"
short_desc="Pytest plugin for aiohttp support"
maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aio-libs/pytest-aiohttp/"
distfiles="${PYPI_SITE}/p/pytest-aiohttp/pytest-aiohttp-${version}.tar.gz"
-checksum=c929854339637977375838703b62fef63528598bc0a9d451639eba95f4aaa44f
-make_check=no # No tests available
+checksum=39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4
+# Tests require package be installed (but they succeed in that case)
+make_check=no
From 48eae1e48f5c64e84dea1d52ebdb2c92e85bb893 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 14 May 2022 14:44:29 -0400
Subject: [PATCH 12/12] python3-hypercorn: fix tests
---
srcpkgs/python3-hypercorn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index 137b2c74a724..2133a767d49c 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -8,7 +8,7 @@ make_install_target="Hypercorn-${version}-*-*-*.whl"
hostmakedepends="python3-poetry-core"
depends="python3-h11 python3-h2 python3-priority
python3-toml python3-typing_extensions python3-wsproto"
-checkdepends="python3-pytest-asyncio $depends"
+checkdepends="python3-pytest-asyncio python3-tomli $depends"
short_desc="Python ASGI server based on hyper and inspired by gunicorn"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="MIT"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: python3-pytest: update to 7.1.2, and a bunch of dependants
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
` (3 preceding siblings ...)
2022-05-17 22:51 ` [PR PATCH] [Updated] " ahesford
@ 2022-05-17 23:38 ` ahesford
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2022-05-17 23:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 652 bytes --]
There's a merged pull request on the void-packages repository
python3-pytest: update to 7.1.2, and a bunch of dependants
https://github.com/void-linux/void-packages/pull/37133
Description:
The pytest update may potential break some python package tests, but we can fix those by attrition. It's time to update some of these long-outdated packages.
The update has been tested somewhat just by watching the dependants pass checks with the new pytest, and I've done a couple of one-off tests here and there.
#### Testing the changes
- I tested the changes in this PR: **briefly**
cc: @paper42 @Chocimier (This touches a few of your packages.)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-17 23:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-14 18:49 [PR PATCH] python3-pytest: update to 7.1.2, and a bunch of dependants ahesford
2022-05-14 19:08 ` [PR PATCH] [Updated] " ahesford
2022-05-14 20:12 ` ahesford
2022-05-16 19:59 ` Chocimier
2022-05-17 22:51 ` [PR PATCH] [Updated] " ahesford
2022-05-17 23:38 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).