diff --git a/openstack/mox3/0001-add-python-3.6-unit-test-job.patch b/openstack/mox3/0001-add-python-3.6-unit-test-job.patch deleted file mode 100644 index c5f309442..000000000 --- a/openstack/mox3/0001-add-python-3.6-unit-test-job.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 31b73b936a97bd57525be82624d328585f6fe91b Mon Sep 17 00:00:00 2001 -From: Doug Hellmann -Date: Tue, 7 Aug 2018 16:17:31 -0400 -Subject: [PATCH] add python 3.6 unit test job - -See the python3-first goal document for details: -https://governance.openstack.org/tc/goals/stein/python3-first.html - -This also modifies a unit test to not attempt to pass the re.LOCALE flag -when the regex is a string, which is prohibited in Python 3.6. It would -be possible to use a raw bytes object as the regex instead, but we're -testing the repr() here and it has a different representation between -Python 2 and Python 3. Just use the re.IGNORECASE flag instead for the -purposes of the test. - -Change-Id: I666d49d0a29963bcaef6ca69be34dc4869f6db6f -Co-Authored-By: Zane Bitter -Story: #2002586 -Task: #24322 ---- - mox3/tests/test_mox.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py -index 1b1883b..a1ddb18 100644 ---- a/mox3/tests/test_mox.py -+++ b/mox3/tests/test_mox.py -@@ -320,8 +320,8 @@ class RegexTest(testtools.TestCase): - - def testReprWithFlags(self): - """repr should return the regular expression pattern and flags.""" -- self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == -- "") -+ self.assertTrue(repr(mox.Regex(r"a\s+b", flags=2)) == -+ "") - - - class IsTest(testtools.TestCase): --- -2.17.1 - diff --git a/openstack/mox3/mox3.spec.j2 b/openstack/mox3/mox3.spec.j2 index 79f9e5553..08772702d 100644 --- a/openstack/mox3/mox3.spec.j2 +++ b/openstack/mox3/mox3.spec.j2 @@ -1,13 +1,12 @@ %global pypi_name mox3 Name: {{ py2name('mox3') }} -Version: 0.26.0 +Version: 0.27.0 Release: 0 Summary: An unofficial port of the Google mox framework to Python 3 License: {{ license('Apache-2.0') }} Group: Development/Languages/Python URL: https://bugs.launchpad.net/python-mox3 Source0: https://files.pythonhosted.org/packages/source/m/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Patch0001: 0001-add-python-3.6-unit-test-job.patch BuildRequires: openstack-macros BuildRequires: {{ py2pkg('coverage', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} @@ -27,8 +26,7 @@ BuildRequires: python3-dbm %description Mox3 is an unofficial port of the Google mox framework to Python 3. It was meant to be as compatible with mox as possible, but small -enhancements have been made. The library was tested on Python version -3.2, 2.7 and 2.6. +enhancements have been made. %package -n python-mox3-doc Summary: Documentation for %{name}