[arch-commits] Commit in python-testtools/repos/community-staging-any (3 files)
Felix Yan
felixonmars at archlinux.org
Wed Oct 30 10:01:23 UTC 2019
Date: Wednesday, October 30, 2019 @ 10:01:22
Author: felixonmars
Revision: 520964
archrelease: copy trunk to community-staging-any
Added:
python-testtools/repos/community-staging-any/PKGBUILD
(from rev 520963, python-testtools/trunk/PKGBUILD)
python-testtools/repos/community-staging-any/python-3.7.patch
(from rev 520963, python-testtools/trunk/python-3.7.patch)
Deleted:
python-testtools/repos/community-staging-any/PKGBUILD
------------------+
PKGBUILD | 138 +++++++++++++++++++++++++++--------------------------
python-3.7.patch | 38 ++++++++++++++
2 files changed, 109 insertions(+), 67 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-30 10:01:03 UTC (rev 520963)
+++ PKGBUILD 2019-10-30 10:01:22 UTC (rev 520964)
@@ -1,67 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-testtools
-pkgname=('python-testtools' 'python2-testtools')
-pkgver=2.3.0
-pkgrel=4
-pkgdesc="Extensions to the Python standard library unit testing framework"
-arch=('any')
-license=('MIT')
-url="https://github.com/testing-cabal/testtools"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-pyrsistent' 'python2-pyrsistent'
- 'git' 'python-pbr' 'python2-pbr' 'python-extras' 'python2-extras'
- 'python-fixtures' 'python2-fixtures' 'python-mimeparse' 'python2-mimeparse'
- 'python2-unittest2' 'python2-traceback2')
-checkdepends=('python-testscenarios' 'python2-testscenarios')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/testing-cabal/testtools/archive/$pkgver.tar.gz")
-sha512sums=('7c3b9e180c5f22d613763446525fcb3f7f260d79bc875669134c3077af0e0d3e101863429e0469ffcb26fd0755b2c915454abc949be864639a2faa9cf5024c62')
-
-prepare() {
- cp -a testtools-$pkgver{,-py2}
-
- # These are for python 2.x and old python 3.x only
- sed -i 's|unittest2|unittest|' testtools-$pkgver/testtools/tests/test_run.py \
- testtools-$pkgver/testtools/tests/test_testsuite.py \
- testtools-$pkgver/testtools/tests/twistedsupport/test_matchers.py \
- testtools-$pkgver/testtools/tests/twistedsupport/test_deferred.py \
- testtools-$pkgver/testtools/tests/twistedsupport/test_runtest.py
- sed -i '/unittest2>=1.0.0/d' testtools-$pkgver/requirements.txt
- sed -i 's|import linecache2 as linecache|import linecache|' testtools-$pkgver/testtools/tests/test_compat.py
- sed -i "s|traceback = try_import('traceback2')|import traceback|" testtools-$pkgver/testtools/content.py
- sed -i '/traceback2/d' testtools-$pkgver/requirements.txt
-
- export PBR_VERSION=$pkgver
-}
-
-build() {
- cd "$srcdir"/testtools-$pkgver
- python setup.py build
-
- cd "$srcdir"/testtools-$pkgver-py2
- python2 setup.py build
-}
-
-check() {
- cd "$srcdir"/testtools-$pkgver
- python -m testtools.run testtools.tests.test_suite
-
- cd "$srcdir"/testtools-$pkgver-py2
- python2 -m testtools.run testtools.tests.test_suite
-}
-
-package_python-testtools() {
- depends=('python-pbr' 'python-extras' 'python-fixtures' 'python-pyrsistent' 'python-mimeparse')
-
- cd testtools-$pkgver
- python setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-testtools() {
- depends=('python2-pbr' 'python2-extras' 'python2-fixtures' 'python2-pyrsistent'
- 'python2-mimeparse' 'python2-unittest2' 'python2-traceback2')
-
- cd testtools-$pkgver-py2
- python2 setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: python-testtools/repos/community-staging-any/PKGBUILD (from rev 520963, python-testtools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-30 10:01:22 UTC (rev 520964)
@@ -0,0 +1,71 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-testtools
+pkgname=('python-testtools' 'python2-testtools')
+pkgver=2.3.0
+pkgrel=5
+pkgdesc="Extensions to the Python standard library unit testing framework"
+arch=('any')
+license=('MIT')
+url="https://github.com/testing-cabal/testtools"
+makedepends=('python-setuptools' 'python2-setuptools' 'python-pyrsistent' 'python2-pyrsistent'
+ 'git' 'python-pbr' 'python2-pbr' 'python-extras' 'python2-extras'
+ 'python-fixtures' 'python2-fixtures' 'python-mimeparse' 'python2-mimeparse'
+ 'python2-unittest2' 'python2-traceback2')
+checkdepends=('python-testscenarios' 'python2-testscenarios')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/testing-cabal/testtools/archive/$pkgver.tar.gz"
+ 'python-3.7.patch')
+sha512sums=('7c3b9e180c5f22d613763446525fcb3f7f260d79bc875669134c3077af0e0d3e101863429e0469ffcb26fd0755b2c915454abc949be864639a2faa9cf5024c62'
+ '12430f9b813fea33b4e7530d446f5eebfe65785f4132b8732f771cbe72ed23bfdf3841db0a85ffab58f518bccbb5cf2711b62021b9ee294a9efc28b5df59d411')
+
+prepare() {
+ cp -a testtools-$pkgver{,-py2}
+
+ patch -Np1 -d testtools-$pkgver <python-3.7.patch
+
+ # These are for python 2.x and old python 3.x only
+ sed -i 's|unittest2|unittest|' testtools-$pkgver/testtools/tests/test_run.py \
+ testtools-$pkgver/testtools/tests/test_testsuite.py \
+ testtools-$pkgver/testtools/tests/twistedsupport/test_matchers.py \
+ testtools-$pkgver/testtools/tests/twistedsupport/test_deferred.py \
+ testtools-$pkgver/testtools/tests/twistedsupport/test_runtest.py
+ sed -i '/unittest2>=1.0.0/d' testtools-$pkgver/requirements.txt
+ sed -i 's|import linecache2 as linecache|import linecache|' testtools-$pkgver/testtools/tests/test_compat.py
+ sed -i "s|traceback = try_import('traceback2')|import traceback|" testtools-$pkgver/testtools/content.py
+ sed -i '/traceback2/d' testtools-$pkgver/requirements.txt
+
+ export PBR_VERSION=$pkgver
+}
+
+build() {
+ cd "$srcdir"/testtools-$pkgver
+ python setup.py build
+
+ cd "$srcdir"/testtools-$pkgver-py2
+ python2 setup.py build
+}
+
+check() {
+ cd "$srcdir"/testtools-$pkgver
+ python -m testtools.run testtools.tests.test_suite
+
+ cd "$srcdir"/testtools-$pkgver-py2
+ python2 -m testtools.run testtools.tests.test_suite
+}
+
+package_python-testtools() {
+ depends=('python-pbr' 'python-extras' 'python-fixtures' 'python-pyrsistent' 'python-mimeparse')
+
+ cd testtools-$pkgver
+ python setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-testtools() {
+ depends=('python2-pbr' 'python2-extras' 'python2-fixtures' 'python2-pyrsistent'
+ 'python2-mimeparse' 'python2-unittest2' 'python2-traceback2')
+
+ cd testtools-$pkgver-py2
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: python-testtools/repos/community-staging-any/python-3.7.patch (from rev 520963, python-testtools/trunk/python-3.7.patch)
===================================================================
--- python-3.7.patch (rev 0)
+++ python-3.7.patch 2019-10-30 10:01:22 UTC (rev 520964)
@@ -0,0 +1,38 @@
+From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Thu, 17 May 2018 17:52:26 +0200
+Subject: [PATCH] Fix the tests on Python 3.7
+
+Exception's repr got changed not to include trailing comma
+
+Fixes https://github.com/testing-cabal/testtools/issues/270
+
+diff --git a/testtools/tests/matchers/test_exception.py b/testtools/tests/matchers/test_exception.py
+index 6cd80af1..acd39252 100644
+--- a/testtools/tests/matchers/test_exception.py
++++ b/testtools/tests/matchers/test_exception.py
+@@ -32,15 +32,22 @@ class TestMatchesExceptionInstanceInterface(TestCase, TestMatchersInterface):
+ matches_matches = [error_foo]
+ matches_mismatches = [error_bar, error_base_foo]
+
++ if sys.version_info >= (3, 7):
++ # exception's repr has changed
++ _e = ''
++ else:
++ _e = ','
++
+ str_examples = [
+- ("MatchesException(Exception('foo',))",
++ ("MatchesException(Exception('foo'%s))" % _e,
+ MatchesException(Exception('foo')))
+ ]
+ describe_examples = [
+ ("%r is not a %r" % (Exception, ValueError),
+ error_base_foo,
+ MatchesException(ValueError("foo"))),
+- ("ValueError('bar',) has different arguments to ValueError('foo',).",
++ ("ValueError('bar'%s) has different arguments to ValueError('foo'%s)."
++ % (_e, _e),
+ error_bar,
+ MatchesException(ValueError("foo"))),
+ ]
More information about the arch-commits
mailing list