[arch-commits] Commit in python-cheroot/trunk (3 files)
David Runge
dvzrv at gemini.archlinux.org
Wed Jun 8 10:23:23 UTC 2022
Date: Wednesday, June 8, 2022 @ 10:23:23
Author: dvzrv
Revision: 1229227
upgpkg: python-cheroot 8.6.0-2: Depend on specific python-jaraco package
Modified:
python-cheroot/trunk/PKGBUILD
Deleted:
python-cheroot/trunk/LICENSE
python-cheroot/trunk/disable-broken-tests.patch
----------------------------+
LICENSE | 7 ----
PKGBUILD | 68 +++++++++++++++----------------------------
disable-broken-tests.patch | 11 ------
3 files changed, 24 insertions(+), 62 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2022-06-08 09:42:13 UTC (rev 1229226)
+++ LICENSE 2022-06-08 10:23:23 UTC (rev 1229227)
@@ -1,7 +0,0 @@
-Copyright Jason R. Coombs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-08 09:42:13 UTC (rev 1229226)
+++ PKGBUILD 2022-06-08 10:23:23 UTC (rev 1229227)
@@ -1,66 +1,46 @@
# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
# Contributor: wangjiezhe <wangjiezhe AT yandex DOT com>
-pkgbase='python-cheroot'
-_pkgbase="${pkgbase//python-/}"
-pkgname=('python-cheroot')
+_name=cheroot
+pkgname=python-cheroot
pkgdesc="Highly-optimized, pure-python HTTP server"
pkgver=8.6.0
-pkgrel=1
+pkgrel=2
arch=('any')
url="https://github.com/cherrypy/cheroot"
license=('MIT')
-depends=('python-six' 'python-jaraco')
-makedepends=('python-six' 'python-setuptools-scm'
- 'tree' 'python-tox' 'python-jaraco' 'git')
-checkdepends=('python-pytest' 'python-pytest-xdist'
- 'python-requests' 'python-pyopenssl' 'python-trustme')
-source=("https://files.pythonhosted.org/packages/source/${_pkgbase:0:1}/${_pkgbase}/${_pkgbase}-${pkgver}.tar.gz"
- "LICENSE"
- "disable-broken-tests.patch")
-sha512sums=('26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893'
- '1106afed483b7258e4ae89c5d9459c3834412b31aac90169725ed62d2ab44f61f6f79e894d4c9e4d8bd99e14530ab778df2187784f0b25eaab86d312fad68944'
- '488766eeb0ce4e1c95e1848a4d89aeb190317c634b2894dcc696cb4af64bae748554154ea76cc34cf0b666d507c42e631d0e8759a6ed7669fe49bf7f8ef5b9a9')
+depends=('python-jaraco.functools' 'python-more-itertools' 'python-six')
+makedepends=('python-build' 'python-installer' 'python-setuptools'
+'python-setuptools-scm' 'python-setuptools-scm-git-archive' 'python-wheel')
+# TODO: package python-pytest-watch
+# TODO: package python-pypytools
+checkdepends=(python-apipkg python-chardet python-colorama
+python-jaraco.context python-jaraco.text python-portend python-pyopenssl
+python-pytest python-pytest-forked python-pytest-rerunfailures
+python-pytest-sugar python-pytest-xdist python-requests-toolbelt
+python-requests-unixsocket python-trustme python-urllib3 python-watchdog)
+source=("https://files.pythonhosted.org/packages/source/${_name:0:1}/${_name}/${_name}-${pkgver}.tar.gz")
+sha512sums=('26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893')
+b2sums=('97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306')
-prepare() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- patch -p1 -N -i "${srcdir}/disable-broken-tests.patch"
- # don't use python-coverage
- sed -i '/^ --cov/d' pytest.ini
-
- # git-archive support is not needed since we use PyPI tarballs
- sed -i '/setuptools_scm_git_archive/d' setup.cfg
-
- cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
-}
-
build() {
# setuptools wont find version from git tag
export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- python setup.py build
+ cd ${_name}-${pkgver}
+ python -m build --wheel --no-isolation
}
check() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- # tox doesn't really provide any meaningful results for downstream packaging
- # TODO: properly run the tests with distro packages
-
- cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
- # tox doesn't really provide any meaningful results for downstream packaging
- # TODO: properly run the tests with distro packages
+ cd ${_name}-${pkgver}
+ # TODO: package remaining checkdepends and run pytest
+ # pytest -vv -c /dev/null
}
package() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- python setup.py install --root="$pkgdir/" --optimize=1
-
- # the author has promised to include a LICENSE file in future releases:
- # https://github.com/jaraco/skeleton/issues/1
- # for now the LICENSE file has been taken from:
- # https://github.com/jaraco/skeleton/blob/skeleton/LICENSE
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ cd ${_name}-${pkgver}
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ install -vDm 644 LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname/"
}
# vim:set ts=2 sw=2 et:
Deleted: disable-broken-tests.patch
===================================================================
--- disable-broken-tests.patch 2022-06-08 09:42:13 UTC (rev 1229226)
+++ disable-broken-tests.patch 2022-06-08 10:23:23 UTC (rev 1229227)
@@ -1,11 +0,0 @@
-diff -upr a/cheroot/test/test_ssl.py b/cheroot/test/test_ssl.py
---- a/cheroot/test/test_ssl.py 2020-07-13 16:43:42.000000000 +0200
-+++ b/cheroot/test/test_ssl.py 2020-07-13 18:53:44.015966639 +0200
-@@ -212,7 +212,6 @@ def test_ssl_adapters(
- @pytest.mark.parametrize(
- 'adapter_type',
- (
-- 'builtin',
- 'pyopenssl',
- ),
- )
More information about the arch-commits
mailing list