diff --git a/.gitignore b/.gitignore index e2c0112..ad1139d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pytest-mpl-0.9.tar.gz +/pytest-mpl-0.10.tar.gz diff --git a/0001-Increase-tolerance-for-new-FreeType.patch b/0001-Increase-tolerance-for-new-FreeType.patch index 643c40f..240fc7d 100644 --- a/0001-Increase-tolerance-for-new-FreeType.patch +++ b/0001-Increase-tolerance-for-new-FreeType.patch @@ -1,7 +1,7 @@ -From 75beaec80c54b6fff92e310f2e2194ce119deba8 Mon Sep 17 00:00:00 2001 +From fd80f1bd65e1fde4f2505dd0b2065b21659d12a4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 16 Jul 2018 00:52:13 -0400 -Subject: [PATCH 1/2] Increase tolerance for new FreeType. +Subject: [PATCH] Increase tolerance for new FreeType. Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/test_pytest_mpl.py b/tests/test_pytest_mpl.py -index 0d9518c..1439eaf 100644 +index 1fa0379..064f39b 100644 --- a/tests/test_pytest_mpl.py +++ b/tests/test_pytest_mpl.py @@ -23,7 +23,7 @@ baseline_dir_remote = 'http://matplotlib.github.io/pytest-mpl/' + baseline_subdi diff --git a/0002-Use-correct-pytest-executable.patch b/0002-Use-correct-pytest-executable.patch deleted file mode 100644 index 8cad39f..0000000 --- a/0002-Use-correct-pytest-executable.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f698c728cb726a22a5fda09a9ef7cb7f402bcc13 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Mon, 16 Jul 2018 02:00:16 -0400 -Subject: [PATCH 2/2] Use correct pytest executable. - -Signed-off-by: Elliott Sales de Andrade ---- - tests/test_pytest_mpl.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/test_pytest_mpl.py b/tests/test_pytest_mpl.py -index 1439eaf..522d6d0 100644 ---- a/tests/test_pytest_mpl.py -+++ b/tests/test_pytest_mpl.py -@@ -87,11 +87,11 @@ def test_fails(tmpdir): - f.write(TEST_FAILING) - - # If we use --mpl, it should detect that the figure is wrong -- code = subprocess.call('py.test --mpl {0}'.format(test_file), shell=True) -+ code = subprocess.call('pytest-3 --mpl {0}'.format(test_file), shell=True) - assert code != 0 - - # If we don't use --mpl option, the test should succeed -- code = subprocess.call('py.test {0}'.format(test_file), shell=True) -+ code = subprocess.call('pytest-3 {0}'.format(test_file), shell=True) - assert code == 0 - - -@@ -114,7 +114,7 @@ def test_output_dir(tmpdir): - - # When we run the test, we should get output images where we specify - output_dir = tmpdir.join('test_output_dir').strpath -- code = subprocess.call('py.test --mpl-results-path={0} --mpl {1}'.format(output_dir, test_file), -+ code = subprocess.call('pytest-3 --mpl-results-path={0} --mpl {1}'.format(output_dir, test_file), - shell=True) - - assert code != 0 -@@ -151,13 +151,13 @@ def test_generate(tmpdir): - gen_dir = tmpdir.mkdir('spam').mkdir('egg').strpath - - # If we don't generate, the test will fail -- p = subprocess.Popen('py.test --mpl {0}'.format(test_file), shell=True, -+ p = subprocess.Popen('pytest-3 --mpl {0}'.format(test_file), shell=True, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - p.wait() - assert b'Image file not found for comparison test' in p.stdout.read() - - # If we do generate, the test should succeed and a new file will appear -- code = subprocess.call('py.test --mpl-generate-path={0} {1}'.format(gen_dir, test_file), shell=True) -+ code = subprocess.call('pytest-3 --mpl-generate-path={0} {1}'.format(gen_dir, test_file), shell=True) - assert code == 0 - assert os.path.exists(os.path.join(gen_dir, 'test_gen.png')) - --- -2.17.1 - diff --git a/python-pytest-mpl.spec b/python-pytest-mpl.spec index e7b1476..6b9346e 100644 --- a/python-pytest-mpl.spec +++ b/python-pytest-mpl.spec @@ -1,8 +1,8 @@ %global srcname pytest-mpl Name: python-%{srcname} -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Pytest plugin for testing figure output from Matplotlib License: BSD @@ -10,7 +10,6 @@ URL: https://github.com/matplotlib/pytest-mpl Source0: https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz # Probably not going upstream. Patch0001: 0001-Increase-tolerance-for-new-FreeType.patch -Patch0002: 0002-Use-correct-pytest-executable.patch BuildArch: noarch @@ -72,6 +71,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} MPLBACKEND=Agg PYTHONDONTWRITEBYTECODE %changelog +* Fri Oct 19 2018 Elliott Sales de Andrade - 0.10-1 +- Update to latest version + * Wed Jul 18 2018 Elliott Sales de Andrade - 0.9-2 - Remove unnecessary cache files diff --git a/sources b/sources index 4ad8795..305ae38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytest-mpl-0.9.tar.gz) = 6faa9672c32c03017fac99781558462d76a705fd60232559202aa05a855cd4af960910d73b6dddf960e27e84f92dfc5cab7da0348a61709d71fff37480665d4f +SHA512 (pytest-mpl-0.10.tar.gz) = 2eb2e3b1b64fe2e9e4f26a3075f775d343f7e50ebe1b5a70863128c82db60d13275e88dfb2ac116281add11ce21aacd3537646781272ad844cf130a757f992d0