[arch-commits] Commit in python-netaddr/repos/community-any (4 files)
Jelle van der Waa
jelle at archlinux.org
Thu Feb 13 17:44:11 UTC 2020
Date: Thursday, February 13, 2020 @ 17:44:11
Author: jelle
Revision: 570675
archrelease: copy trunk to community-any
Added:
python-netaddr/repos/community-any/PKGBUILD
(from rev 570674, python-netaddr/trunk/PKGBUILD)
python-netaddr/repos/community-any/pep479-return-instead-of-raise-StopIteration.patch
(from rev 570674, python-netaddr/trunk/pep479-return-instead-of-raise-StopIteration.patch)
Deleted:
python-netaddr/repos/community-any/PKGBUILD
python-netaddr/repos/community-any/pep479-return-instead-of-raise-StopIteration.patch
----------------------------------------------------+
PKGBUILD | 119 ++++++++-----------
pep479-return-instead-of-raise-StopIteration.patch | 46 +++----
2 files changed, 74 insertions(+), 91 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-13 17:44:03 UTC (rev 570674)
+++ PKGBUILD 2020-02-13 17:44:11 UTC (rev 570675)
@@ -1,68 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Sebastien LEDUC <sebastien at sleduc.fr>
-# Contributor: Gilles CHAUVIN <gcnweb at gmail dot com>
-
-pkgbase=python-netaddr
-pkgname=('python-netaddr' 'python2-netaddr')
-_pyname=netaddr
-pkgver=0.7.19
-pkgrel=4
-pkgdesc='Pure Python network address representation and manipulation library'
-url='https://github.com/drkjam/netaddr'
-arch=('any')
-license=('BSD')
-makedepends=('python-sphinx' 'python2-sphinx')
-checkdepends=('python-pytest' 'python2-pytest')
-options=('!makeflags')
-source=(${pkgbase}-${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')
-
-prepare() {
- cd ${_pyname}-${_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
-}
-
-check() {
- cd ${_pyname}-${_pyname}-${pkgver}
- LC_ALL='en_US.UTF-8' py.test
- LC_ALL='en_US.UTF-8' py.test2
-}
-
-package_python-netaddr() {
- depends=('python')
- optdepends=('ipython: netaddr interractive command support')
-
- 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"
- 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"
-}
-
-package_python2-netaddr() {
- depends=('python2')
- optdepends=('ipython2: netaddr interractive command supprt')
-
- cd ${_pyname}-${_pyname}-${pkgver}
- python2 setup.py install -O1 --root="${pkgdir}"
- mv "${pkgdir}"/usr/bin/netaddr{,2}
- sed -r 's|(env python)|\12|g' -i "${pkgdir}/usr/bin/netaddr2"
- install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
- 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/netaddr2.1"
-}
-
-# vim: ts=2 sw=2 et:
Copied: python-netaddr/repos/community-any/PKGBUILD (from rev 570674, python-netaddr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-13 17:44:11 UTC (rev 570675)
@@ -0,0 +1,51 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sebastien LEDUC <sebastien at sleduc.fr>
+# Contributor: Gilles CHAUVIN <gcnweb at gmail dot com>
+
+pkgname=python-netaddr
+_pyname=netaddr
+pkgver=0.7.19
+pkgrel=5
+pkgdesc='Pure Python network address representation and manipulation library'
+url='https://github.com/drkjam/netaddr'
+arch=('any')
+license=('BSD')
+depends=('python')
+makedepends=('python-sphinx')
+checkdepends=('python-pytest')
+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')
+
+prepare() {
+ cd ${_pyname}-${_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
+}
+
+check() {
+ cd ${_pyname}-${_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"
+ 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"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: pep479-return-instead-of-raise-StopIteration.patch
===================================================================
--- pep479-return-instead-of-raise-StopIteration.patch 2020-02-13 17:44:03 UTC (rev 570674)
+++ pep479-return-instead-of-raise-StopIteration.patch 2020-02-13 17:44:11 UTC (rev 570675)
@@ -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
Copied: python-netaddr/repos/community-any/pep479-return-instead-of-raise-StopIteration.patch (from rev 570674, python-netaddr/trunk/pep479-return-instead-of-raise-StopIteration.patch)
===================================================================
--- pep479-return-instead-of-raise-StopIteration.patch (rev 0)
+++ pep479-return-instead-of-raise-StopIteration.patch 2020-02-13 17:44:11 UTC (rev 570675)
@@ -0,0 +1,23 @@
+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