[python-testtools] update to 0.9.30
Pádraig Brady
pbrady at fedoraproject.org
Sat May 18 04:27:54 UTC 2013
commit b1d5f0c949e34c08aeaf99818b051292ded8d98a
Author: Pádraig Brady <P at draigBrady.com>
Date: Sat May 18 03:01:50 2013 +0100
update to 0.9.30
.gitignore | 1 +
python-testtools.spec | 15 ++-
sources | 2 +-
testtools-0.9.21-py3.patch | 14 --
...xtras.patch => testtools-0.9.30-no-extras.patch | 170 +++++++++-----------
testtools-0.9.30-py3.patch | 15 ++
6 files changed, 105 insertions(+), 112 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41d1271..062a000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/testtools-0.9.21.tar.gz
/testtools-0.9.29.tar.gz
+/testtools-0.9.30.tar.gz
diff --git a/python-testtools.spec b/python-testtools.spec
index ac46778..9101b05 100644
--- a/python-testtools.spec
+++ b/python-testtools.spec
@@ -3,7 +3,7 @@
%endif
Name: python-testtools
-Version: 0.9.29
+Version: 0.9.30
Release: 1%{?dist}
Summary: Extensions to the Python unit testing framework
@@ -13,18 +13,22 @@ Group: Development/Tools
License: MIT
URL: https://launchpad.net/testtools
Source0: http://pypi.python.org/packages/source/t/testtools/testtools-%{version}.tar.gz
-Patch0: testtools-0.9.29-no-extras.patch
-Patch1: testtools-0.9.21-py3.patch
+Patch0: testtools-0.9.30-no-extras.patch
+Patch1: testtools-0.9.30-py3.patch
BuildArch: noarch
BuildRequires: python2-devel
+BuildRequires: python-mimeparse >= 0.1.4
BuildRequires: python-setuptools
%if 0%{?with_python3}
BuildRequires: python3-devel
+BuildRequires: python3-mimeparse
BuildRequires: python3-setuptools
%endif
BuildRequires: python-sphinx
+Requires: python-mimeparse
+
%description
testtools is a set of extensions to the Python standard library's unit testing
framework.
@@ -34,6 +38,8 @@ framework.
%package -n python3-testtools
Summary: Extensions to the Python unit testing framework
+Requires: python3-mimeparse
+
%description -n python3-testtools
testtools is a set of extensions to the Python standard library's unit testing
framework.
@@ -125,6 +131,9 @@ popd
%changelog
+* Sat May 18 2013 Pádraig Brady <pbrady at redhat.com> - 0.9.30-1
+- Update to 0.9.30
+
* Thu Feb 07 2013 Pádraig Brady <pbrady at redhat.com> - 0.9.29-1
- Update to 0.9.29
diff --git a/sources b/sources
index a32a619..c1dc867 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45513d25a58ae433902f92eeebd55792 testtools-0.9.29.tar.gz
+599af3013f423a327e9caac5426b223e testtools-0.9.30.tar.gz
diff --git a/testtools-0.9.29-no-extras.patch b/testtools-0.9.30-no-extras.patch
similarity index 55%
rename from testtools-0.9.29-no-extras.patch
rename to testtools-0.9.30-no-extras.patch
index aae435e..3025947 100644
--- a/testtools-0.9.29-no-extras.patch
+++ b/testtools-0.9.30-no-extras.patch
@@ -1,7 +1,7 @@
-diff -Naur testtools-0.9.29.orig/testtools/__init__.py testtools-0.9.29/testtools/__init__.py
---- testtools-0.9.29.orig/testtools/__init__.py 2013-02-07 10:04:53.000000000 +0000
-+++ testtools-0.9.29/testtools/__init__.py 2013-02-07 15:27:51.280269001 +0000
-@@ -30,12 +30,11 @@
+diff -Naur testtools-0.9.30.orig/testtools/__init__.py testtools-0.9.30/testtools/__init__.py
+--- testtools-0.9.30.orig/testtools/__init__.py 2013-04-08 09:07:37.000000000 +0000
++++ testtools-0.9.30/testtools/__init__.py 2013-05-18 02:18:04.673334600 +0000
+@@ -44,12 +44,11 @@
'try_imports',
]
@@ -18,9 +18,9 @@ diff -Naur testtools-0.9.29.orig/testtools/__init__.py testtools-0.9.29/testtool
except ImportError:
# Support reading __init__ for __version__ without extras, because pip does
# not support setup_requires.
-diff -Naur testtools-0.9.29.orig/testtools/compat.py testtools-0.9.29/testtools/compat.py
---- testtools-0.9.29.orig/testtools/compat.py 2013-02-07 09:39:19.000000000 +0000
-+++ testtools-0.9.29/testtools/compat.py 2013-02-07 15:13:56.499060500 +0000
+diff -Naur testtools-0.9.30.orig/testtools/compat.py testtools-0.9.30/testtools/compat.py
+--- testtools-0.9.30.orig/testtools/compat.py 2013-04-03 05:55:59.000000000 +0000
++++ testtools-0.9.30/testtools/compat.py 2013-05-18 02:18:04.674334605 +0000
@@ -28,7 +28,7 @@
import traceback
import unicodedata
@@ -30,9 +30,9 @@ diff -Naur testtools-0.9.29.orig/testtools/compat.py testtools-0.9.29/testtools/
BytesIO = try_imports(['StringIO.StringIO', 'io.BytesIO'])
StringIO = try_imports(['StringIO.StringIO', 'io.StringIO'])
-diff -Naur testtools-0.9.29.orig/testtools/content.py testtools-0.9.29/testtools/content.py
---- testtools-0.9.29.orig/testtools/content.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/content.py 2013-02-07 15:14:29.723569253 +0000
+diff -Naur testtools-0.9.30.orig/testtools/content.py testtools-0.9.30/testtools/content.py
+--- testtools-0.9.30.orig/testtools/content.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/content.py 2013-05-18 02:18:04.675334610 +0000
@@ -17,8 +17,7 @@
import sys
import traceback
@@ -43,9 +43,9 @@ diff -Naur testtools-0.9.29.orig/testtools/content.py testtools-0.9.29/testtools
from testtools.compat import _b, _format_exc_info, str_is_unicode, _u
from testtools.content_type import ContentType, JSON, UTF8_TEXT
-diff -Naur testtools-0.9.29.orig/testtools/helpers.py testtools-0.9.29/testtools/helpers.py
---- testtools-0.9.29.orig/testtools/helpers.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/helpers.py 2013-02-07 15:14:42.010757452 +0000
+diff -Naur testtools-0.9.30.orig/testtools/helpers.py testtools-0.9.30/testtools/helpers.py
+--- testtools-0.9.30.orig/testtools/helpers.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/helpers.py 2013-05-18 02:18:04.676334615 +0000
@@ -8,12 +8,83 @@
import sys
@@ -136,9 +136,21 @@ diff -Naur testtools-0.9.29.orig/testtools/helpers.py testtools-0.9.29/testtools
def map_values(function, dictionary):
-diff -Naur testtools-0.9.29.orig/testtools/testcase.py testtools-0.9.29/testtools/testcase.py
---- testtools-0.9.29.orig/testtools/testcase.py 2013-02-07 10:04:42.000000000 +0000
-+++ testtools-0.9.29/testtools/testcase.py 2013-02-07 15:26:07.273883849 +0000
+diff -Naur testtools-0.9.30.orig/testtools/run.py testtools-0.9.30/testtools/run.py
+--- testtools-0.9.30.orig/testtools/run.py 2013-04-03 11:32:49.000000000 +0000
++++ testtools-0.9.30/testtools/run.py 2013-05-18 02:28:55.170588888 +0000
+@@ -13,7 +13,7 @@
+ import unittest
+ import sys
+
+-from extras import safe_hasattr
++from testtools.helpers import safe_hasattr
+
+ from testtools import TextTestResult
+ from testtools.compat import classtypes, istext, unicode_output_stream
+diff -Naur testtools-0.9.30.orig/testtools/testcase.py testtools-0.9.30/testtools/testcase.py
+--- testtools-0.9.30.orig/testtools/testcase.py 2013-04-03 18:53:22.000000000 +0000
++++ testtools-0.9.30/testtools/testcase.py 2013-05-18 02:18:04.678334625 +0000
@@ -21,13 +21,12 @@
import types
import unittest
@@ -157,27 +169,21 @@ diff -Naur testtools-0.9.29.orig/testtools/testcase.py testtools-0.9.29/testtool
)
from testtools.compat import (
advance_iterator,
-diff -Naur testtools-0.9.29.orig/testtools/testresult/real.py testtools-0.9.29/testtools/testresult/real.py
---- testtools-0.9.29.orig/testtools/testresult/real.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/testresult/real.py 2013-02-07 15:08:56.109470678 +0000
-@@ -16,13 +16,12 @@
+diff -Naur testtools-0.9.30.orig/testtools/testresult/real.py testtools-0.9.30/testtools/testresult/real.py
+--- testtools-0.9.30.orig/testtools/testresult/real.py 2013-04-04 09:42:42.000000000 +0000
++++ testtools-0.9.30/testtools/testresult/real.py 2013-05-18 02:26:57.207017533 +0000
+@@ -27,7 +27,7 @@
import sys
import unittest
--from extras import safe_hasattr
--
- from testtools.compat import all, str_is_unicode, _u
- from testtools.content import (
- text_content,
- TracebackContent,
- )
-+from testtools.helpers import safe_hasattr
- from testtools.tags import TagContext
+-from extras import safe_hasattr, try_import, try_imports
++from testtools.helpers import safe_hasattr, try_import, try_imports
+ parse_mime_type = try_import('mimeparse.parse_mime_type')
+ Queue = try_imports(['Queue.Queue', 'queue.Queue'])
- # From http://docs.python.org/library/datetime.html
-diff -Naur testtools-0.9.29.orig/testtools/tests/helpers.py testtools-0.9.29/testtools/tests/helpers.py
---- testtools-0.9.29.orig/testtools/tests/helpers.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/helpers.py 2013-02-07 15:09:37.907108211 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/helpers.py testtools-0.9.30/testtools/tests/helpers.py
+--- testtools-0.9.30.orig/testtools/tests/helpers.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/tests/helpers.py 2013-05-18 02:18:04.682334645 +0000
@@ -8,9 +8,10 @@
import sys
@@ -191,9 +197,9 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/helpers.py testtools-0.9.29/tes
from testtools.content import TracebackContent
from testtools import runtest
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_deferredruntest.py testtools-0.9.29/testtools/tests/test_deferredruntest.py
---- testtools-0.9.29.orig/testtools/tests/test_deferredruntest.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_deferredruntest.py 2013-02-07 15:10:03.413497435 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_deferredruntest.py testtools-0.9.30/testtools/tests/test_deferredruntest.py
+--- testtools-0.9.30.orig/testtools/tests/test_deferredruntest.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_deferredruntest.py 2013-05-18 02:18:04.682334645 +0000
@@ -5,8 +5,6 @@
import os
import signal
@@ -211,9 +217,9 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/test_deferredruntest.py testtoo
from testtools.matchers import (
Equals,
KeysEqual,
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_distutilscmd.py testtools-0.9.29/testtools/tests/test_distutilscmd.py
---- testtools-0.9.29.orig/testtools/tests/test_distutilscmd.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_distutilscmd.py 2013-02-07 15:10:11.538621453 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_distutilscmd.py testtools-0.9.30/testtools/tests/test_distutilscmd.py
+--- testtools-0.9.30.orig/testtools/tests/test_distutilscmd.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_distutilscmd.py 2013-05-18 02:18:04.683334650 +0000
@@ -4,13 +4,12 @@
from distutils.dist import Distribution
@@ -229,9 +235,9 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/test_distutilscmd.py testtools-
fixtures = try_import('fixtures')
import testtools
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_fixturesupport.py testtools-0.9.29/testtools/tests/test_fixturesupport.py
---- testtools-0.9.29.orig/testtools/tests/test_fixturesupport.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_fixturesupport.py 2013-02-07 15:10:18.379725886 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_fixturesupport.py testtools-0.9.30/testtools/tests/test_fixturesupport.py
+--- testtools-0.9.30.orig/testtools/tests/test_fixturesupport.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_fixturesupport.py 2013-05-18 02:18:04.683334650 +0000
@@ -2,14 +2,13 @@
import unittest
@@ -248,9 +254,9 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/test_fixturesupport.py testtool
from testtools.testresult.doubles import (
ExtendedTestResult,
)
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_run.py testtools-0.9.29/testtools/tests/test_run.py
---- testtools-0.9.29.orig/testtools/tests/test_run.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_run.py 2013-02-07 15:12:09.411422158 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_run.py testtools-0.9.30/testtools/tests/test_run.py
+--- testtools-0.9.30.orig/testtools/tests/test_run.py 2013-04-03 11:32:49.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_run.py 2013-05-18 02:18:04.683334650 +0000
@@ -4,7 +4,7 @@
from unittest import TestSuite
@@ -260,9 +266,9 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/test_run.py testtools-0.9.29/te
fixtures = try_import('fixtures')
testresources = try_import('testresources')
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_spinner.py testtools-0.9.29/testtools/tests/test_spinner.py
---- testtools-0.9.29.orig/testtools/tests/test_spinner.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_spinner.py 2013-02-07 15:12:19.891582396 +0000
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_spinner.py testtools-0.9.30/testtools/tests/test_spinner.py
+--- testtools-0.9.30.orig/testtools/tests/test_spinner.py 2013-01-26 17:18:27.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_spinner.py 2013-05-18 02:18:04.684334655 +0000
@@ -5,12 +5,11 @@
import os
import signal
@@ -277,63 +283,39 @@ diff -Naur testtools-0.9.29.orig/testtools/tests/test_spinner.py testtools-0.9.2
from testtools.matchers import (
Equals,
Is,
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_testresult.py testtools-0.9.29/testtools/tests/test_testresult.py
---- testtools-0.9.29.orig/testtools/tests/test_testresult.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_testresult.py 2013-02-07 15:12:39.449881492 +0000
-@@ -15,8 +15,6 @@
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_testresult.py testtools-0.9.30/testtools/tests/test_testresult.py
+--- testtools-0.9.30.orig/testtools/tests/test_testresult.py 2013-04-03 05:55:59.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_testresult.py 2013-05-18 02:21:49.488481211 +0000
+@@ -16,7 +16,7 @@
from unittest import TestSuite
import warnings
--from extras import safe_hasattr
--
- from testtools import (
- ExtendedToOriginalDecorator,
- MultiTestResult,
-@@ -46,6 +44,7 @@
- TracebackContent,
- )
- from testtools.content_type import ContentType, UTF8_TEXT
-+from testtools.helpers import safe_hasattr
- from testtools.matchers import (
- Contains,
- DocTestMatches,
-diff -Naur testtools-0.9.29.orig/testtools/tests/test_testsuite.py testtools-0.9.29/testtools/tests/test_testsuite.py
---- testtools-0.9.29.orig/testtools/tests/test_testsuite.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/tests/test_testsuite.py 2013-02-07 15:12:48.794024418 +0000
-@@ -6,14 +6,13 @@
+-from extras import safe_hasattr, try_imports
++from testtools.helpers import safe_hasattr, try_imports
+ Queue = try_imports(['Queue.Queue', 'queue.Queue'])
+
+diff -Naur testtools-0.9.30.orig/testtools/tests/test_testsuite.py testtools-0.9.30/testtools/tests/test_testsuite.py
+--- testtools-0.9.30.orig/testtools/tests/test_testsuite.py 2013-04-03 05:55:59.000000000 +0000
++++ testtools-0.9.30/testtools/tests/test_testsuite.py 2013-05-18 02:25:32.366605395 +0000
+@@ -9,7 +9,7 @@
+ import sys
import unittest
-from extras import try_import
--
++from testtools.helpers import try_import
+
from testtools import (
ConcurrentTestSuite,
- iterate_tests,
- PlaceHolder,
- TestCase,
- )
-+from testtools.helpers import try_import
- from testtools.testsuite import FixtureSuite, iterate_tests, sorted_tests
- from testtools.tests.helpers import LoggingResult
-
-diff -Naur testtools-0.9.29.orig/testtools/testsuite.py testtools-0.9.29/testtools/testsuite.py
---- testtools-0.9.29.orig/testtools/testsuite.py 2013-01-26 14:59:29.000000000 +0000
-+++ testtools-0.9.29/testtools/testsuite.py 2013-02-07 15:16:50.362698459 +0000
-@@ -10,13 +10,13 @@
- 'sorted_tests',
- ]
-
--import threading
--import unittest
--
+diff -Naur testtools-0.9.30.orig/testtools/testsuite.py testtools-0.9.30/testtools/testsuite.py
+--- testtools-0.9.30.orig/testtools/testsuite.py 2013-04-03 05:55:59.000000000 +0000
++++ testtools-0.9.30/testtools/testsuite.py 2013-05-18 02:24:01.699150784 +0000
+@@ -15,7 +15,7 @@
+ import threading
+ import unittest
+
-from extras import safe_hasattr, try_imports
+from testtools.helpers import safe_hasattr, try_imports
Queue = try_imports(['Queue.Queue', 'queue.Queue'])
-+import threading
-+import unittest
-+
- import testtools
-
-
diff --git a/testtools-0.9.30-py3.patch b/testtools-0.9.30-py3.patch
new file mode 100644
index 0000000..ae0a0fe
--- /dev/null
+++ b/testtools-0.9.30-py3.patch
@@ -0,0 +1,15 @@
+diff -Naur testtools-0.9.30.orig/testtools/compat.py testtools-0.9.30/testtools/compat.py
+--- testtools-0.9.30.orig/testtools/compat.py 2013-05-18 02:37:20.054013319 +0000
++++ testtools-0.9.30/testtools/compat.py 2013-05-18 02:38:59.910489029 +0000
+@@ -33,10 +33,7 @@
+ BytesIO = try_imports(['StringIO.StringIO', 'io.BytesIO'])
+ StringIO = try_imports(['StringIO.StringIO', 'io.StringIO'])
+
+-try:
+- from testtools import _compat2x as _compat
+-except (SyntaxError, ImportError):
+- from testtools import _compat3x as _compat
++from testtools import _compat3x as _compat
+
+ reraise = _compat.reraise
+
More information about the scm-commits
mailing list