开源软件构建与测试

_service:extract_file:python-testtools.spec Changed

@@ -1,17 +1,17 @@
 Name:           python-testtools
-Version:        2.3.0
-Release:        12
+Version:        2.4.0
+Release:        3
 Summary:        Extensions to the Python unit testing framework
 License:        MIT
 URL:            https://launchpad.net/testtools
-Source0:        https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
-
-Patch0001:      testtools-1.8.0-py3.patch
-Patch0002:      testtools-2.3.0-py37.patch
 
+Source0:        https://pypi.io/packages/source/t/testtools/testtools-%{version}.tar.gz
 BuildRequires:  python3-extras python3-mimeparse python3-pbr python3-setuptools python3-unittest2
 BuildRequires:  python3-traceback2 python3-testscenarios python3-sphinx python3-devel
 BuildArch:      noarch
+Patch0:         testtools-2.4.0-fix-py3-compat.patch
+Patch1:         testtools-2.4.0-fix_py39_test.patch
+Patch2:         Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch
 
 %description
 Testtools is a set of extensions to the Python standard library's unit testing framework. These
@@ -37,26 +37,17 @@
 This package contains HTML documentation for python-testtools.
 
 %prep
-%setup -q -n testtools-%{version}
-%patch0002 -p1
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-cd %{py3dir}
-%patch0001 -p1
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-rm -f %{py3dir}/testtools/_compat2x.py %{_builddir}/testtools-%{version}/testtools/_compat3x.py
+%autosetup -n testtools-%{version} -p1
+rm -rf testtools.egg-info
 
 %build
+%py3_build
 PYTHONPATH=$PWD make -C doc html
-cd %{py3dir}
-%{__python3} setup.py build
 
 %install
-cd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py3_install
 
 %check
-cd %{py3dir}
 make PYTHON=%{__python3} check
 
 %files -n python3-testtools
@@ -67,6 +58,15 @@
 %doc doc/_build/html/*
 
 %changelog
+* Sun Apr 24 2022 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 2.4.0-3
+- Drop traceback2 in favor of traceback and remove unused linecache2
+
+* Sat Jan 08 2021 caodongxia <caodongxia@huawei.com> - 2.4.0-2
+- Fix test fail
+
+* Fri Aug 06 2021 liusheng <liusheng2048@gmail.com> - 2.4.0-1
+- Upgrade to version 2.4.0
+
 * Tue Aug 11 2020 zhangtao <zhangtao221@huawei.com> - 2.3.0-12
 - Del Python2-testtools python2 is EOL and we recommend python3

_service:extract_file:Drop_traceback2_in_favor_of_traceback_and_remove_unused_linecache2.patch Added

@@ -0,0 +1,47 @@
+From b6cf7daa7e0598de1b627b566a146f5ff6863274 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Mon, 24 Aug 2020 22:32:19 +0800
+Subject: PATCH Drop traceback2 in favor of traceback and remove unused
+ linecache2
+
+diff --git a/requirements.txt b/requirements.txt
+index 1df0799d..a50bc02c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -5,5 +5,4 @@
+ # but someone kindly uploaded a fixed version as 'python-mimeparse'.
+ python-mimeparse
+ unittest2>=1.0.0
+-traceback2
+ six>=1.4.0
+diff --git a/testtools/compat.py b/testtools/compat.py
+index 8a86433f..b6e54816 100644
+--- a/testtools/compat.py
++++ b/testtools/compat.py
+@@ -30,8 +30,6 @@
+ 
+ BytesIO = try_imports('StringIO.StringIO', 'io.BytesIO')
+ StringIO = try_imports('StringIO.StringIO', 'io.StringIO')
+-# To let setup.py work, make this a conditional import.
+-linecache = try_import('linecache2')
+ 
+ from testtools import _compat3x as _compat
+ 
+
+diff --git a/testtools/content.py b/testtools/content.py
+index faad04dd..b84818a9 100644
+--- a/testtools/content.py
++++ b/testtools/content.py
+@@ -17,10 +17,9 @@
+ import json
+ import os
+ import sys
++import traceback
+ 
+ from extras import try_import
+-# To let setup.py work, make this a conditional import.
+-traceback = try_import('traceback2')
+ 
+ from testtools.compat import (
+     _b,
+

_service:extract_file:testtools-1.8.0-py3.patch Deleted

_service:extract_file:testtools-2.3.0-py37.patch Deleted

@@ -1,54 +0,0 @@
-From 29004731f9c480b7c44a9c2605513d50d372898f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@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
----
- .travis.yml                                |  1 +
- testtools/tests/matchers/test_exception.py | 11 +++++++++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 7f1f4db7..784608e0 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -5,6 +5,7 @@ python:
-   - "3.4"
-   - "3.5"
-   - "3.6"
-+  - "3.7-dev"
-   - "pypy"
- 
- install:
-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"))),
-

_service:extract_file:testtools-2.4.0-fix-py3-compat.patch Added

@@ -0,0 +1,36 @@
+diff -urN testtools-2.4.0/testtools/_compat2x.py testtools-2.4.0-new/testtools/_compat2x.py
+--- testtools-2.4.0/testtools/_compat2x.py	2015-11-08 01:27:33.000000000 +0800
++++ testtools-2.4.0-new/testtools/_compat2x.py	1970-01-01 08:00:00.000000000 +0800
+@@ -1,17 +0,0 @@
+-# Copyright (c) 2011 testtools developers. See LICENSE for details.
+-
+-"""Compatibility helpers that are valid syntax in Python 2.x.
+-
+-Only add things here if they *only* work in Python 2.x or are Python 2
+-alternatives to things that *only* work in Python 3.x.
+-"""
+-
+-__all__ = 
+-    'reraise',
+-    
+-
+-
+-def reraise(exc_class, exc_obj, exc_tb, _marker=object()):
+-    """Re-raise an exception received from sys.exc_info() or similar."""
+-    raise exc_class, exc_obj, exc_tb
+-
+diff -urN testtools-2.4.0/testtools/compat.py testtools-2.4.0-new/testtools/compat.py
+--- testtools-2.4.0/testtools/compat.py	2018-04-05 07:27:14.000000000 +0800
++++ testtools-2.4.0-new/testtools/compat.py	2021-08-06 10:55:13.294527126 +0800
+@@ -33,10 +33,7 @@
+ # To let setup.py work, make this a conditional import.
+ linecache = try_import('linecache2')
+ 
+-try:
+-    from testtools import _compat2x as _compat
+-except SyntaxError:
+-    from testtools import _compat3x as _compat
++from testtools import _compat3x as _compat
+ 
+ reraise = _compat.reraise
+

_service:extract_file:testtools-2.4.0-fix_py39_test.patch Added

_service Changed

_service:extract_file:testtools-2.3.0.tar.gz/.gitignore -> _service:extract_file:testtools-2.4.0.tar.gz/.gitignore Changed

_service:extract_file:testtools-2.3.0.tar.gz/.travis.yml -> _service:extract_file:testtools-2.4.0.tar.gz/.travis.yml Changed

_service:extract_file:testtools-2.3.0.tar.gz/AUTHORS -> _service:extract_file:testtools-2.4.0.tar.gz/AUTHORS Changed

@@ -1,4 +1,5 @@
 Aaron Bentley <aaron@aaronbentley.com>
+Adam Harwell <flux.adam@gmail.com>
 Andrew Bennetts <andrew@bemusement.org>
 Andrew Bennetts <andrew@puzzling.org>
 Benedikt Morbach <benedikt.morbach@googlemail.com>
@@ -21,10 +22,12 @@
 Gavin Panella <gavin@gromper.net>
 Gavin Panella <gavinpanella@gmail.com>
 Graham Binns <graham@canonical.com>
+Hugo <hugovk@users.noreply.github.com>
 James Westby <james.westby@canonical.com>
 Jamu Kakar <jkakar@kakar.ca>
 Javier Collado <javier.collado@gmail.com>
 Jelmer Vernooij <jelmer@samba.org>
+Jelmer Vernooĳ <jelmer@jelmer.uk>
 Joe Gordon <joe.gordon0@gmail.com>
 Jonathan Jacobs <jonathan@jsphere.com>
 Jonathan Lange <jml@canonical.com>
@@ -37,6 +40,7 @@
 Martin Packman <martin.packman@canonical.com>
 Martin Pool <mbp@canonical.com>
 Michael Hudson <michael.hudson@linaro.org>
+Miro Hrončok <miro@hroncok.cz>
 Monty Taylor <mordred@inaugust.com>
 Nikola Dipanov <nikola.djipanov@gmail.com>
 Raphael Badin <raphael.badin@canonical.com>
@@ -44,14 +48,17 @@
 Robert Collins <robert.collins@canonical.com>
 Robert Collins <robertc@lifelesswks>
 Robert Collins <robertc@robertcollins.net>
+Ross Burton <ross.burton@intel.com>
 Thomas Bechtold <tbechtold@suse.com>
 Thomas Herve <therve@redhat.com>
 Thomas Hervé <therve@gmail.com>
 Thomi Richards <thomi.richards@canonical.com>
 Thomi Richards <thomir@gmail.com>
 Tres Seaver <tseaver@agendaless.com>
+Ville Skyttä <ville.skytta@iki.fi>
 Vincent Ladeuil <v.ladeuil+lp@free.fr>
 Xiao Hanyu <xiaohanyu1988@gmail.com>
+hugovk <hugovk@users.noreply.github.com>
 rbtcollins <robertc@robertcollins.net>
 tim.cole@canonical.com <>
 wbond <will@wbond.net>

_service:extract_file:testtools-2.3.0.tar.gz/ChangeLog -> _service:extract_file:testtools-2.4.0.tar.gz/ChangeLog Changed

@@ -1,6 +1,27 @@
 CHANGES
 =======
 
+2.4.0
+-----
+
+* Release 2.4.0
+* Add myself to contributors list
+* Add support for Python 3.7 and 3.8
+* Cache pip directory
+* Test CI on PyPy3
+* Tell pip not to install for Python 3.4
+* Drop support for EOL Python 3.4
+* Extra space expected in PyPy output
+* PyCharm IDE unittest detection compatibility fix
+* Don't use eval()
+* Fix the tests on Python 3.7
+* Drop support for EOL Python 3.3
+* Ignore IDE metadata
+* Update classifiers
+* Remove old Python 2.6 code
+* Spelling fixes (#261)
+* Python 3.6 invalid escape sequence deprecation fixes (#262)
+
 2.3.0
 -----
 
@@ -18,10 +39,10 @@
 
 * Release 2.2.0
 * Depend on the extras 1.0.0 release
-* Unbreak fixtures test suite / use of gather_details
+* Unbreak fixtures test suite / use of gather\_details
 * UTF-8 encode Twisted logs (allenap)
 * Use inlineCallbacks instead of deferredGenerator
-* Fix _lp_release: NEXT is case sensitive
+* Fix \_lp\_release: NEXT is case sensitive
 
 2.1.0
 -----
@@ -30,16 +51,16 @@
 * Correct docs for skip deprecation
 * Add matchers for detecting emitted warnings
 * Revert usage of pyrsistent
-* Add unique_text_generator
-* Become compatible with newer Fixtures _setUp() API
+* Add unique\_text\_generator
+* Become compatible with newer Fixtures \_setUp() API
 * Better handling of KeyboardInterrupt
-* Fix example in docstring for `failed`
+* Fix example in docstring for \`failed\`
 * Move all Twisted code to twistedsupport package
 * Revert "Move all Twisted code to twistedsupport package"
 * Move all Twisted code to twistedsupport package
 * Add Always & Never matchers
 * Support TestResults without stop/shouldStop
-* Stop using deprecated `skip()` internally
+* Stop using deprecated \`skip()\` internally
 
 2.0.0
 -----
@@ -59,41 +80,41 @@
 * Missed one
 * 19.4.1 refers to importlib machinery. Avoid that
 * See if setuptools 19.5 is bad
-* PIP_VERSION is used by pip itself
+* PIP\_VERSION is used by pip itself
 * Correct spelling of 'less than 8', maybe
-* Use only pip 7.* on pypy3 & py3.2
+* Use only pip 7.\* on pypy3 & py3.2
 * Longer timeout not necessary
 * NEWS update
 * Handle case where Deferred fires after timeout
 * Explicitly separate fake stop method
 * Lint & copyright
-* NO_RESULT -> has_no_result
+* NO\_RESULT -> has\_no\_result
 * Make twistedsupport a package
-* Rename `successful` to `succeeded`
+* Rename \`successful\` to \`succeeded\`
 * Improve NEWS
 * Conditionally import matchers
 * Use non-inplace install and add a comment
 * New module for twisted support code
 * Minor documentation tweaks
-* Make no_result a constant
+* Make no\_result a constant
 * Style & documentation tweaks from review
 * Review tweaks
-* Import extract_result from correct location
+* Import extract\_result from correct location
 * expectThat works under AsynchronousDeferredRunTest
 * Correct string literal syntax
 * Avoid .format
 * Give up on some TODOs
 * Maybe we need to install our thing?
 * Add requirements for readthedocs
-* Move non-matcher code to _deferred
+* Move non-matcher code to \_deferred
 * Nicer links
 * Link to Twisted API docs
 * More todos
 * Documentation with examples
 * Pass the Deferred to the handlers
 * Docstring formatting
-* Use _on_deferred_result in _NoResult
-* Make _on_deferred_result transparent to Deferred
+* Use \_on\_deferred\_result in \_NoResult
+* Make \_on\_deferred\_result transparent to Deferred
 * Extract common Deferred logic
 * Use same error messages as Twisted
 * Matcher for Deferreds that have failed
@@ -102,9 +123,9 @@
 * Docstring formatting
 * Docstring
 * Move formatting to exception
-* Extract `extract_result`
+* Extract \`extract\_result\`
 * Matcher for no result
-* Actually use `skipException`
+* Actually use \`skipException\`
 * NEWS update
 * Suppress skip traceback based on skipException
 * Deprecate Python 2.6
@@ -123,7 +144,7 @@
 * Document early evaluation of details
 * Update NEWS
 * Deprecate TestCase.skip
-* Deprecate _BinaryMismatch.{expected,observed}
+* Deprecate \_BinaryMismatch.{expected,observed}
 * Make sure reference and actual align
 * Put expected on the right for binary mismatch
 * Fix typo
@@ -136,16 +157,16 @@
 * Better error message for MatchesListwise
 * NEWS update
 * Clarify some things
-* Move _cleanups reset to _reset
-* Rewrite patch tests using make_test_case
-* `throw` helper
-* Rewrite addCleanup tests in terms of make_test_case
-* Use method for value, to avoid `self` weirdness
+* Move \_cleanups reset to \_reset
+* Rewrite patch tests using make\_test\_case
+* \`throw\` helper
+* Rewrite addCleanup tests in terms of make\_test\_case
+* Use method for value, to avoid \`self\` weirdness
 * Move useful matchers to helper module
-* Move unique_id_gen to reset
+* Move unique\_id\_gen to reset
 * Clean up comments
 * No need for special case
-* Get pre_set_up & post_tear_down from scenario
+* Get pre\_set\_up & post\_tear\_down from scenario
 * Spell setUp consistently
 * Allow pre setUp & post tearDown to be set
 * Complete suite of tests
@@ -160,7 +181,7 @@
 * Latest Twisted doesn't run on Python 2.6
 * Non-deterministic test case
 * Simplify cleanup code
-* Rename all_sample_cases_scenarios to deterministic_sample_cases_scenarios
+* Rename all\_sample\_cases\_scenarios to deterministic\_sample\_cases\_scenarios
 * Treat tear down failure as a scenario
 * Begin to write scenario-based tests
 * Split run twice tests to separate case
@@ -168,7 +189,7 @@
 * Fix travis :(
 * Add testscenarios for use by tests
 * Handle failure in tearDown
-* Test _run_teardown, rather than tearDown
+* Test \_run\_teardown, rather than tearDown
 * Allow tests to be run twice
 * Don't use private APIs
 
@@ -178,36 +199,36 @@
 * Update NEWS for 1.8.1
 * Hide TestRecord and StreamToTestRecord
 * Old-fashioned set syntax
-* Abstract text_or_bytes
+* Abstract text\_or\_bytes
 * Add pyrsistent dependency to Travis CI
 * Change PRecord to PClass
-* Move test_dict_to_case near StreamToDict
+* Move test\_dict\_to\_case near StreamToDict
 * Don't use StreamToDict internally
-* _streamer -> _hook
+* \_streamer -> \_hook
 * StreamSummary with composition, not inheritance
 * Extract StreamToTestRecord base class
-* Move _make_content_type closer to where it is used
-* Put to_test_case logic on TestRecord
-* Make _status_map persistent
-* Move test_dict_to_case closer to test_dict definition
+* Move \_make\_content\_type closer to where it is used
+* Put to\_test\_case logic on TestRecord
+* Make \_status\_map persistent
+* Move test\_dict\_to\_case closer to test\_dict definition
 * Remove temporary variable 'case'

_service:extract_file:testtools-2.3.0.tar.gz/NEWS -> _service:extract_file:testtools-2.4.0.tar.gz/NEWS Changed

@@ -3,6 +3,30 @@
 
 Changes and improvements to testtools_, grouped by release.
 
+2.4.0
+~~~~~
+
+Improvements
+------------
+
+* Add support for Python 3.7, 3.8 and PyPy3.
+  (Hugo van Kemenade)
+
+* Drop support for Python 3.4 (EOL).
+  (Jelmer Vernooĳ)
+
+* Avoid using eval(). (Ross Burton)
+
+* PyCharm IDE unittest detection compatibility fix.
+  (Adam Harwell)
+
+* Drop support for Python 3.3 (EOL).
+  (Robert Collins)
+
+* Spelling fixes. (Free Ekanayaka)
+
+* Python 3.6 invalid escape sequence deprecation fixes. (Ville Skyttä)
+
 2.3.0
 ~~~~~
 
@@ -104,7 +128,7 @@
 * ``MatchesListwise`` has more informative error when lengths don't match.
   (Jonathan Lange)
 
-* The short form of errors for failed binary comparisions will now put the
+* The short form of errors for failed binary comparisons will now put the
   expected value on the _right_. This means that ``assertThat(2, Equals(3))``
   will raise an error saying ``2 != 3``.
   (Jonathan Lange, #1525227)
@@ -274,7 +298,7 @@
   our exception lookup priorities to support it. Regular skips done through
   raise self.skipException will continue to work, since they were always caught
   in our code - its because the suite type being used to implement setUpClass
-  has changed that an issue occured.
+  has changed that an issue occurred.
   (Robert Collins, #1393068)
 
 1.2.1
@@ -295,7 +319,7 @@
 * Depends on unittest2 for discovery functionality and the ``TestProgram`` base
   class. This brings in many fixes made to discovery where previously we were
   only using the discovery package or the version in the release of Python
-  that the test execution was occuring on. (Robert Collins, #1271133)
+  that the test execution was occurring on. (Robert Collins, #1271133)
 
 * Fixed unit tests which were failing under pypy due to a change in the way
   pypy formats tracebacks. (Thomi Richards)

_service:extract_file:testtools-2.3.0.tar.gz/PKG-INFO -> _service:extract_file:testtools-2.4.0.tar.gz/PKG-INFO Changed

@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: testtools
-Version: 2.3.0
+Version: 2.4.0
 Summary: Extensions to the Python standard library unit testing framework
 Home-page: https://github.com/testing-cabal/testtools
 Author: Jonathan M. Lange
@@ -100,7 +100,7 @@
         --------------------------
         
         testtools gives you the very latest in unit testing technology in a way that
-        will work with Python 2.7, 3.3, 3.4, 3.5, and pypy.
+        will work with Python 2.7, 3.4+, and pypy.
         
         If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
         0.9.15.
@@ -108,7 +108,26 @@
         If you wish to use testtools with Python 2.6 or 3.2, then please use testtools
         1.9.0.
         
+        If you wish to use testtools with Python 3.3, then please use testtools 2.3.0.
+        
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+Provides-Extra: test

_service:extract_file:testtools-2.3.0.tar.gz/README.rst -> _service:extract_file:testtools-2.4.0.tar.gz/README.rst Changed

@@ -31,7 +31,7 @@
 Supported platforms
 -------------------
 
- * Python 2.7+ or 3.3+ / pypy (2.x+)
+ * Python 2.7 or 3.5+ / PyPy
 
 If you would like to use testtools for earlier Pythons, please use testtools
 1.9.0, or for *really* old Pythons, testtools 0.9.15.
@@ -46,7 +46,7 @@
 If you would like to use our Twisted support, then you will need Twisted.
 
 If you want to use ``fixtures`` then you can either install fixtures (e.g. from
-https://launchpad.net/python-fixtures or http://pypi.python.org/pypi/fixtures)
+https://launchpad.net/python-fixtures or https://pypi.python.org/pypi/fixtures)
 or alternatively just make sure your fixture objects obey the same protocol.
 
 
@@ -54,7 +54,7 @@
 -----------------------
 
 Please report bugs using Launchpad at <https://bugs.launchpad.net/testtools>.
-Patches should be submitted as Github pull requests, or mailed to the authors.
+Patches should be submitted as GitHub pull requests, or mailed to the authors.
 See ``doc/hacking.rst`` for more details.
 
 There's no mailing list for this project yet, however the testing-in-python
@@ -93,3 +93,5 @@
  * ClusterHQ Ltd
  * Tristan Seligmann
  * Jonathan Jacobs
+ * Jelmer Vernooĳ
+ * Hugo van Kemenade
\ No newline at end of file

_service:extract_file:testtools-2.3.0.tar.gz/doc/for-framework-folk.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/for-framework-folk.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/doc/hacking.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/hacking.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/doc/overview.rst -> _service:extract_file:testtools-2.4.0.tar.gz/doc/overview.rst Changed

_service:extract_file:testtools-2.3.0.tar.gz/scripts/all-pythons -> _service:extract_file:testtools-2.4.0.tar.gz/scripts/all-pythons Changed

_service:extract_file:testtools-2.3.0.tar.gz/setup.cfg -> _service:extract_file:testtools-2.4.0.tar.gz/setup.cfg Changed

_service:extract_file:testtools-2.3.0.tar.gz/setup.py -> _service:extract_file:testtools-2.4.0.tar.gz/setup.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/PKG-INFO -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/PKG-INFO Changed

@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: testtools
-Version: 2.3.0
+Version: 2.4.0
 Summary: Extensions to the Python standard library unit testing framework
 Home-page: https://github.com/testing-cabal/testtools
 Author: Jonathan M. Lange
@@ -100,7 +100,7 @@
         --------------------------
         
         testtools gives you the very latest in unit testing technology in a way that
-        will work with Python 2.7, 3.3, 3.4, 3.5, and pypy.
+        will work with Python 2.7, 3.4+, and pypy.
         
         If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
         0.9.15.
@@ -108,7 +108,26 @@
         If you wish to use testtools with Python 2.6 or 3.2, then please use testtools
         1.9.0.
         
+        If you wish to use testtools with Python 3.3, then please use testtools 2.3.0.
+        
         
 Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Testing
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+Provides-Extra: test

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/pbr.json -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/pbr.json Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools.egg-info/requires.txt -> _service:extract_file:testtools-2.4.0.tar.gz/testtools.egg-info/requires.txt Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/assertions.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/assertions.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/content.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/content.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/matchers/_exception.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/matchers/_exception.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/matchers/_warnings.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/matchers/_warnings.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testcase.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testcase.py Changed

@@ -25,10 +25,14 @@
 from extras import (
     safe_hasattr,
     try_import,
-    try_imports,
     )
 # To let setup.py work, make this a conditional import.
-unittest = try_imports('unittest2', 'unittest')
+# Don't use extras.try_imports, as it interferes with PyCharm's unittest
+# detection algorithm. See: https://youtrack.jetbrains.com/issue/PY-26630
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import six
 
 from testtools import (
@@ -82,7 +86,7 @@
 
 
 class _ExpectedFailure(Exception):
-    """An expected failure occured.
+    """An expected failure occurred.
 
     Note that this exception is private plumbing in testtools' testcase
     module.
@@ -391,7 +395,7 @@
         the exception has caused.
 
         Handlers are called in first-added, first-called order, and if they
-        raise an exception, that will propogate out of the test running
+        raise an exception, that will propagate out of the test running
         machinery, halting test processing. As a result, do not call code that
         may unreasonably fail.
         """

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testresult/real.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testresult/real.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_basic.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_basic.py Changed

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_datastructures.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_datastructures.py Changed

@@ -150,27 +150,27 @@
         self.assertMismatchWithDescriptionMatching(
             3, MatchesSetwise(Equals(1), Equals(2), Equals(3)),
             MatchesRegex(
-                'There were 2 matchers left over: Equals$12$, '
-                'Equals$12$'))
+                r'There were 2 matchers left over: Equals$12$, '
+                r'Equals$12$'))
 
     def test_two_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             1, 2, 3, 4, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                'There were 2 values left over: \34, 34\'))
+                r'There were 2 values left over: \34, 34\'))
 
     def test_mismatch_and_too_many_matchers(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, MatchesSetwise(Equals(0), Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 1 extra matcher: Equals$01$',
+                r'.*There was 1 mismatch and 1 extra matcher: Equals$01$',
                 re.S))
 
     def test_mismatch_and_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, 4, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 1 extra value: \34\',
+                r'.*There was 1 mismatch and 1 extra value: \34\',
                 re.S))
 
     def test_mismatch_and_two_too_many_matchers(self):
@@ -179,13 +179,13 @@
                 Equals(0), Equals(1), Equals(2), Equals(3)),
             MatchesRegex(
                 '.*There was 1 mismatch and 2 extra matchers: '
-                'Equals$012$, Equals$012$', re.S))
+                r'Equals$012$, Equals$012$', re.S))
 
     def test_mismatch_and_two_too_many_values(self):
         self.assertMismatchWithDescriptionMatching(
             2, 3, 4, 5, MatchesSetwise(Equals(1), Equals(2)),
             MatchesRegex(
-                '.*There was 1 mismatch and 2 extra values: \145, 145\',
+                r'.*There was 1 mismatch and 2 extra values: \145, 145\',
                 re.S))

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/matchers/test_exception.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/matchers/test_exception.py Changed

@@ -32,15 +32,22 @@
     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"))),
         
@@ -150,17 +157,17 @@
         matcher = Raises(MatchesException(KeyboardInterrupt))
         self.assertThat(self.raiser, matcher)
 
-    def test_KeyboardInterrupt_propogates(self):
-        # The default 'it raised' propogates KeyboardInterrupt.
+    def test_KeyboardInterrupt_propagates(self):
+        # The default 'it raised' propagates KeyboardInterrupt.
         match_keyb = Raises(MatchesException(KeyboardInterrupt))
         def raise_keyb_from_match():
             matcher = Raises()
             matcher.match(self.raiser)
         self.assertThat(raise_keyb_from_match, match_keyb)
 
-    def test_KeyboardInterrupt_match_Exception_propogates(self):
+    def test_KeyboardInterrupt_match_Exception_propagates(self):
         # If the raised exception isn't matched, and it is not a subclass of
-        # Exception, it is propogated.
+        # Exception, it is propagated.
         match_keyb = Raises(MatchesException(KeyboardInterrupt))
         def raise_keyb_from_match():
             matcher = Raises(MatchesException(Exception))

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_compat.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_compat.py Changed

@@ -2,6 +2,7 @@
 
 """Tests for miscellaneous compatibility functions"""
 
+import ast
 import io
 import linecache2 as linecache
 import os
@@ -198,28 +199,28 @@
             actual = text_repr(b, multiline=False)
             # Add self.assertIsInstance check?
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_ascii_examples_oneline_unicode(self):
         for s, expected, _ in self.ascii_examples:
             u = _u(s)
             actual = text_repr(u, multiline=False)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_ascii_examples_multiline_bytes(self):
         for s, _, expected in self.ascii_examples:
             b = _b(s)
             actual = text_repr(b, multiline=True)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_ascii_examples_multiline_unicode(self):
         for s, _, expected in self.ascii_examples:
             u = _u(s)
             actual = text_repr(u, multiline=True)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_ascii_examples_defaultline_bytes(self):
         for s, one, multi in self.ascii_examples:
@@ -235,25 +236,25 @@
         for b, expected, _ in self.bytes_examples:
             actual = text_repr(b, multiline=False)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_bytes_examples_multiline(self):
         for b, _, expected in self.bytes_examples:
             actual = text_repr(b, multiline=True)
             self.assertEqual(actual, self.b_prefix + expected)
-            self.assertEqual(eval(actual), b)
+            self.assertEqual(ast.literal_eval(actual), b)
 
     def test_unicode_examples_oneline(self):
         for u, expected, _ in self.unicode_examples:
             actual = text_repr(u, multiline=False)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)
 
     def test_unicode_examples_multiline(self):
         for u, _, expected in self.unicode_examples:
             actual = text_repr(u, multiline=True)
             self.assertEqual(actual, self.u_prefix + expected)
-            self.assertEqual(eval(actual), u)
+            self.assertEqual(ast.literal_eval(actual), u)

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_testcase.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_testcase.py Changed

@@ -389,14 +389,14 @@
     def test_assertRaisesRegexp(self):
         # assertRaisesRegexp asserts that function raises particular exception
         # with particular message.
-        self.assertRaisesRegexp(RuntimeError, "M\w*e", self.raiseError,
+        self.assertRaisesRegexp(RuntimeError, r"M\w*e", self.raiseError,
                                 RuntimeError, "Message")
 
     def test_assertRaisesRegexp_wrong_error_type(self):
         # If function raises an exception of unexpected type,
         # assertRaisesRegexp re-raises it.
         self.assertRaises(ValueError, self.assertRaisesRegexp, RuntimeError,
-                          "M\w*e", self.raiseError, ValueError, "Message")
+                          r"M\w*e", self.raiseError, ValueError, "Message")
 
     def test_assertRaisesRegexp_wrong_message(self):
         # If function raises an exception with unexpected message
@@ -1095,7 +1095,6 @@
         self.assertDetailsProvided(case, "addUnexpectedSuccess",
             "foo", "reason")
 
-    @skipIf(not hasattr(unittest, 'expectedFailure'), 'Need py27+')
     def test_unittest_expectedFailure_decorator_works_with_failure(self):
         class ReferenceTest(TestCase):
             @unittest.expectedFailure
@@ -1106,7 +1105,6 @@
         result = test.run()
         self.assertEqual(True, result.wasSuccessful())
 
-    @skipIf(not hasattr(unittest, 'expectedFailure'), 'Need py27+')
     def test_unittest_expectedFailure_decorator_works_with_success(self):
         class ReferenceTest(TestCase):
             @unittest.expectedFailure
@@ -1450,12 +1448,6 @@
             second_result._events, self.expected_second_result)
 
 
-require_py27_minimum = skipIf(
-    sys.version < '2.7',
-    "Requires python 2.7 or greater"
-)
-
-
 class TestSkipping(TestCase):
     """Tests for skipping of tests functionality."""
 
@@ -1635,7 +1627,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skip_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(
@@ -1643,7 +1634,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skipIf_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(
@@ -1651,7 +1641,6 @@
             reason
         )
 
-    @require_py27_minimum
     def test_unittest_skipUnless_decorator_does_not_run_setUp(self):
         reason = self.getUniqueString()
         self.check_skip_decorator_does_not_run_setup(

_service:extract_file:testtools-2.3.0.tar.gz/testtools/tests/test_testresult.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/tests/test_testresult.py Changed

@@ -9,6 +9,7 @@
 import doctest
 from itertools import chain, combinations
 import os
+import platform
 import re
 import shutil
 import sys
@@ -2530,13 +2531,13 @@
 
     def _test_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create and run a test case in a seperate module"""
+        """Create and run a test case in a separate module"""
         self._setup_external_case(testline, coding, modulelevel, suffix)
         return self._run_external_case()
 
     def _setup_external_case(self, testline, coding="ascii", modulelevel="",
             suffix=""):
-        """Create a test case in a seperate module"""
+        """Create a test case in a separate module"""
         _, prefix, self.modname = self.id().rsplit(".", 2)
         self.dir = tempfile.mkdtemp(prefix=prefix, suffix=suffix)
         self.addCleanup(shutil.rmtree, self.dir)
@@ -2552,7 +2553,7 @@
             "        %s\n" % (coding, modulelevel, testline))
 
     def _run_external_case(self):
-        """Run the prepared test case in a seperate module"""
+        """Run the prepared test case in a separate module"""
         sys.path.insert(0, self.dir)
         self.addCleanup(sys.path.remove, self.dir)
         module = __import__(self.modname)
@@ -2599,7 +2600,7 @@
         self.assertIn(self._as_output(_u("\uFFFD\uFFFD\uFFFD")), textoutput)
 
     def _local_os_error_matcher(self):
-        if sys.version_info > (3, 3):
+        if sys.version_info > (3, 4):
             return MatchesAny(Contains("FileExistsError: "),
                               Contains("PermissionError: "))
         elif os.name != "nt":
@@ -2678,12 +2679,16 @@
 
     def test_syntax_error(self):
         """Syntax errors should still have fancy special-case formatting"""
+        if platform.python_implementation() == "PyPy":
+            spaces = '           '
+        else:
+            spaces = '          '
         textoutput = self._test_external_case("exec ('f(a, b c)')")
         self.assertIn(self._as_output(
             '  File "<string>", line 1\n'
             '    f(a, b c)\n'
             + ' ' * self._error_on_character +
-            '          ^\n'
+            spaces + '^\n'
             'SyntaxError: '
             ), textoutput)

_service:extract_file:testtools-2.3.0.tar.gz/testtools/testsuite.py -> _service:extract_file:testtools-2.4.0.tar.gz/testtools/testsuite.py Changed

@@ -10,6 +10,7 @@
     'sorted_tests',
 
 
+from collections import Counter
 from pprint import pformat
 import sys
 import threading
@@ -250,7 +251,7 @@
         fails the predicate when it will return a new unittest.TestSuite with
         no contents.
 
-    This helper exists to provide backwards compatability with older versions
+    This helper exists to provide backwards compatibility with older versions
     of Python (currently all versions :)) that don't have a native
     filter_by_ids() method on Test(Case|Suite).
 
@@ -267,10 +268,10 @@
 
     For anything else, it is not filtered - it is returned as-is.
 
-    To provide compatability with this routine for a custom TestSuite, just
+    To provide compatibility with this routine for a custom TestSuite, just
     define a filter_by_ids() method that will return a TestSuite equivalent to
     the original minus any tests not in test_ids.
-    Similarly to provide compatability for a custom TestCase that does
+    Similarly to provide compatibility for a custom TestCase that does
     something unusual define filter_by_ids to return a new TestCase object
     that will only run test_ids that are in the provided container. If none
     would run, return an empty TestSuite().
@@ -301,21 +302,11 @@
     return suite_or_case
 
 
-# XXX: Python 2.6. Replace this with Counter when we drop 2.6 support.
-def _counter(xs):
-    """Return a dict mapping values of xs to number of times they appear."""
-    counts = {}
-    for x in xs:
-        times = counts.setdefault(x, 0)
-        countsx = times + 1
-    return counts
-
-
 def sorted_tests(suite_or_case, unpack_outer=False):
     """Sort suite_or_case while preserving non-vanilla TestSuites."""
     # Duplicate test id can induce TypeError in Python 3.3.
     # Detect the duplicate test ids, raise exception when found.
-    seen = _counter(case.id() for case in iterate_tests(suite_or_case))
+    seen = Counter(case.id() for case in iterate_tests(suite_or_case))
     duplicates = dict(
         (test_id, count) for test_id, count in seen.items() if count > 1)
     if duplicates:

_service:tar_scm:python-testtools-1597144135.2019412.tar Deleted

_service:tar_scm:python-testtools-1650770150.f780d95.tar Added

Changes of Revision 2