Date: Saturday, November 26, 2022 @ 19:06:06 Author: dvzrv Revision: 1354041
upgpkg: python-subprocess-tee 0.4.0-1: Upgrade to 0.4.0. Remove patches and use sed instead (upstream closed the PR for whatever reason and after 0.4.0 implemented the same thing again...). Switch back to pypi sdist tarball. Modified: python-subprocess-tee/trunk/PKGBUILD Deleted: python-subprocess-tee/trunk/python-subprocess-tee-0.3.5-dependencies.patch python-subprocess-tee/trunk/python-subprocess-tee-0.3.5-remove_mock.patch ------------------------------------------------+ PKGBUILD | 33 +++++------------- python-subprocess-tee-0.3.5-dependencies.patch | 42 ----------------------- python-subprocess-tee-0.3.5-remove_mock.patch | 12 ------ 3 files changed, 10 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-26 18:59:56 UTC (rev 1354040) +++ PKGBUILD 2022-11-26 19:06:06 UTC (rev 1354041) @@ -2,9 +2,8 @@ _name=subprocess-tee pkgname=python-subprocess-tee -pkgver=0.3.5 -_commit=c1b451090d0770740b5f29897771a95f7e2d8484 # refs/tags/0.3.5 -pkgrel=4 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A subprocess.run that works like tee" arch=(any) url="https://github.com/pycontribs/subprocess-tee"; @@ -13,34 +12,22 @@ makedepends=(git python-build python-installer python-setuptools python-setuptools-scm python-wheel) checkdepends=(ansible-core molecule python-enrich python-pytest python-pytest-xdist) optdepends=('python-enrich: for rich text rendering') -# NOTE: switch to git source to not backport own patches: https://github.com/pypa/setuptools/issues/3672 -source=( - git+https://github.com/pycontribs/subprocess-tee#tag=$_commit - # https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz - $pkgname-0.3.5-dependencies.patch - $pkgname-0.3.5-remove_mock.patch -) -sha512sums=('SKIP' - 'ce6c2b49c5fa86c914e4713e495b3126024836995cdd7549b811c91cc3c7e4a76e8b62518d61a753080ba827118f0522f7cae521c23339191ca12fe8164f38ae' - 'ecc3b991d8b856aa1a72640e7404fe873e095ae7628be3df6083be844363012917610b90cb49ba70af1213482fdcee946fe9ccc93dc0e55e298760dffe70ef92') -b2sums=('SKIP' - '40045907ce596107a8a56e6d76dc6637b9cfafec46ae496817a8e19599c7de492f422dd2abd830bf39b1a2a367b40690948de4012fb22106bab85ec5fba3b2d5' - 'e2d330fffbb8664a4042940cec8a05a41fc85ad877ca4147dfeb650c8fcbfd4cf7180c5d101f34733f21fac1d326bccabbeedcc1546a28fd9d6adc9570ed891b') +source=(https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz) +sha512sums=('944f978c87d612a7846709106b7857761288ef9e6923bf0b69e20cc493b7dbcf51c16867ed7b3038a1d2f180108972c35e8d9fe380542b56c7c68320caf9321b') +b2sums=('0a536daca56dd441848eaaeb3d53384349debdfe7b83458a89ff9e9d44cf63d4cae9eb6436705494cbb15282594a3ad0ce1c8dd51bfb6f79128c6855ab3b2c82') prepare() { - # remove pip, wheel and python-setuptools-scm-git-archive: https://github.com/pycontribs/subprocess-tee/pull/60 - patch -Np1 -d $_name -i ../$pkgname-0.3.5-dependencies.patch - # remove mock: https://github.com/pycontribs/subprocess-tee/pull/62 - patch -Np1 -d $_name -i ../$pkgname-0.3.5-remove_mock.patch + cd $_name-$pkgver + sed -e '/pip/d;/setuptools_scm_git_archive/d' -i pyproject.toml } build() { - cd $_name + cd $_name-$pkgver python -m build --wheel --no-isolation } check() { - cd $_name + cd $_name-$pkgver export PYTHONPATH="build:$PYTHONPATH" # disable broken test: https://github.com/pycontribs/subprocess-tee/issues/58 pytest -vv -c /dev/null -k "not test_rich_console_ex" @@ -49,7 +36,7 @@ package() { local _site_packages=$(python -c "import site; print(site.getsitepackages()[0])") - cd $_name + cd $_name-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/" install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" Deleted: python-subprocess-tee-0.3.5-dependencies.patch =================================================================== --- python-subprocess-tee-0.3.5-dependencies.patch 2022-11-26 18:59:56 UTC (rev 1354040) +++ python-subprocess-tee-0.3.5-dependencies.patch 2022-11-26 19:06:06 UTC (rev 1354041) @@ -1,42 +0,0 @@ -diff --git c/pyproject.toml w/pyproject.toml -index 1b5986b..00ccf01 100644 ---- c/pyproject.toml -+++ w/pyproject.toml -@@ -1,10 +1,7 @@ - [build-system] - requires = [ -- "pip >= 19.3.1", -- "setuptools >= 42", -- "setuptools_scm[toml] >= 3.5.0", -- "setuptools_scm_git_archive >= 1.1", -- "wheel >= 0.33.6", -+ "setuptools >= 45", -+ "setuptools_scm[toml] >= 7.0.0", - ] - build-backend = "setuptools.build_meta" - -diff --git c/setup.cfg w/setup.cfg -index 1a3abae..d01bda2 100644 ---- c/setup.cfg -+++ w/setup.cfg -@@ -59,8 +59,7 @@ zip_safe = False - - # These are required during `setup.py` run: - setup_requires = -- setuptools_scm >= 1.15.0 -- setuptools_scm_git_archive >= 1.0 -+ setuptools_scm[toml]>=7.0.0 - - # These are required in actual runtime: - ; install_requires = -diff --git c/setup.py w/setup.py -index d58a575..17927f7 100644 ---- c/setup.py -+++ w/setup.py -@@ -13,5 +13,5 @@ site.ENABLE_USER_SITE = "--user" in sys.argv[1:] - if __name__ == "__main__": - setuptools.setup( - use_scm_version={"local_scheme": "no-local-version"}, -- setup_requires=["setuptools_scm[toml]>=3.5.0"], -+ setup_requires=["setuptools_scm[toml]>=7.0.0"], - ) Deleted: python-subprocess-tee-0.3.5-remove_mock.patch =================================================================== --- python-subprocess-tee-0.3.5-remove_mock.patch 2022-11-26 18:59:56 UTC (rev 1354040) +++ python-subprocess-tee-0.3.5-remove_mock.patch 2022-11-26 19:06:06 UTC (rev 1354041) @@ -1,12 +0,0 @@ -diff --git c/setup.cfg w/setup.cfg -index 1a3abae..a24a234 100644 ---- c/setup.cfg -+++ w/setup.cfg -@@ -68,7 +68,6 @@ setup_requires = - [options.extras_require] - test = - enrich>=1.2.6 -- mock>=4.0.3 - molecule>=3.4.0 # ansible is needed but no direct imports are made - pytest-cov>=2.12.1 - pytest-plus>=0.2
