Date: Thursday, February 13, 2020 @ 14:03:46
Author: felixonmars
Revision: 570430
archrelease: copy trunk to community-any
Added:
python-oslo-utils/repos/community-any/PKGBUILD
(from rev 570429, python-oslo-utils/trunk/PKGBUILD)
python-oslo-utils/repos/community-any/oslo-utils-py38.patch
(from rev 570429, python-oslo-utils/trunk/oslo-utils-py38.patch)
Deleted:
python-oslo-utils/repos/community-any/PKGBUILD
python-oslo-utils/repos/community-any/oslo-utils-py38.patch
-----------------------+
PKGBUILD | 100 ++++++++++++++++-------------------------
oslo-utils-py38.patch | 116 ++++++++++++++++++++++++------------------------
2 files changed, 99 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-13 14:03:29 UTC (rev 570429)
+++ PKGBUILD 2020-02-13 14:03:46 UTC (rev 570430)
@@ -1,59 +0,0 @@
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-
-pkgbase=python-oslo-utils
-pkgname=(python-oslo-utils python2-oslo-utils)
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="Oslo Utility library"
-arch=('any')
-url="https://pypi.python.org/pypi/oslo.utils/$pkgver";
-license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-pbr'
'python2-pbr' 'python2-funcsigs'
- 'python-iso8601' 'python2-iso8601' 'python-oslo-i18n'
'python2-oslo-i18n'
- 'python2-monotonic' 'python-pytz' 'python2-pytz' 'python-netaddr'
'python2-netaddr'
- 'python-netifaces' 'python2-netifaces' 'python-debtcollector'
'python2-debtcollector')
-checkdepends=('python-oslotest' 'python-ddt' 'python-eventlet')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.utils/archive/$pkgver.tar.gz";
- oslo-utils-py38.patch)
-sha512sums=('c2fd4c36c2ceaca482c8d0c2c12e9bd4e9ec18316bc05e2016d2d877cfe916737b8f47ee91c0b672b27e1813c6782c3b81cafac7d1da41a2d35ff0e7ccc11a56'
-
'edc9861dfc02b82d0312774f2484bb5853a9e5b2e7de9ee19efbd7e1220be56e52d99abb15f71dba4d764832835371200e8d7cac2d40c0546d5cfc8daf68554a')
-
-export PBR_VERSION=$pkgver
-
-prepare() {
- patch -d oslo.utils-$pkgver -p1 -i ../oslo-utils-py38.patch
- cp -a oslo.utils-$pkgver{,-py2}
-}
-
-build() {
- cd "$srcdir"/oslo.utils-$pkgver
- python setup.py build
-
- cd "$srcdir"/oslo.utils-$pkgver-py2
- python2 setup.py build
-}
-
-check() {
- cd oslo.utils-$pkgver
- stestr run
-}
-
-package_python-oslo-utils() {
- depends=('python-six' 'python-pbr' 'python-iso8601' 'python-oslo-i18n'
'python-pytz'
- 'python-netaddr' 'python-netifaces' 'python-debtcollector')
-
- cd "$srcdir"/oslo.utils-$pkgver
- python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-package_python2-oslo-utils() {
- depends=('python2-six' 'python2-pbr' 'python2-iso8601' 'python2-oslo-i18n'
'python2-monotonic'
- 'python2-pytz' 'python2-netaddr' 'python2-netifaces'
'python2-debtcollector'
- 'python2-funcsigs')
-
- cd "$srcdir"/oslo.utils-$pkgver-py2
- python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-oslo-utils/repos/community-any/PKGBUILD (from rev 570429,
python-oslo-utils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-13 14:03:46 UTC (rev 570430)
@@ -0,0 +1,41 @@
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
+pkgname=python-oslo-utils
+pkgver=4.0.0
+pkgrel=3
+pkgdesc="Oslo Utility library"
+arch=('any')
+url="https://pypi.python.org/pypi/oslo.utils/$pkgver";
+license=('Apache')
+depends=('python-six' 'python-pbr' 'python-iso8601' 'python-oslo-i18n'
'python-pytz'
+ 'python-netaddr' 'python-netifaces' 'python-debtcollector')
+makedepends=('python-setuptools')
+checkdepends=('python-oslotest' 'python-ddt' 'python-eventlet')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/openstack/oslo.utils/archive/$pkgver.tar.gz";
+ oslo-utils-py38.patch)
+sha512sums=('c2fd4c36c2ceaca482c8d0c2c12e9bd4e9ec18316bc05e2016d2d877cfe916737b8f47ee91c0b672b27e1813c6782c3b81cafac7d1da41a2d35ff0e7ccc11a56'
+
'edc9861dfc02b82d0312774f2484bb5853a9e5b2e7de9ee19efbd7e1220be56e52d99abb15f71dba4d764832835371200e8d7cac2d40c0546d5cfc8daf68554a')
+
+export PBR_VERSION=$pkgver
+
+prepare() {
+ patch -d oslo.utils-$pkgver -p1 -i ../oslo-utils-py38.patch
+}
+
+build() {
+ cd oslo.utils-$pkgver
+ python setup.py build
+}
+
+check() {
+ cd oslo.utils-$pkgver
+ stestr run
+}
+
+package() {
+ cd oslo.utils-$pkgver
+ python setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: oslo-utils-py38.patch
===================================================================
--- oslo-utils-py38.patch 2020-02-13 14:03:29 UTC (rev 570429)
+++ oslo-utils-py38.patch 2020-02-13 14:03:46 UTC (rev 570430)
@@ -1,58 +0,0 @@
-Description: non-strict callback comparison is not possible in py3.8
-Author: Dimitri John Ledkov <x...@ubuntu.com>
-Bug-Python: https://bugs.python.org/issue1617161
-Bug-LP:
https://bugs.launchpad.net/ubuntu/+source/python-oslo.utils/+bug/1841072
-
-Index: python-oslo.utils-3.41.1/oslo_utils/reflection.py
-===================================================================
---- python-oslo.utils-3.41.1.orig/oslo_utils/reflection.py
-+++ python-oslo.utils-3.41.1/oslo_utils/reflection.py
-@@ -22,6 +22,8 @@ Reflection module.
-
- import inspect
- import types
-+import platform
-+import warnings
-
- import six
-
-@@ -169,7 +171,10 @@ def is_same_callback(callback1, callback
- # This happens when plain methods are given (or static/non-bound
- # methods).
- return True
-+ if not strict and platform.python_version() > '3.8':
-+ warnings.warn("non strict comparison impossible in py3.8+",
DeprecationWarning)
- if callback1 == callback2:
-+ ## raise deprecated warning
- if not strict:
- return True
- # Two bound methods are equal if functions themselves are equal and
-Index: python-oslo.utils-3.41.1/oslo_utils/tests/test_reflection.py
-===================================================================
---- python-oslo.utils-3.41.1.orig/oslo_utils/tests/test_reflection.py
-+++ python-oslo.utils-3.41.1/oslo_utils/tests/test_reflection.py
-@@ -17,6 +17,7 @@
- from oslotest import base as test_base
- import six
- import testtools
-+import warnings
-
- from oslo_utils import reflection
-
-@@ -153,7 +154,15 @@ class CallbackEqualityTest(test_base.Bas
- c = A()
-
- self.assertFalse(reflection.is_same_callback(b.b, c.b))
-- self.assertTrue(reflection.is_same_callback(b.b, c.b, strict=False))
-+
-+ # Non-strict reflection comparison is not possible in py3.8+
-+ with warnings.catch_warnings(record=True) as capture:
-+ warnings.simplefilter("always")
-+ res = reflection.is_same_callback(b.b, c.b, strict=False)
-+ if len(capture):
-+ self.assertFalse(res)
-+ else:
-+ self.assertTrue(res)
-
-
- class BoundMethodTest(test_base.BaseTestCase):
Copied: python-oslo-utils/repos/community-any/oslo-utils-py38.patch (from rev
570429, python-oslo-utils/trunk/oslo-utils-py38.patch)
===================================================================
--- oslo-utils-py38.patch (rev 0)
+++ oslo-utils-py38.patch 2020-02-13 14:03:46 UTC (rev 570430)
@@ -0,0 +1,58 @@
+Description: non-strict callback comparison is not possible in py3.8
+Author: Dimitri John Ledkov <x...@ubuntu.com>
+Bug-Python: https://bugs.python.org/issue1617161
+Bug-LP:
https://bugs.launchpad.net/ubuntu/+source/python-oslo.utils/+bug/1841072
+
+Index: python-oslo.utils-3.41.1/oslo_utils/reflection.py
+===================================================================
+--- python-oslo.utils-3.41.1.orig/oslo_utils/reflection.py
++++ python-oslo.utils-3.41.1/oslo_utils/reflection.py
+@@ -22,6 +22,8 @@ Reflection module.
+
+ import inspect
+ import types
++import platform
++import warnings
+
+ import six
+
+@@ -169,7 +171,10 @@ def is_same_callback(callback1, callback
+ # This happens when plain methods are given (or static/non-bound
+ # methods).
+ return True
++ if not strict and platform.python_version() > '3.8':
++ warnings.warn("non strict comparison impossible in py3.8+",
DeprecationWarning)
+ if callback1 == callback2:
++ ## raise deprecated warning
+ if not strict:
+ return True
+ # Two bound methods are equal if functions themselves are equal and
+Index: python-oslo.utils-3.41.1/oslo_utils/tests/test_reflection.py
+===================================================================
+--- python-oslo.utils-3.41.1.orig/oslo_utils/tests/test_reflection.py
++++ python-oslo.utils-3.41.1/oslo_utils/tests/test_reflection.py
+@@ -17,6 +17,7 @@
+ from oslotest import base as test_base
+ import six
+ import testtools
++import warnings
+
+ from oslo_utils import reflection
+
+@@ -153,7 +154,15 @@ class CallbackEqualityTest(test_base.Bas
+ c = A()
+
+ self.assertFalse(reflection.is_same_callback(b.b, c.b))
+- self.assertTrue(reflection.is_same_callback(b.b, c.b, strict=False))
++
++ # Non-strict reflection comparison is not possible in py3.8+
++ with warnings.catch_warnings(record=True) as capture:
++ warnings.simplefilter("always")
++ res = reflection.is_same_callback(b.b, c.b, strict=False)
++ if len(capture):
++ self.assertFalse(res)
++ else:
++ self.assertTrue(res)
+
+
+ class BoundMethodTest(test_base.BaseTestCase):
