[arch-commits] Commit in python-netaddr/trunk (2 files)
Levente Polyak
anthraxx at archlinux.org
Mon Aug 24 22:26:46 UTC 2020
Date: Monday, August 24, 2020 @ 22:26:46
Author: anthraxx
Revision: 687867
upgpkg: python-netaddr 0.7.20-1
Modified:
python-netaddr/trunk/PKGBUILD
Deleted:
python-netaddr/trunk/pep479-return-instead-of-raise-StopIteration.patch
----------------------------------------------------+
PKGBUILD | 36 ++++++++-----------
pep479-return-instead-of-raise-StopIteration.patch | 23 ------------
2 files changed, 16 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-24 22:24:03 UTC (rev 687866)
+++ PKGBUILD 2020-08-24 22:26:46 UTC (rev 687867)
@@ -4,8 +4,8 @@
pkgname=python-netaddr
_pyname=netaddr
-pkgver=0.7.19
-pkgrel=5
+pkgver=0.7.20
+pkgrel=1
pkgdesc='Pure Python network address representation and manipulation library'
url='https://github.com/drkjam/netaddr'
arch=('any')
@@ -12,40 +12,36 @@
license=('BSD')
depends=('python')
makedepends=('python-sphinx')
-checkdepends=('python-pytest')
+checkdepends=('python-pytest' 'python-pytest-cov')
optdepends=('ipython: netaddr interractive command support')
options=('!makeflags')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/drkjam/${_pyname}/archive/${_pyname}-${pkgver}.tar.gz
- fix-${pkgver}-python3.patch::https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch
- pep479-return-instead-of-raise-StopIteration.patch)
-sha512sums=('f07fb4de08aef4925dbc429b4ee93b25855273f083405d4e763c2fbc996ee35b09b87b10117040b073d45ac9f51512083116883ff48216e68aa1e429f83d5278'
- '8db4e6cbaf03b95092561dfcf881616920da2ab45f205d8bd29f1f6e9e7681a7d591c0a52dbdb772a41cac0b42d643c2dafcad22a659524a35cb6b06dd98d38d'
- 'ff4b46184cc98c360ba377a72ead48a64fd78477080c7061652f79dc44d7b6803111cee885502b7d98e08d66d440e7b9afd65faa97674b2c487a2ba78e684e9d')
+source=(https://github.com/drkjam/${_pyname}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('e5f99aad04bfc5dee3531059fdbbc1f4910ef880a12c0591bf8ff8fa55fecb666087432c2e74a2d9215da9f8e2848f0096fa966f3496f5d87558f0421ff1a429')
+b2sums=('c06ae455851db0b344fbfbce8280e3f6a22b1b5b70933415425f45d5702e875668e1424c5726c11c4f88195b1a11957c2c13eb8c626ec2f935faa22312d4c4f9')
prepare() {
- cd ${_pyname}-${_pyname}-${pkgver}
+ cd ${_pyname}-${pkgver}
sed -r 's|#!/usr/bin/env python||g' -i netaddr/eui/ieee.py netaddr/ip/iana.py
- patch -p1 < "${srcdir}/fix-${pkgver}-python3.patch"
- patch -p1 < "${srcdir}/pep479-return-instead-of-raise-StopIteration.patch"
}
build() {
- cd ${_pyname}-${_pyname}-${pkgver}/docs
- make man text
+ cd ${_pyname}-${pkgver}
+ python setup.py build
+ make -C docs man text
}
check() {
- cd ${_pyname}-${_pyname}-${pkgver}
+ cd ${_pyname}-${pkgver}
LC_ALL='en_US.UTF-8' py.test
}
package_python-netaddr() {
- cd ${_pyname}-${_pyname}-${pkgver}
- python setup.py install -O1 --root="${pkgdir}"
- install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+ cd ${_pyname}-${pkgver}
+ python setup.py install -O1 --root="${pkgdir}" --skip-build
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
install -Dm 644 docs/build/text/* -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 644 docs/build/man/netaddr.1 "${pkgdir}/usr/share/man/man1/netaddr.1"
+ install -Dm 644 docs/build/man/netaddr.1 "${pkgdir}/usr/share/man/man1/${pkgname}.1"
}
# vim: ts=2 sw=2 et:
Deleted: pep479-return-instead-of-raise-StopIteration.patch
===================================================================
--- pep479-return-instead-of-raise-StopIteration.patch 2020-08-24 22:24:03 UTC (rev 687866)
+++ pep479-return-instead-of-raise-StopIteration.patch 2020-08-24 22:26:46 UTC (rev 687867)
@@ -1,23 +0,0 @@
-From 292e2fd4b52409eab05149b0d63e0291bec3786a Mon Sep 17 00:00:00 2001
-From: Sergey Kozlov <sergey.kozlov at intel.com>
-Date: Mon, 11 Dec 2017 17:04:20 +0100
-Subject: [PATCH] PEP 479: 'return' instead of 'raise StopIteration'.
-
-Fro details please visit https://www.python.org/dev/peps/pep-0479/
----
- netaddr/ip/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/netaddr/ip/__init__.py b/netaddr/ip/__init__.py
-index 489badf..ecf72d0 100644
---- a/netaddr/ip/__init__.py
-+++ b/netaddr/ip/__init__.py
-@@ -1258,7 +1258,7 @@ def subnet(self, prefixlen, count=None, fmt=None):
-
- if not self.prefixlen <= prefixlen:
- # Don't return anything.
-- raise StopIteration
-+ return
-
- # Calculate number of subnets to be returned.
- width = self._module.width
More information about the arch-commits
mailing list