14
0

Accepting request 785593 from devel:languages:python

- update to 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)
- remove testtools-py37.patch: merged upstream

OBS-URL: https://build.opensuse.org/request/show/785593
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-testtools?expand=0&rev=26
This commit is contained in:
2020-03-26 23:25:59 +00:00
committed by Git OBS Bridge
6 changed files with 30 additions and 65 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-testtools-doc
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-testtools-doc
Version: 2.3.0
Version: 2.4.0
Release: 0
Summary: Documentation for python-testtools
License: MIT
Group: Documentation/HTML
URL: https://launchpad.net/testtools
Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz
Patch0: testtools-py37.patch
BuildRequires: %{python_module testscenarios}
BuildRequires: %{python_module testtools = %{version}}
BuildRequires: fdupes
@@ -40,7 +39,6 @@ Documentation and help files for python-testtools.
%prep
%setup -q -n testtools-%{version}
%patch0 -p1
%build
python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo

View File

@@ -1,3 +1,26 @@
-------------------------------------------------------------------
Mon Mar 16 10:57:59 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 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)
- remove testtools-py37.patch: merged upstream
-------------------------------------------------------------------
Mon Oct 14 16:47:02 CEST 2019 - Matej Cepl <mcepl@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-testtools
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-testtools
Version: 2.3.0
Version: 2.4.0
Release: 0
Summary: Extensions to the Python Standard Library Unit Testing Framework
License: MIT
Group: Development/Languages/Python
URL: https://github.com/testing-cabal/testtools
Source: https://files.pythonhosted.org/packages/source/t/testtools/testtools-%{version}.tar.gz
Patch0: testtools-py37.patch
BuildRequires: %{python_module extras >= 1.0.0}
BuildRequires: %{python_module pbr}
BuildRequires: %{python_module setuptools}
@@ -51,7 +50,6 @@ also ports recent unittest changes all the way back to Python 2.4.
%prep
%setup -q -n testtools-%{version}
%patch0 -p1
%build
%python_build

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559
size 231559

3
testtools-2.4.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8
size 233032

View File

@@ -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"))),
]